diff --git a/horizon/templates/horizon/common/_data_table_cell.html b/horizon/templates/horizon/common/_data_table_cell.html
index ee72a33f82..d85e540e02 100644
--- a/horizon/templates/horizon/common/_data_table_cell.html
+++ b/horizon/templates/horizon/common/_data_table_cell.html
@@ -13,7 +13,7 @@
                      name="action" value="" type="submit">
                     <span class="fa fa-fw fa-check"></span>
                 </button>
-                <button class="inline-edit-cancel btn btn-default btn-xs pull-right secondary cancel">
+                <button class="inline-edit-cancel btn btn-default btn-xs pull-right cancel">
                     <span class="fa fa-fw fa-times"></span>
                 </button>
             </div>
diff --git a/horizon/templates/horizon/common/_workflow.html b/horizon/templates/horizon/common/_workflow.html
index ca04ff0adc..22797d5f7b 100644
--- a/horizon/templates/horizon/common/_workflow.html
+++ b/horizon/templates/horizon/common/_workflow.html
@@ -54,8 +54,8 @@
             </div>
           </div>
           {% else %}
-            <input class="btn btn-primary pull-right" type="submit" value="{{ workflow.finalize_button_name }}" />
-            {% if modal %}<a class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>{% endif %}
+            {% if modal %}<a class="btn btn-default cancel">{% trans "Cancel" %}</a>{% endif %}
+            <input class="btn btn-primary" type="submit" value="{{ workflow.finalize_button_name }}" />
           {% endif %}
         {% endblock %}
         </div>
diff --git a/openstack_dashboard/dashboards/admin/aggregates/templates/aggregates/_update.html b/openstack_dashboard/dashboards/admin/aggregates/templates/aggregates/_update.html
index 4788f05797..7e0b509399 100644
--- a/openstack_dashboard/dashboards/admin/aggregates/templates/aggregates/_update.html
+++ b/openstack_dashboard/dashboards/admin/aggregates/templates/aggregates/_update.html
@@ -18,8 +18,3 @@
   <p>{% trans "Host aggregates divide an availability zone into logical units by grouping together hosts. Edit the aggregate host to select hosts contained in it." %}</p>
 </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Save" %}" />
-  <a href="{% url 'horizon:admin:aggregates:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/hypervisors/compute/views.py b/openstack_dashboard/dashboards/admin/hypervisors/compute/views.py
index efe4dde2af..6e1679585d 100644
--- a/openstack_dashboard/dashboards/admin/hypervisors/compute/views.py
+++ b/openstack_dashboard/dashboards/admin/hypervisors/compute/views.py
@@ -28,6 +28,7 @@ class EvacuateHostView(forms.ModalFormView):
     context_object_name = 'compute_host'
     success_url = reverse_lazy("horizon:admin:hypervisors:index")
     page_title = _("Evacuate Host")
+    submit_label = page_title
 
     def get_context_data(self, **kwargs):
         context = super(EvacuateHostView, self).get_context_data(**kwargs)
@@ -60,6 +61,7 @@ class DisableServiceView(forms.ModalFormView):
     context_object_name = 'compute_host'
     success_url = reverse_lazy("horizon:admin:hypervisors:index")
     page_title = _("Disable Service")
+    submit_label = page_title
 
     def get_context_data(self, **kwargs):
         context = super(DisableServiceView, self).get_context_data(**kwargs)
@@ -78,6 +80,7 @@ class MigrateHostView(forms.ModalFormView):
         context_object_name = 'compute_host'
         success_url = reverse_lazy("horizon:admin:hypervisors:index")
         page_title = _("Migrate Host")
+        submit_label = page_title
 
         def get_context_data(self, **kwargs):
             context = super(MigrateHostView, self).get_context_data(**kwargs)
diff --git a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_disable_service.html b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_disable_service.html
index 59e3ff908f..c3664b0453 100644
--- a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_disable_service.html
+++ b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_disable_service.html
@@ -17,8 +17,3 @@
     <p>{% trans "Disable the compute service." %}</p>
 </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Disable Service" %}" />
