diff --git a/attendance/templates/attendance/break_point/condition_form.html b/attendance/templates/attendance/break_point/condition_form.html
index 5be032b2b..b75f468ae 100644
--- a/attendance/templates/attendance/break_point/condition_form.html
+++ b/attendance/templates/attendance/break_point/condition_form.html
@@ -23,12 +23,11 @@
 		<div class="oh-inner-sidebar-content__body">
 			<div class="oh-input-group">{{form}}</div>
 		</div>
-		<button
-			type="submit"
-			class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
-		>
-			{% trans "Save Changes" %}
-		</button>
+		<div class="d-flex flex-row-reverse mt-3">
+			<button type="submit" class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp">
+			{% trans "Save" %}
+			</button>
+		</div>
 		<div class="oh-inner-sidebar-content__footer"></div>
 	</form>
 </div>
diff --git a/attendance/templates/attendance/grace_time/grace_time_form.html b/attendance/templates/attendance/grace_time/grace_time_form.html
index f838e0c7a..150028642 100644
--- a/attendance/templates/attendance/grace_time/grace_time_form.html
+++ b/attendance/templates/attendance/grace_time/grace_time_form.html
@@ -15,42 +15,41 @@
     </div>
     <div class="oh-modal__dialog-body" id="">
         {% if form.errors %}
-<!-- form errors  -->
-    <div class="oh-wrapper">
-        <div class="oh-alert-container">
-            {% for error in form.non_field_errors %}
-            <div class="oh-alert oh-alert--animated oh-alert--danger">
-                {{ error }}
+        <!-- form errors  -->
+            <div class="oh-wrapper">
+                <div class="oh-alert-container">
+                    {% for error in form.non_field_errors %}
+                    <div class="oh-alert oh-alert--animated oh-alert--danger">
+                        {{ error }}
+                    </div>
+                    {% endfor %}
+                </div>
             </div>
-            {% endfor %}
-        </div>
-    </div>
-{% endif %}
-<form  
-    {% if grace_id %}
-        {% comment %} {% if is_default %} {% endcomment %}
-            hx-post="{% url 'update-grace-time' grace_id %}"
-        {% comment %} {% else %}
-            hx-post="{% url 'update-grace-time' grace_id %}"
-        {% endif %} {% endcomment %}
-    {% else	%}
-        {% if is_default %}
-            hx-post="{% url 'create-grace-time' %}?default=True"
-        {% else %}
-            hx-post="{% url 'create-grace-time' %}?default=False"
         {% endif %}
-    {% endif %}
-    hx-target="#graceTimeModalTarget"
-    method="post" 
-    hx-encoding="multipart/form-data">
-    {% csrf_token %}
-    {{form.as_p}}
-    <button
-		type="submit"
-		class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
-	>
-		{% trans "Save" %}
-	</button>
-</form>
+        <form  
+            {% if grace_id %}
+                {% comment %} {% if is_default %} {% endcomment %}
+                    hx-post="{% url 'update-grace-time' grace_id %}"
+                {% comment %} {% else %}
+                    hx-post="{% url 'update-grace-time' grace_id %}"
+                {% endif %} {% endcomment %}
+            {% else	%}
+                {% if is_default %}
+                    hx-post="{% url 'create-grace-time' %}?default=True"
+                {% else %}
+                    hx-post="{% url 'create-grace-time' %}?default=False"
+                {% endif %}
+            {% endif %}
+            hx-target="#graceTimeModalTarget"
+            method="post" 
+            hx-encoding="multipart/form-data">
+            {% csrf_token %}
+            {{form.as_p}}
+            <div class="d-flex flex-row-reverse mt-3">
+                <button type="submit" class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp">
+                {% trans "Save" %}
+                </button>
+            </div>
+        </form>
     </div>
 </div>
diff --git a/base/templates/base/auth/group_assign.html b/base/templates/base/auth/group_assign.html
index 38f4d9e68..7d3a94fb7 100644
--- a/base/templates/base/auth/group_assign.html
+++ b/base/templates/base/auth/group_assign.html
@@ -5,9 +5,9 @@
 <div class="oh-input-group mb-2">{{form.name.errors}} {{form.name}}</div>
 {{form.permissions.errors}}
 <div id="permTable">{% include "base/auth/permission_table.html" %}</div>
-<button
-  type="submit"
-  class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
->
-  {% trans "Save Changes" %}
-</button>
+
+<div class="d-flex flex-row-reverse">
+  <button type="submit" class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp">
+    {% trans "Save" %}
+  </button>
+</div>
diff --git a/base/templates/base/auth/group_user_assign.html b/base/templates/base/auth/group_user_assign.html
index c2a2f1c1a..9f70878a8 100644
--- a/base/templates/base/auth/group_user_assign.html
+++ b/base/templates/base/auth/group_user_assign.html
@@ -3,11 +3,10 @@
     {{form.employee.errors}}
     {{form.employee}}
     <input type="hidden" name="group" value="{{group_id}}" id="{{group_id}}">
-    <button
-    type="submit"
-    class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
-    >
-    {% trans "Save Changes" %}
-    </button>
+    <div class="d-flex flex-row-reverse">
+        <button type="submit" class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp">
+          {% trans "Save" %}
+        </button>
+    </div>
 
 </form>
\ No newline at end of file
diff --git a/base/templates/base/auth/permission_assign.html b/base/templates/base/auth/permission_assign.html
index 084c2da5e..f5962e253 100644
--- a/base/templates/base/auth/permission_assign.html
+++ b/base/templates/base/auth/permission_assign.html
@@ -8,9 +8,8 @@
 {{form.permission.errors}}
 <div id="permTable">{% include "base/auth/permission_table.html" %}</div>
 
-<button
-  type="submit"
-  class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
->
-  {% trans "Save Changes" %}
-</button>
+<div class="d-flex flex-row-reverse mt-3">
+  <button type="submit" class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp">
+    {% trans "Save" %}
+  </button>
+</div>
diff --git a/base/templates/base/company/company_form.html b/base/templates/base/company/company_form.html
index df1f26050..93c761be9 100644
--- a/base/templates/base/company/company_form.html
+++ b/base/templates/base/company/company_form.html
@@ -54,12 +54,11 @@
 			{{form.icon}} {{form.icon.errors}}
 		</div>
 	</div>
-	<button
-		type="submit"
-		class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
-	>
-		{% trans "Save Changes" %}
-	</button>
+	<div class="d-flex flex-row-reverse mt-3">
+		<button type="submit" class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp">
+		{% trans "Save" %}
+		</button>
+	</div>
 	<div class="oh-inner-sidebar-content__footer"></div>
 </form>
 
diff --git a/base/templates/base/employee_tag/employee_tag_form.html b/base/templates/base/employee_tag/employee_tag_form.html
index 24f9e0580..f3d633975 100644
--- a/base/templates/base/employee_tag/employee_tag_form.html
+++ b/base/templates/base/employee_tag/employee_tag_form.html
@@ -22,10 +22,9 @@
     hx-encoding="multipart/form-data">
     {% csrf_token %}
     {{form.as_p}}
-    <button
-		type="submit"
-		class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
-	>
+	<div class="d-flex flex-row-reverse mt-3">
+		<button type="submit" class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp">
 		{% trans "Save" %}
-	</button>
+		</button>
+	</div>
 </form>
\ No newline at end of file
diff --git a/base/templates/base/shift/schedule_form.html b/base/templates/base/shift/schedule_form.html
index e06c0d4e6..c7c99be18 100644
--- a/base/templates/base/shift/schedule_form.html
+++ b/base/templates/base/shift/schedule_form.html
@@ -47,9 +47,11 @@
             {{form.end_time}}
         </div>
     </div>
-    <button type='submit' class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp">
-        {% trans "Save Changes" %}
-    </button>
+	<div class="d-flex flex-row-reverse mt-3">
+		<button type="submit" class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp">
+		{% trans "Save" %}
+		</button>
+	</div>
     <div class="oh-inner-sidebar-content__footer">
     </div>
 </form>
\ No newline at end of file
diff --git a/base/templates/base/tags/tags_form.html b/base/templates/base/tags/tags_form.html
index d446027ff..f6e2a843b 100644
--- a/base/templates/base/tags/tags_form.html
+++ b/base/templates/base/tags/tags_form.html
@@ -22,10 +22,9 @@
     hx-encoding="multipart/form-data">
     {% csrf_token %}
     {{form.as_p}}
-    <button
-		type="submit"
-		class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
-	>
-		{% trans "Save" %}
-	</button>
+    <div class="d-flex flex-row-reverse mt-3">
+        <button type="submit" class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp">
+        {% trans "Save" %}
+        </button>
+    </div>
 </form>
\ No newline at end of file
diff --git a/base/templates/base/ticket_type/ticket_type_form.html b/base/templates/base/ticket_type/ticket_type_form.html
index 8173ffc91..521cf5d2f 100644
--- a/base/templates/base/ticket_type/ticket_type_form.html
+++ b/base/templates/base/ticket_type/ticket_type_form.html
@@ -11,11 +11,10 @@
 	{% csrf_token %}
 	{{form.non_field_errors}}
     {{form.as_p}}
-	<button
-		type="submit"
-		class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
-	>
-		{% trans "Save" %}
-	</button>
+	<div class="d-flex flex-row-reverse">
+		<button type="submit" class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp">
+			{% trans "Save" %}
+		</button>
+	</div>
 	<div class="oh-inner-sidebar-content__footer"></div>
 </form>