diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss
index 7da283af..88589f29 100644
--- a/styles/elements/_inputs.scss
+++ b/styles/elements/_inputs.scss
@@ -81,7 +81,6 @@
   }
 
   .usa-input__help {
-    display: block;
     @include h4;
     font-weight: normal;
     padding: $gap/2 0;
diff --git a/templates/components/options_input.html b/templates/components/options_input.html
index 49e98943..6009cd51 100644
--- a/templates/components/options_input.html
+++ b/templates/components/options_input.html
@@ -6,16 +6,17 @@
 
     <fieldset class="usa-input__choices {% if inline %}usa-input__choices--inline{% endif %}">
       <legend>
-        {{ field.label | striptags}}
-
-        {% if tooltip %}{{ Tooltip(tooltip) }}{% endif %}
+        <div>
+          {{ field.label | striptags}}
+          {% if tooltip %}{{ Tooltip(tooltip) }}{% endif %}
+        </div>
 
         {% if field.description %}
           <span class='usa-input__help'>{{ field.description | safe }}</span>
         {% endif %}
 
         {% if field.errors %}
-          <span class="icon-validation">{{ Icon('alert') }}</span>
+          {{ Icon('alert') }}
         {% endif %}
       </legend>
 
diff --git a/templates/components/text_input.html b/templates/components/text_input.html
index 8703e2db..f14ffe87 100644
--- a/templates/components/text_input.html
+++ b/templates/components/text_input.html
@@ -4,7 +4,7 @@
 {% macro TextInput(field, tooltip='', placeholder='') -%}
   <div class='usa-input {% if field.errors %}usa-input--error{% endif %}'>
     <label for={{field.name}}>
-      {{ field.label | striptags }} {% if tooltip %}{{ Tooltip(tooltip) }}{% endif %}
+      <div>{{ field.label | striptags }} {% if tooltip %}{{ Tooltip(tooltip) }}{% endif %}</div>
 
       {% if field.description %}
         <span class='usa-input__help'>{{ field.description | safe }}</span>