diff --git a/horizon/templates/horizon/common/_form_field.html b/horizon/templates/horizon/common/_form_field.html
index a9062fc189..54ca7c0c5f 100644
--- a/horizon/templates/horizon/common/_form_field.html
+++ b/horizon/templates/horizon/common/_form_field.html
@@ -11,6 +11,7 @@
             {% endif %}>
             {{ field }}
             <span>{{ field.label }}</span>
+            {% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
             {% if field.help_text %}
             <span class="help-icon" data-toggle="tooltip"
               data-placement="top" title="{{ field.help_text|safe }}">
@@ -28,6 +29,7 @@
     {% if field.auto_id %}
       <label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}">{{ field.label }}</label>
       {% if field.help_text %}
+        {% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
         <span class="help-icon" data-toggle="tooltip" data-placement="top" title="{{ field.help_text|safe }}"><span class="fa fa-question-circle"></span></span>
       {% endif %}
     {% endif %}
@@ -50,6 +52,7 @@
     {% if field.auto_id %}
       <label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}" for="{{ field.auto_id }}">{{ field.label }}</label>
       {% if field.help_text %}
+        {% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
         <span class="help-icon" data-toggle="tooltip" data-placement="top" title="{{ field.help_text|safe }}"><span class="fa fa-question-circle"></span></span>
       {% endif %}
     {% endif %}
diff --git a/horizon/templates/horizon/common/_form_field_required.html b/horizon/templates/horizon/common/_form_field_required.html
new file mode 100644
index 0000000000..bb0324b8d1
--- /dev/null
+++ b/horizon/templates/horizon/common/_form_field_required.html
@@ -0,0 +1 @@
+<span class="hz-icon-required fa fa-asterisk"></span>
diff --git a/horizon/templates/horizon/common/_workflow.html b/horizon/templates/horizon/common/_workflow.html
index bbb1b6e074..df84cc4904 100644
--- a/horizon/templates/horizon/common/_workflow.html
+++ b/horizon/templates/horizon/common/_workflow.html
@@ -20,7 +20,7 @@
             <li class="{% if entry_point == step.slug %}active{% endif %}{% if step.has_errors %} error{% endif %}{% if step.has_required_fields %} required{% endif %}">
               <a href="#{{ step.get_id }}" data-toggle="tab" data-target="#{{ step.get_id }}">
                 {{ step }}
-                {% if step.has_required_fields %}<span class="hz-icon-required fa fa-asterisk"></span>{% endif %}
+                {% if step.has_required_fields %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
               </a>
             </li>
             {% endfor %}
diff --git a/openstack_dashboard/static/dashboard/scss/components/_workflow.scss b/openstack_dashboard/static/dashboard/scss/components/_workflow.scss
index 154331a163..f003753948 100644
--- a/openstack_dashboard/static/dashboard/scss/components/_workflow.scss
+++ b/openstack_dashboard/static/dashboard/scss/components/_workflow.scss
@@ -86,7 +86,7 @@
     }
   }
 
-  .nav-tabs .hz-icon-required {
+  .hz-icon-required {
     font-size: 50%;
     vertical-align: top;
     color: $brand-primary;