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/styles/elements/_tooltip.scss b/styles/elements/_tooltip.scss
index 46f1146b..b86506eb 100644
--- a/styles/elements/_tooltip.scss
+++ b/styles/elements/_tooltip.scss
@@ -95,4 +95,9 @@
   .icon {
     @include icon-size(16);
   }
+
+  &--tight {
+    margin: 0;
+    padding: 0;
+  }
 }
diff --git a/templates/applications/fragments/member_form_fields.html b/templates/applications/fragments/member_form_fields.html
index dd91dd5d..cb9a5c31 100644
--- a/templates/applications/fragments/member_form_fields.html
+++ b/templates/applications/fragments/member_form_fields.html
@@ -1,7 +1,8 @@
 {% from "components/alert.html" import Alert %}
 {% from "components/checkbox_input.html" import CheckboxInput %}
-{% from "components/text_input.html" import TextInput %}
 {% from "components/phone_input.html" import PhoneInput %}
+{% from "components/text_input.html" import TextInput %}
+{% from "components/tooltip.html" import Tooltip %}
 
 {% macro EnvRoleInput(sub_form, member_role_id=None) %}
   {% set role = sub_form.role.data if not sub_form.disabled.data else "Access Suspended" %}
@@ -121,6 +122,6 @@
     {{ TextInput(member_form.email, validation='email', optional=False) }}
     {{ PhoneInput(member_form.phone_number, member_form.phone_ext)}}
     {{ TextInput(member_form.dod_id, validation='dodId', optional=False) }}
-    <a href="#">{{ "forms.new_member.dod_help" | translate }}</a>
+    {{ "forms.new_member.dod_help" | translate }} {{ Tooltip("forms.new_member.dod_text"|translate, title="", classes="icon-tooltip--tight") }}
   </div>
 {% endmacro %}
diff --git a/templates/components/tooltip.html b/templates/components/tooltip.html
index 052299f6..bec2a31a 100644
--- a/templates/components/tooltip.html
+++ b/templates/components/tooltip.html
@@ -2,7 +2,7 @@
 
 {% macro Tooltip(message,title='Help', classes="") %}
 
-  <button type="button" tabindex="0" class="icon-tooltip {{classes}}" v-tooltip.top="{content: '{{message}}', container: false}">
+  <button type="button" tabindex="0" class="icon-tooltip {{classes}}" v-tooltip.top='{content: "{{message}}", container: false}'>
     {{ Icon('question') }}<span>{{ title }}</span>
   </button>
 
diff --git a/templates/portfolios/fragments/member_form_fields.html b/templates/portfolios/fragments/member_form_fields.html
index 48642d2b..7e0998c2 100644
--- a/templates/portfolios/fragments/member_form_fields.html
+++ b/templates/portfolios/fragments/member_form_fields.html
@@ -2,6 +2,7 @@
 {% from "components/icon.html" import Icon %}
 {% from "components/phone_input.html" import PhoneInput %}
 {% from "components/text_input.html" import TextInput %}
+{% from "components/tooltip.html" import Tooltip %}
 
 {% macro PermsFields(form, member_role_id=None) %}
   <h2>Set Portfolio Permissions</h2>
@@ -32,6 +33,6 @@
     {{ TextInput(member_form.email, validation='email', optional=False) }}
     {{ PhoneInput(member_form.phone_number, member_form.phone_ext)}}
     {{ TextInput(member_form.dod_id, validation='dodId', optional=False) }}
-    <a href="#">{{ "forms.new_member.dod_help" | translate }}</a>
+    {{ "forms.new_member.dod_help" | translate }} {{ Tooltip("forms.new_member.dod_text"|translate, title="", classes="icon-tooltip--tight") }}
   </div>
 {% endmacro %}
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 }}
diff --git a/translations.yaml b/translations.yaml
index b80f5dca..c3d73c3a 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -246,6 +246,7 @@ forms:
       description: Add, remove and edit applications in this Portfolio.
     dod_id_label: DoD ID
     dod_help: How do I find out the DoD ID?
+    dod_text: "An individual's DOD ID (formerly known as EDIPI) number can be found on the back of their CAC. Access to this system requires a valid CAC and DOD ID."
     email_label: Email address
     first_name_label: First name
     funding: