diff --git a/horizon/static/horizon/js/horizon.forms.js b/horizon/static/horizon/js/horizon.forms.js
index caba00b969..35bdadaea5 100644
--- a/horizon/static/horizon/js/horizon.forms.js
+++ b/horizon/static/horizon/js/horizon.forms.js
@@ -314,7 +314,7 @@ horizon.addInitFunction(horizon.forms.init = function () {
 
     $switchables.each(function (index, switchable) {
       var $switchable = $(switchable),
-        visible = $switchable.is(':visible'),
+        visible = $switchable.parent().hasClass('themable-checkbox') ? $switchable.siblings('label').is(':visible') : $switchable.is(':visible'),
         slug = $switchable.data('slug'),
         checked = $switchable.prop('checked'),
         hide_tab = String($switchable.data('hide-tab')).split(','),
diff --git a/horizon/templates/horizon/common/_workflow.html b/horizon/templates/horizon/common/_workflow.html
index 22797d5f7b..53190c88ee 100644
--- a/horizon/templates/horizon/common/_workflow.html
+++ b/horizon/templates/horizon/common/_workflow.html
@@ -19,7 +19,7 @@
         </div>
         <div class="modal-body">
         {% block modal-body %}
-        <ul class="nav nav-tabs{% if workflow.wizard %} wizard-tabs{% endif %}" role="tablist">
+        <ul class="nav nav-pills selenium-nav-region{% if workflow.wizard %} wizard-tabs{% endif %}" role="tablist">
             {% for step in workflow.steps %}
             <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 }}">
diff --git a/openstack_dashboard/static/dashboard/scss/_variables.scss b/openstack_dashboard/static/dashboard/scss/_variables.scss
index f239078572..7a00c72295 100644
--- a/openstack_dashboard/static/dashboard/scss/_variables.scss
+++ b/openstack_dashboard/static/dashboard/scss/_variables.scss
@@ -11,23 +11,6 @@ $sidebar-width: 220px !default;
 $border-color: #dddddd !default;
 $table-bg-odd: $table-bg-accent !default;
 
-
-/* Workflows */
-
-$workflow-color-tab-complete-bg: #007acc;
-$workflow-color-tab-incomplete-bg: #dddddd;
-$workflow-color-tab-trough-bg: #efefef;
-$workflow-color-tab-border: #ffffff;
-$workflow-color-tab-link-active: #ffffff;
-$workflow-color-tab-link-inactive: #43a4d7;
-
-$workflow-color-label-error: $brand-danger;
-
-$workflow-size-tab-border: 2px;
-$workflow-size-tab-arrow: 20px;
-$workflow-size-tab-padding: 15px;
-
-
 /* Resource Browser */
 
 $rbrowser-data-table-border-width: 1px;
diff --git a/openstack_dashboard/static/dashboard/scss/components/_modals.scss b/openstack_dashboard/static/dashboard/scss/components/_modals.scss
index 28b50355aa..7a1d132821 100644
--- a/openstack_dashboard/static/dashboard/scss/components/_modals.scss
+++ b/openstack_dashboard/static/dashboard/scss/components/_modals.scss
@@ -33,6 +33,10 @@
   & ~ hr {
     margin-bottom: 0;
   }
+
+  & > .nav-pills {
+    padding-bottom: $padding-base-horizontal;
+  }
 }
 
 .modal-footer {
diff --git a/openstack_dashboard/static/dashboard/scss/components/_workflow.scss b/openstack_dashboard/static/dashboard/scss/components/_workflow.scss
deleted file mode 100644
index 27515d11a2..0000000000
--- a/openstack_dashboard/static/dashboard/scss/components/_workflow.scss
+++ /dev/null
@@ -1,89 +0,0 @@
-.workflow {
-
-  fieldset > table {
-    margin-bottom: 0;
-  }
-
-  &.wizard {
-    .row {
-      .btn {
-        float: none;
-        margin: 0;
-      }
-
-      .next {
-        text-align: right;
-      }
-    }
-
-    .nav-tabs.wizard-tabs {
-      border-bottom: 0;
-      background: $workflow-color-tab-trough-bg;
-      padding: 0;
-
-      li {
-        margin-bottom: 0;
-        position: relative;
-
-        &:before {
-          position: absolute;
-          top: 0;
-          right: -$workflow-size-tab-arrow;
-          z-index: 2;
-          display: block;
-          border: $workflow-size-tab-arrow inset transparent;
-          border-right: 0;
-          border-left: $workflow-size-tab-arrow solid $workflow-color-tab-incomplete-bg;
-          content: '';
-        }
-
-        &:after {
-          position: absolute;
-          top: -$workflow-size-tab-border;
-          right: -($workflow-size-tab-arrow + $workflow-size-tab-border);
-          z-index: 1;
-          display: block;
-          border: ($workflow-size-tab-arrow + $workflow-size-tab-border) inset transparent;
-          border-right: 0;
-          border-left: ($workflow-size-tab-arrow + $workflow-size-tab-border) solid $workflow-color-tab-border;
-          content: '';
-        }
-
-        &.active:before,
-        &.done:before {
-          border-left: $workflow-size-tab-arrow solid $workflow-color-tab-complete-bg;
-        }
-
-        a {
-          border: 0;
-          border-radius: 0;
-          background: $workflow-color-tab-incomplete-bg;
-          color: $workflow-color-tab-link-inactive;
-          padding: 0 $workflow-size-tab-padding;
-          padding-left: $workflow-size-tab-arrow + $workflow-size-tab-padding;
-          line-height: $workflow-size-tab-arrow * 2;
-          position: relative;
-          margin: 0;
-        }
-
-        &:first-child a {
-          padding-left: $workflow-size-tab-padding;
-        }
-
-        &.active a {
-          background: $workflow-color-tab-complete-bg;
-          color: $workflow-color-tab-link-active;
-        }
-
-        &.done a {
-          background: $workflow-color-tab-complete-bg;
-        }
-      }
-    }
-
-    label.error {
-      color: $workflow-color-label-error;
-    }
-  }
-}
-
diff --git a/openstack_dashboard/static/dashboard/scss/horizon.scss b/openstack_dashboard/static/dashboard/scss/horizon.scss
index 81ae8bdff0..68cabe2de6 100644
--- a/openstack_dashboard/static/dashboard/scss/horizon.scss
+++ b/openstack_dashboard/static/dashboard/scss/horizon.scss
@@ -40,7 +40,6 @@
 @import "components/tables";
 @import "components/transfer_tables";
 @import "components/wizard";
-@import "components/workflow";
 
 // Framework
 @import "/framework/framework";
diff --git a/openstack_dashboard/test/integration_tests/regions/menus.py b/openstack_dashboard/test/integration_tests/regions/menus.py
index 8029444762..a78085937a 100644
--- a/openstack_dashboard/test/integration_tests/regions/menus.py
+++ b/openstack_dashboard/test/integration_tests/regions/menus.py
@@ -239,7 +239,7 @@ class UserDropDownMenuRegion(DropDownMenuRegion):
 class TabbedMenuRegion(baseregion.BaseRegion):
 
     _tab_locator = (by.By.CSS_SELECTOR, 'a')
-    _default_src_locator = (by.By.CSS_SELECTOR, 'ul.nav.nav-tabs')
+    _default_src_locator = (by.By.CSS_SELECTOR, '.selenium-nav-region')
 
     def switch_to(self, index=0):
         self._get_elements(*self._tab_locator)[index].click()