-  <a href="{% url 'horizon:admin:hypervisors:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_evacuate_host.html b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_evacuate_host.html
index 4e55249768..246a29cb6d 100644
--- a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_evacuate_host.html
+++ b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_evacuate_host.html
@@ -17,8 +17,3 @@
     <p>{% trans "Evacuate the servers from the selected down host to an active target host." %}</p>
 </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Evacuate Host" %}" />
-  <a href="{% url 'horizon:admin:hypervisors:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_migrate_host.html b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_migrate_host.html
index ad36eef7d9..fd91ffbfb9 100644
--- a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_migrate_host.html
+++ b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_migrate_host.html
@@ -16,8 +16,3 @@
         <p>{% trans "Migrate all instances from a host with disabled nova-compute service. Optionally you can choose type of migration. All running instances of the host can be Live Migrated. Cold Migration is trying to use 'nova migrate' on each instance of migrated host." %}</p>
     </div>
 {% endblock %}
-
-{% block modal-footer %}
-    <input class="btn btn-primary pull-right" type="submit" value="{% trans "Migrate Host" %}" />
-    <a href="{% url 'horizon:admin:hypervisors:index' %}" class="btn btn-default cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/instances/templates/instances/_live_migrate.html b/openstack_dashboard/dashboards/admin/instances/templates/instances/_live_migrate.html
index 789f6d559a..679b740b91 100644
--- a/openstack_dashboard/dashboards/admin/instances/templates/instances/_live_migrate.html
+++ b/openstack_dashboard/dashboards/admin/instances/templates/instances/_live_migrate.html
@@ -17,8 +17,3 @@
     <p>{% trans "Live migrate an instance to a specific host." %}</p>
 </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Live Migrate Instance" %}" />
-  <a href="{% url 'horizon:admin:instances:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/instances/views.py b/openstack_dashboard/dashboards/admin/instances/views.py
index 771f5dc773..c240f5d34a 100644
--- a/openstack_dashboard/dashboards/admin/instances/views.py
+++ b/openstack_dashboard/dashboards/admin/instances/views.py
@@ -155,6 +155,7 @@ class LiveMigrateView(forms.ModalFormView):
     context_object_name = 'instance'
     success_url = reverse_lazy("horizon:admin:instances:index")
     page_title = _("Live Migrate")
+    success_label = page_title
 
     def get_context_data(self, **kwargs):
         context = super(LiveMigrateView, self).get_context_data(**kwargs)
diff --git a/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_create.html b/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_create.html
index 760518d4ab..85de7fe75c 100644
--- a/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_create.html
+++ b/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_create.html
@@ -29,8 +29,3 @@
   </p>
 </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Import Namespace" %}" />
-  <a href="{% url 'horizon:admin:metadata_defs:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/resource_types.html b/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/resource_types.html
index 553eb6e830..679efeff83 100644
--- a/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/resource_types.html
+++ b/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/resource_types.html
@@ -75,10 +75,10 @@
 
 {% block modal-footer %}
   <div>
-    <input class="btn btn-primary pull-right" type="submit"
-           ng:click="ctrl.saveResourceTypes()" value="{% trans "Save" %}"/>
-    <a class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
+    <a class="btn btn-default cancel">{% trans "Cancel" %}</a>
     <input type="hidden" name="resource_types" ng-value="ctrl.resource_types"
            ng-model="ctrl.resource_types">
+    <input class="btn btn-primary" type="submit"
+           ng:click="ctrl.saveResourceTypes()" value="{% trans "Save" %}"/>
   </div>
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/metadata_defs/views.py b/openstack_dashboard/dashboards/admin/metadata_defs/views.py
index 97e64e2808..fafb94e74f 100644
--- a/openstack_dashboard/dashboards/admin/metadata_defs/views.py
+++ b/openstack_dashboard/dashboards/admin/metadata_defs/views.py
@@ -84,6 +84,7 @@ class CreateView(forms.ModalFormView):
     context_object_name = 'namespace'
     success_url = reverse_lazy(constants.METADATA_INDEX_URL)
     page_title = _("Create a Metadata Namespace")
+    submit_label = _("Import Namespace")
 
 
 class DetailView(tabs.TabView):
