diff --git a/netbox/templates/account/password.html b/netbox/templates/account/password.html
index 055be4879..4a2cf640f 100644
--- a/netbox/templates/account/password.html
+++ b/netbox/templates/account/password.html
@@ -14,7 +14,7 @@
       {% render_field form.new_password2 %}
     </div>
     <div class="text-end">
-      <a href="{% url 'account:profile' %}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
+      <a href="{% url 'account:profile' %}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
       <button type="submit" name="_update" class="btn btn-primary">{% trans "Save" %}</button>
     </div>
   </form>
diff --git a/netbox/templates/account/preferences.html b/netbox/templates/account/preferences.html
index f63a4c8c7..93ca5dfc2 100644
--- a/netbox/templates/account/preferences.html
+++ b/netbox/templates/account/preferences.html
@@ -79,7 +79,7 @@
       </div>
     </div>
     <div class="text-end my-3">
-      <a class="btn btn-outline-secondary" href="{% url 'account:preferences' %}">{% trans "Cancel" %}</a>
+      <a href="{% url 'account:preferences' %}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
       <button type="submit" name="_update" class="btn btn-primary">{% trans "Save" %}</button>
     </div>
   </form>
diff --git a/netbox/templates/core/configrevision_restore.html b/netbox/templates/core/configrevision_restore.html
index ad6fb1bd9..2b3803d84 100644
--- a/netbox/templates/core/configrevision_restore.html
+++ b/netbox/templates/core/configrevision_restore.html
@@ -77,7 +77,7 @@
       <div class="controls">
         <div class="control-group">
           <button type="submit" name="restore" class="btn btn-primary">{% trans "Restore" %}</button>
-          <a href="{% url 'core:configrevision_list' %}" id="cancel" name="cancel" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
+          <a href="{% url 'core:configrevision_list' %}" id="cancel" name="cancel" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
         </div>
       </div>
     </div>
diff --git a/netbox/templates/dcim/devicebay_populate.html b/netbox/templates/dcim/devicebay_populate.html
index 6d1b81a85..b6e7a6560 100644
--- a/netbox/templates/dcim/devicebay_populate.html
+++ b/netbox/templates/dcim/devicebay_populate.html
@@ -31,7 +31,7 @@
     </div>
     <div class="row">
         <div class="col col-md-6 offset-md-3 text-end">
-            <a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
+            <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
             <button type="submit" name="_update" class="btn btn-primary">{% trans "Save" %}</button>
         </div>
     </div>
diff --git a/netbox/templates/dcim/virtualchassis_add_member.html b/netbox/templates/dcim/virtualchassis_add_member.html
index ceb2c71b3..e4156ec50 100644
--- a/netbox/templates/dcim/virtualchassis_add_member.html
+++ b/netbox/templates/dcim/virtualchassis_add_member.html
@@ -21,9 +21,11 @@
             </div>
         </div>
         <div class="text-end my-3">
-            <a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
-            <button type="submit" name="_addanother" class="btn btn-outline-primary">{% trans "Add Another" %}</button>
+          <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
+          <div class="btn-group" role="group" aria-label="{% trans "Actions" %}">
             <button type="submit" name="_save" class="btn btn-primary">{% trans "Save" %}</button>
+            <button type="submit" name="_addanother" class="btn btn-outline-primary">{% trans "Save & Add Another" %}</button>
+          </div>
         </div>
     </form>
 {% endblock %}
diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html
index 7271ce7d8..d9a698591 100644
--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -100,7 +100,7 @@
         </table>
       </div>
       <div class="text-end">
-          <a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
+          <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
           {% if vc_form.instance.pk %}
               <button type="submit" name="_update" class="btn btn-primary">{% trans "Save" %}</button>
           {% else %}
diff --git a/netbox/templates/extras/object_journal.html b/netbox/templates/extras/object_journal.html
index 7b23772a6..1b775b7f5 100644
--- a/netbox/templates/extras/object_journal.html
+++ b/netbox/templates/extras/object_journal.html
@@ -23,7 +23,7 @@
               {% render_form form %}
             </div>
             <div class="col col-md-12 text-end my-3">
-              <a href="{{ object.get_absolute_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
+              <a href="{{ object.get_absolute_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
               <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
             </div>
           </div>
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index 9aa606dc3..05b285bf5 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -33,7 +33,7 @@
           {% endfor %}
         </div>
         <div class="float-end">
-          <a href="{% url 'extras:script_list' %}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
+          <a href="{% url 'extras:script_list' %}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
           <button type="submit" name="_run" class="btn btn-primary"{% if not perms.extras.run_script %} disabled="disabled"{% endif %}><i class="mdi mdi-play"></i> {% trans "Run Script" %}</button>
         </div>
       </form>
diff --git a/netbox/templates/generic/bulk_add_component.html b/netbox/templates/generic/bulk_add_component.html
index 6482496d7..5bd1d4a75 100644
--- a/netbox/templates/generic/bulk_add_component.html
+++ b/netbox/templates/generic/bulk_add_component.html
@@ -50,7 +50,7 @@
           </div>
           <div class="form-group text-end">
             <div class="col col-md-12">
-              <a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
+              <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
               <button type="submit" name="_create" class="btn btn-primary">{% trans "Create" %}</button>
             </div>
           </div>
diff --git a/netbox/templates/generic/bulk_delete.html b/netbox/templates/generic/bulk_delete.html
index 21894a31b..6015747d0 100644
--- a/netbox/templates/generic/bulk_delete.html
+++ b/netbox/templates/generic/bulk_delete.html
@@ -56,8 +56,8 @@ Context:
           {{ field }}
         {% endfor %}
         <div class="text-end">
+          <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
           <button type="submit" name="_confirm" class="btn btn-danger">{% trans "Delete" %} {{ table.rows|length }} {{ model|meta:"verbose_name_plural" }}</button>
-          <a href="{{ return_url }}" class="btn btn-outline-dark">{% trans "Cancel" %}</a>
         </div>
       </form>
     </div>
diff --git a/netbox/templates/generic/bulk_edit.html b/netbox/templates/generic/bulk_edit.html
index 5505218ef..b762f33dd 100644
--- a/netbox/templates/generic/bulk_edit.html
+++ b/netbox/templates/generic/bulk_edit.html
@@ -113,8 +113,8 @@ Context:
       {% endif %}
 
       <div class="text-end">
+        <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
         <button type="submit" name="_apply" class="btn btn-primary">{% trans "Apply" %}</button>
-        <a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
       </div>
 
     </form>
diff --git a/netbox/templates/generic/bulk_import.html b/netbox/templates/generic/bulk_import.html
index a5825ca97..6ec135d82 100644
--- a/netbox/templates/generic/bulk_import.html
+++ b/netbox/templates/generic/bulk_import.html
@@ -47,10 +47,10 @@ Context:
           {% render_field form.csv_delimiter %}
           <div class="form-group">
             <div class="col col-md-12 text-end">
-              <button type="submit" name="data_submit" class="btn btn-primary">{% trans "Submit" %}</button>
               {% if return_url %}
-                <a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
+                <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
               {% endif %}
+              <button type="submit" name="data_submit" class="btn btn-primary">{% trans "Submit" %}</button>
             </div>
           </div>
         </form>
@@ -69,10 +69,10 @@ Context:
         {% render_field form.csv_delimiter %}
         <div class="form-group">
           <div class="col col-md-12 text-end">
-            <button type="submit" name="file_submit" class="btn btn-primary">{% trans "Submit" %}</button>
             {% if return_url %}
-              <a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
+              <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
             {% endif %}
+            <button type="submit" name="file_submit" class="btn btn-primary">{% trans "Submit" %}</button>
           </div>
         </div>
       </form>
@@ -91,10 +91,10 @@ Context:
         {% render_field form.csv_delimiter %}
         <div class="form-group">
           <div class="col col-md-12 text-end">
-            <button type="submit" name="file_submit" class="btn btn-primary">{% trans "Submit" %}</button>
             {% if return_url %}
-              <a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
+              <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
             {% endif %}
+            <button type="submit" name="file_submit" class="btn btn-primary">{% trans "Submit" %}</button>
           </div>
         </div>
       </form>
