diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss
index 4a45cc5f..06fecf63 100644
--- a/styles/components/_portfolio_layout.scss
+++ b/styles/components/_portfolio_layout.scss
@@ -513,10 +513,6 @@
   }
   &__header {
     margin: 0;
-    &-icon {
-      margin: 0;
-      padding: 0;
-    }
   }
   &__value {
     font-size: $lead-font-size;
diff --git a/templates/portfolios/reports/portfolio_summary.html b/templates/portfolios/reports/portfolio_summary.html
index 3395a205..a13ad84a 100644
--- a/templates/portfolios/reports/portfolio_summary.html
+++ b/templates/portfolios/reports/portfolio_summary.html
@@ -6,14 +6,14 @@
   <div class='col col--grow summary-item'>
     <h5 class="summary-item__header">
       <span class="summary-item__header-text">{{ "portfolios.reports.total_value.header" | translate }}</span>
-      {{Tooltip(("portfolios.reports.total_value.tooltip" | translate), title="", classes="summary-item__header-icon")}}
+      {{Tooltip(("portfolios.reports.total_value.tooltip" | translate), title="", classes="icon-tooltip--tight")}}
     </h5>
     <p class="summary-item__value">{{ total_portfolio_value | dollars }}</p>
   </div>
   <div class='col col--grow summary-item'>
     <h5 class="summary-item__header">
       <span class="summary-item__header-text">{{ "portfolios.reports.duration.header" | translate }}</span>
-      {{Tooltip(("portfolios.reports.duration.tooltip" | translate), title="", classes="summary-item__header-icon")}}
+      {{Tooltip(("portfolios.reports.duration.tooltip" | translate), title="", classes="icon-tooltip--tight")}}
     </h5>
     {% set earliest_pop_start_date, latest_pop_end_date = portfolio.funding_duration %}
     {% if earliest_pop_start_date and latest_pop_end_date  %}
@@ -29,7 +29,7 @@
   <div class='col col--grow summary-item'>
     <h5 class="summary-item__header">
       <span class="summary-item__header-text">{{ "portfolios.reports.days_remaining.header" | translate }}</span>
-      {{Tooltip(("portfolios.reports.days_remaining.toolip" | translate), title="", classes="summary-item__header-icon")}}
+      {{Tooltip(("portfolios.reports.days_remaining.toolip" | translate), title="", classes="icon-tooltip--tight")}}
     </h5>
     <p class="summary-item__value">{{ portfolio.days_to_funding_expiration }} days</p>
   </div>
diff --git a/templates/task_orders/fragments/task_order_view.html b/templates/task_orders/fragments/task_order_view.html
index 2ec2a738..796bbfa6 100644
--- a/templates/task_orders/fragments/task_order_view.html
+++ b/templates/task_orders/fragments/task_order_view.html
@@ -12,7 +12,7 @@
       <div class='col col--grow summary-item'>
         <h4 class="summary-item__header">
           <span class="summary-item__header-text">{{ 'task_orders.summary.total' | translate }}</span>
-          {{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="summary-item__header-icon") }}
+          {{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="icon-tooltip--tight") }}
         </h4>
         <p class="summary-item__value--large">
           {{ contract_amount | dollars }}
@@ -21,7 +21,7 @@
       <div class='col col--grow summary-item'>
         <h4 class="summary-item__header">
           <span class="summary-item__header-text">{{ 'task_orders.summary.obligated' | translate }}</span>
-          {{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="summary-item__header-icon") }}
+          {{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="icon-tooltip--tight") }}
         </h4>
         <p class="summary-item__value--large">
           {{ obligated_funds | dollars }}
@@ -30,7 +30,7 @@
       <div class='col col--grow summary-item'>
         <h4 class="summary-item__header">
           <span class="summary-item__header-text">{{ 'task_orders.summary.expended' | translate }}</span>
-          {{ Tooltip(("task_orders.review.tooltip.expended_funds" | translate), title="", classes="summary-item__header-icon") }}
+          {{ Tooltip(("task_orders.review.tooltip.expended_funds" | translate), title="", classes="icon-tooltip--tight") }}
         </h4>
         <p class="summary-item__value--large">
           {{ expended_funds | dollars }}