diff --git a/openstack_dashboard/dashboards/admin/metering/templates/metering/_daily.html b/openstack_dashboard/dashboards/admin/metering/templates/metering/_daily.html
index aa40104d73..6d19330541 100644
--- a/openstack_dashboard/dashboards/admin/metering/templates/metering/_daily.html
+++ b/openstack_dashboard/dashboards/admin/metering/templates/metering/_daily.html
@@ -19,11 +19,6 @@
 </div>
 {% endblock %}
 
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "View Usage Report" %}" />
-  <a href="{% url 'horizon:admin:metering:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
-
 {% block modal-js %}
 <script type="text/javascript">
   if (typeof horizon.metering !== 'undefined') {
diff --git a/openstack_dashboard/dashboards/admin/metering/views.py b/openstack_dashboard/dashboards/admin/metering/views.py
index c7787eabeb..4d37c24443 100644
--- a/openstack_dashboard/dashboards/admin/metering/views.py
+++ b/openstack_dashboard/dashboards/admin/metering/views.py
@@ -42,6 +42,7 @@ class CreateUsageReport(forms.ModalFormView):
     template_name = 'admin/metering/daily.html'
     success_url = reverse_lazy('horizon:admin:metering:index')
     page_title = _("Modify Usage Report Parameters")
+    submit_label = _("View Usage Report")
 
 
 class SamplesView(django.views.generic.TemplateView):
diff --git a/openstack_dashboard/dashboards/admin/networks/templates/networks/_create.html b/openstack_dashboard/dashboards/admin/networks/templates/networks/_create.html
index 6c726fbd4b..17c52be3f1 100644
--- a/openstack_dashboard/dashboards/admin/networks/templates/networks/_create.html
+++ b/openstack_dashboard/dashboards/admin/networks/templates/networks/_create.html
@@ -20,8 +20,3 @@
     <p>{% trans "In addition, you can create an external network or a shared network by checking the corresponding checkbox."%}</p>
 </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Create Network" %}" />
-  <a href="{% url 'horizon:admin:networks:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/extras/_index.html b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/extras/_index.html
index 723d633b58..1848d92e99 100644
--- a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/extras/_index.html
+++ b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/extras/_index.html
@@ -9,6 +9,6 @@
 {% endblock %}
 
 {% block modal-footer %}
-  <a href="{% url 'horizon:admin:volumes:index' %}" class="btn btn-default secondary cancel close">{% trans "Close" %}</a>
+  <a href="{% url 'horizon:admin:volumes:index' %}" class="btn btn-default cancel">{% trans "Close" %}</a>
 {% endblock %}
 
diff --git a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/_index.html b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/_index.html
index 7491f0ed25..68d7c8643b 100644
--- a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/_index.html
+++ b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/_index.html
@@ -10,5 +10,5 @@
 {% endblock %}
 
 {% block modal-footer %}
-  <a href="{% url 'horizon:admin:volumes:volume_types_tab' %}" class="btn btn-default secondary cancel close">{% trans "Close" %}</a>
+  <a href="{% url 'horizon:admin:volumes:volume_types_tab' %}" class="btn btn-default cancel">{% trans "Close" %}</a>
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/identity/groups/templates/groups/_add_non_member.html b/openstack_dashboard/dashboards/identity/groups/templates/groups/_add_non_member.html
index c6ccb05ea3..d2bdbec032 100644
--- a/openstack_dashboard/dashboards/identity/groups/templates/groups/_add_non_member.html
+++ b/openstack_dashboard/dashboards/identity/groups/templates/groups/_add_non_member.html
@@ -4,5 +4,5 @@
 {% block modal-header %}{% trans "Add Group Assignment" %}{% endblock %}
 
 {% block modal-footer %}
-  <a href="{% url 'horizon:identity:groups:manage_members' group.id %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
+  <a href="{% url 'horizon:identity:groups:manage_members' group.id %}" class="btn btn-default cancel">{% trans "Cancel" %}</a>
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/api_access/_credentials.html b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/api_access/_credentials.html
index 25cdd7b4d8..14665dbe72 100644
--- a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/api_access/_credentials.html
+++ b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/api_access/_credentials.html
@@ -65,5 +65,5 @@
 {% endblock %}
 
 {% block modal-footer %}
-  <a href="{% url 'horizon:project:access_and_security:index' %}" class="btn btn-default secondary cancel close">{% trans "Close" %}</a>
+  <a href="{% url 'horizon:project:access_and_security:index' %}" class="btn btn-default cancel">{% trans "Close" %}</a>
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_container_detail.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_container_detail.html
index bf4cc9c046..659bdcee1d 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_container_detail.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_container_detail.html
@@ -25,5 +25,5 @@
 {% endblock %}
 
 {% block modal-footer %}
-  <a href="{% url 'horizon:project:containers:index' %}" class="btn btn-default secondary cancel close">{% trans "Close" %}</a>
+  <a href="{% url 'horizon:project:containers:index' %}" class="btn btn-default cancel">{% trans "Close" %}</a>
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html
index f2a9d9023b..04fc6f2ec0 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html
@@ -20,5 +20,5 @@
 
 {% block modal-footer %}
     <input class="btn btn-primary pull-right" type="submit" value="{% trans "Copy Object" %}" />
-    <a href="{% url 'horizon:project:containers:index' container_name|add:'/' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
+    <a href="{% url 'horizon:project:containers:index' container_name|add:'/' %}" class="btn btn-default cancel">{% trans "Cancel" %}</a>
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html
index bf0f2adb99..8367ab25a9 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html
@@ -18,8 +18,3 @@
     <p>{% trans "Note: A Public Container will allow anyone with the Public URL to gain access to your objects in the container." %}</p>
 </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Create Container" %}" />
-  <a href="{% url 'horizon:project:containers:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html
index 098a09ee17..bef492cb17 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html
@@ -21,6 +21,6 @@
 {% endblock %}
 
 {% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Create" %}" />
-  <a href="{% url 'horizon:project:containers:index' container_name|add:'/' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
+  <a href="{% url 'horizon:project:containers:index' container_name|add:'/' %}" class="btn btn-default cancel">{% trans "Cancel" %}</a>
+  <input class="btn btn-primary" type="submit" value="{% trans "Create" %}" />
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_object_detail.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_object_detail.html
index a4dd95e000..cd6d5b181a 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_object_detail.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_object_detail.html
@@ -21,5 +21,5 @@
 {% endblock %}
 
 {% block modal-footer %}
-  <a href="{% url 'horizon:project:containers:index' %}" class="btn btn-default secondary cancel close">{% trans "Close" %}</a>
+  <a href="{% url 'horizon:project:containers:index' %}" class="btn btn-default cancel">{% trans "Close" %}</a>
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html
index 4878637e96..6bb75c65df 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html
@@ -23,6 +23,6 @@
 {% endblock %}
 
 {% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" ng-disabled="updateForm.$invalid" value="{% trans "Update Object" %}" />
-  <a href="{% url 'horizon:project:containers:index' container_name|add:'/' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
+  <a href="{% url 'horizon:project:containers:index' container_name|add:'/' %}" class="btn btn-default cancel">{% trans "Cancel" %}</a>
+  <input class="btn btn-primary" type="submit" ng-disabled="updateForm.$invalid" value="{% trans "Update Object" %}" />
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html
index 6b5336d99d..e7996a888e 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html
@@ -24,6 +24,6 @@
 {% endblock %}
 
 {% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" ng-disabled="uploadForm.$invalid || uploadForm.$pristine" value="{% trans "Upload Object" %}" />
-  <a href="{% url 'horizon:project:containers:index' container_name|add:'/' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
+  <a href="{% url 'horizon:project:containers:index' container_name|add:'/' %}" class="btn btn-default cancel">{% trans "Cancel" %}</a>
+  <input class="btn btn-primary" type="submit" ng-disabled="uploadForm.$invalid || uploadForm.$pristine" value="{% trans "Upload Object" %}" />
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_decryptpassword.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_decryptpassword.html
index dbdc43ecce..163eafd34b 100644
--- a/openstack_dashboard/dashboards/project/instances/templates/instances/_decryptpassword.html
+++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_decryptpassword.html
@@ -30,5 +30,5 @@
 {% endif %}
 {% endfor %}
 
-<a href="{% url "horizon:project:instances:index" %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
+<a href="{% url "horizon:project:instances:index" %}" class="btn btn-default cancel">{% trans "Cancel" %}</a>
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_rebuild.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_rebuild.html
index a8522dccb0..4256f1ed0b 100644
--- a/openstack_dashboard/dashboards/project/instances/templates/instances/_rebuild.html
+++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_rebuild.html
@@ -21,9 +21,3 @@
   {% endif %}
 </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Rebuild Instance" %}" />
-  <a href="{% url "horizon:project:instances:index" %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
-
diff --git a/openstack_dashboard/dashboards/project/instances/views.py b/openstack_dashboard/dashboards/project/instances/views.py
index 09e4821e56..26e4595f6b 100644
--- a/openstack_dashboard/dashboards/project/instances/views.py
+++ b/openstack_dashboard/dashboards/project/instances/views.py
@@ -263,6 +263,7 @@ class RebuildView(forms.ModalFormView):
     template_name = 'project/instances/rebuild.html'
     success_url = reverse_lazy('horizon:project:instances:index')
     page_title = _("Rebuild Instance")
+    submit_label = page_title
 
     def get_context_data(self, **kwargs):
         context = super(RebuildView, self).get_context_data(**kwargs)
diff --git a/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/_create_router.html b/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/_create_router.html
index f19ee09569..73c9c33bd6 100644
--- a/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/_create_router.html
+++ b/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/_create_router.html
@@ -14,8 +14,3 @@
     </fieldset>
   </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Create Router" %}" />
-  <a href="{% url 'horizon:project:network_topology:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/networks/templates/networks/_create.html b/openstack_dashboard/dashboards/project/networks/templates/networks/_create.html
index 915bc60eea..d516bb2be5 100644
--- a/openstack_dashboard/dashboards/project/networks/templates/networks/_create.html
+++ b/openstack_dashboard/dashboards/project/networks/templates/networks/_create.html
@@ -17,8 +17,3 @@
     <p>{% trans "Select a name for your network."%}</p>
 </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Create Network" %}" />
-  <a href="{% url 'horizon:project:networks:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/networks/templates/networks/create.html b/openstack_dashboard/dashboards/project/networks/templates/networks/create.html
index d2d14ffeb3..2d63d37500 100644
--- a/openstack_dashboard/dashboards/project/networks/templates/networks/create.html
+++ b/openstack_dashboard/dashboards/project/networks/templates/networks/create.html
@@ -4,13 +4,13 @@
 {% block modal-footer %}
   {% if workflow.wizard %}
   <div class="row footer-row">
-    <a class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
+    <a class="btn btn-default cancel">{% trans "Cancel" %}</a>
     <button type="button" class="btn btn-default button-previous">{% trans "&laquo;&nbsp;Back" %}</button>
     <button type="button" class="btn btn-primary button-next">{% trans "Next&nbsp;&raquo;" %}</button>
     <button type="submit" class="btn btn-primary button-final">{{ workflow.finalize_button_name }}</button>
   </div>
   {% else %}
-    <input class="btn btn-primary pull-right" type="submit" value="{{ workflow.finalize_button_name }}" />
-    {% if modal %}<a class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>{% endif %}
+    {% if modal %}<a class="btn btn-default cancel">{% trans "Cancel" %}</a>{% endif %}
+    <input class="btn btn-primary" type="submit" value="{{ workflow.finalize_button_name }}" />
   {% endif %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerroutes/_create.html b/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerroutes/_create.html
index ce096288b4..1073fbf89b 100644
--- a/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerroutes/_create.html
+++ b/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerroutes/_create.html
@@ -21,8 +21,3 @@
     </p>
 </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Add route" %}" />
-  <a href="{% url 'horizon:project:routers:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/_create.html b/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/_create.html
index b512062f44..27ee8c75ca 100644
--- a/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/_create.html
+++ b/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/_create.html
@@ -21,8 +21,3 @@
     </p>
 </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Add rule" %}" />
-  <a href="{% url 'horizon:project:routers:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_create.html b/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_create.html
index da1387ea0d..5b9516703e 100644
--- a/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_create.html
+++ b/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_create.html
@@ -23,8 +23,3 @@
     </p>
 </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Add interface" %}" />
-  <a href="{% url 'horizon:project:routers:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_setgateway.html b/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_setgateway.html
index cb9d5c0733..626f51b2ba 100644
--- a/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_setgateway.html
+++ b/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_setgateway.html
@@ -18,8 +18,3 @@
     <p>{% trans "You can connect a specified external network to the router. The external network is regarded as a default route of the router and the router acts as a gateway for external connectivity." %}</p>
 </div>
 {% endblock %}
-
-{% block modal-footer %}
-  <input class="btn btn-primary pull-right" type="submit" value="{% trans "Set Gateway" %}" />
-  <a href="{% url 'horizon:project:routers:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/stacks/templates/stacks/_preview_details.html b/openstack_dashboard/dashboards/project/stacks/templates/stacks/_preview_details.html
index c66116d393..b418edcc5e 100644
--- a/openstack_dashboard/dashboards/project/stacks/templates/stacks/_preview_details.html
+++ b/openstack_dashboard/dashboards/project/stacks/templates/stacks/_preview_details.html
@@ -54,5 +54,5 @@
 {% endblock %}
 
 {% block modal-footer %}
-  <a href="{% url 'horizon:project:stack:index' %}" class="btn btn-default secondary cancel close">{% trans "Close" %}</a>
+  <a href="{% url 'horizon:project:stack:index' %}" class="btn btn-default cancel">{% trans "Close" %}</a>
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_attach.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_attach.html
index c985eca91a..a5e0140e73 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_attach.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_attach.html
@@ -13,8 +13,8 @@
 {% endblock %}
 
 {% block modal-footer %}
-    {% if show_attach %}
-        <input class="btn btn-primary pull-right" type="submit" value="{% trans "Attach Volume" %}" />
-    {% endif %}
-    <a href="{% url 'horizon:project:volumes:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
+    <a href="{% url 'horizon:project:volumes:index' %}" class="btn btn-default cancel">{% trans "Cancel" %}</a>
+  {% if show_attach %}
+    <input class="btn btn-primary" type="submit" value="{% trans "Attach Volume" %}" />
+  {% endif %}
 {% endblock %}
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_create_snapshot.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_create_snapshot.html
index 97afbc27cc..dc689c8d2c 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_create_snapshot.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_create_snapshot.html
@@ -8,10 +8,10 @@
 {% endblock %}
 
 {% block modal-footer %}
+  <a href="{% url 'horizon:project:volumes:index' %}" class="btn btn-default cancel">{% trans "Cancel" %}</a>
   {% if attached %}
-    <input class="btn btn-primary btn-warning pull-right" type="submit" value="{% trans "Create Volume Snapshot (Force)" %}" />
+    <input class="btn btn-warning" type="submit" value="{% trans "Create Volume Snapshot (Force)" %}" />
   {% else %}
-    <input class="btn btn-primary pull-right" type="submit" value="{% trans "Create Volume Snapshot" %}" />
+    <input class="btn btn-primary" type="submit" value="{% trans "Create Volume Snapshot" %}" />
   {% endif %}
-  <a href="{% url 'horizon:project:volumes:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
 {% endblock %}
diff --git a/openstack_dashboard/static/dashboard/scss/components/_modals.scss b/openstack_dashboard/static/dashboard/scss/components/_modals.scss
index 4f3513274b..28b50355aa 100644
--- a/openstack_dashboard/static/dashboard/scss/components/_modals.scss
+++ b/openstack_dashboard/static/dashboard/scss/components/_modals.scss
@@ -40,24 +40,6 @@
     margin-right: 0;
     margin-left: 0;
   }
-
-  a.close {
-    margin-top: 0;
-    margin-right: 5px;
-    font-size: $font-size-base;
-    line-height: $line-height-base;
-    color: #666;
-    font-weight: normal;
-    filter: alpha(opacity=100);
-    -khtml-opacity: 1;
-    -moz-opacity: 1;
-    opacity: 1;
-  }
-
-  a.close:hover {
-    color: #333;
-    text-decoration: none;
-  }
 }
 
 .modal-body {