diff --git a/netbox/templates/generic/bulk_remove.html b/netbox/templates/generic/bulk_remove.html
index 0c76897db..a1412849f 100644
--- a/netbox/templates/generic/bulk_remove.html
+++ b/netbox/templates/generic/bulk_remove.html
@@ -33,13 +33,13 @@
     {% for field in form.hidden_fields %}
       {{ field }}
     {% endfor %}
-    <div class="text-center">
+    <div class="text-end">
+      <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
       <button type="submit" name="_confirm" class="btn btn-danger">
         {% blocktrans trimmed with count=table.rows|length %}
           Delete these {{ count }} {{ obj_type_plural }}
         {% endblocktrans %}
       </button>
-      <a href="{{ return_url }}" class="btn btn-outline-dark">{% trans "Cancel" %}</a>
     </div>
   </form>
 </div>
diff --git a/netbox/templates/generic/bulk_rename.html b/netbox/templates/generic/bulk_rename.html
index 6b7af6789..751039e52 100644
--- a/netbox/templates/generic/bulk_rename.html
+++ b/netbox/templates/generic/bulk_rename.html
@@ -37,11 +37,11 @@
                 </div>
             </div>
             <div class="col col-md-12 my-3 text-end">
+                <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
                 <button type="submit" name="_preview" class="btn btn-primary">{% trans "Preview" %}</button>
                 {% if '_preview' in request.POST and not form.errors %}
                     <button type="submit" name="_apply" class="btn btn-primary">{% trans "Apply" %}</button>
                 {% endif %}
-                <a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
             </div>
         </form>
     </div>
diff --git a/netbox/templates/generic/confirmation_form.html b/netbox/templates/generic/confirmation_form.html
index 14a36a61e..88c37867b 100644
--- a/netbox/templates/generic/confirmation_form.html
+++ b/netbox/templates/generic/confirmation_form.html
@@ -16,8 +16,8 @@
             {% block message %}<p>{% trans "Are you sure" %}?</p>{% endblock %}
           </div>
           <div class="card-footer text-end">
+            <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
             <button type="submit" name="_confirm" class="btn btn-{{ button_class|default:"danger" }}">{% trans "Confirm" %}</button>
-            <a href="{{ return_url }}" class="btn btn-outline-dark">{% trans "Cancel" %}</a>
           </div>
         </div>
       </form>
diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html
index ecc24121c..e1d04c4ff 100644
--- a/netbox/templates/generic/object_edit.html
+++ b/netbox/templates/generic/object_edit.html
@@ -70,12 +70,14 @@ Context:
               {% trans "Save" %}
             </button>
           {% else %}
-            <button type="submit" name="_create" class="btn btn-primary">
-              {% trans "Create" %}
-            </button>
-            <button type="submit" name="_addanother" class="btn btn-outline-primary">
-              {% trans "Create & Add Another" %}
-            </button>
+            <div class="btn-group" role="group" aria-label="{% trans "Actions" %}">
+              <button type="submit" name="_create" class="btn btn-primary">
+                {% trans "Create" %}
+              </button>
+              <button type="submit" name="_addanother" class="btn btn-outline-primary">
+                {% trans "Create & Add Another" %}
+              </button>
+            </div>
           {% endif %}
         {% endblock buttons %}
       </div>
diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html
index 585281857..4ddd19941 100644
--- a/netbox/templates/ipam/ipaddress_assign.html
+++ b/netbox/templates/ipam/ipaddress_assign.html
@@ -28,7 +28,7 @@
         </div>
         <div class="row mb-3">
             <div class="col col-md-8 offset-md-2 text-end">
-                <a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
+                <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
                 <button type="submit" class="btn btn-primary">{% trans "Search" %}</button>
             </div>
         </div>
diff --git a/netbox/templates/virtualization/cluster_add_devices.html b/netbox/templates/virtualization/cluster_add_devices.html
index 38d3655d3..725fce4de 100644
--- a/netbox/templates/virtualization/cluster_add_devices.html
+++ b/netbox/templates/virtualization/cluster_add_devices.html
@@ -27,7 +27,7 @@
         </div>
         <div class="row">
             <div class="col col-md-6 offset-md-3 text-end noprint">
-                <a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
+                <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
                 <button type="submit" name="_add" class="btn btn-primary">{% trans "Add Devices" %}</button>
             </div>
         </div>