diff --git a/static/css/s2.css b/static/css/s2.css
index 9515d5bf9d..ed049311c3 100644
--- a/static/css/s2.css
+++ b/static/css/s2.css
@@ -4491,6 +4491,14 @@ body .ui-autocomplete.dictionary-toc-autocomplete .ui-menu-item a.ui-state-focus
 #accountSettingsPage .additional-info {
   color: var(--dark-grey);
 }
+#accountSettingsPage .saveCancel {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 30px;
+}
+#accountSettingsPage #saveAccountSettings {
+  flex-basis: 100%;
+}
 .toggleSet.aliyotTorah, .toggleSet.punctuationTalmud, .toggleSet .toggle-set-label {
   --english-font: var(--english-sans-serif-font-family);
   --hebrew-font: var(--english-sans-serif-font-family);
diff --git a/templates/account_settings.html b/templates/account_settings.html
index 2f97b1f6e6..6c169db567 100644
--- a/templates/account_settings.html
+++ b/templates/account_settings.html
@@ -5,22 +5,11 @@
 
 <div id="accountSettingsPage" class="static biReady">
 	<div class="inner">
-	<div class="headerWithButtons">
-        <div class="start"></div>
+	<div>
         <h1>
             <span class="int-en">Account Settings</span>
             <span class="int-he">הגדרות חשבון</span>
         </h1>
-        <div class="end">
-            <a class="button small transparent control-elem" href="/my/profile">
-                <span class="int-en">Cancel</span>
-                <span class="int-he">ביטול</span>
-            </a>
-            <div id="saveAccountSettings" class="button small blue control-elem" tabindex="0" role="button" >
-                <span class="int-en">Save</span>
-                <span class="int-he">שמירה</span>
-            </div>
-        </div>
     </div>
 	<div id="emailNotifications" class="section">
 		<label class="control-elem">
@@ -154,6 +143,16 @@ <h1>
                 <span class="int-he">תוכלו להתחבר מחדש לחשבון גוגל בפעם הבאה שתייצאו לשם דף מקורות</span>
             </div>
         </div>
+        <div class="saveCancel">
+            <div id="saveAccountSettings" class="button blue control-elem" tabindex="0" role="button" >
+                <span class="int-en">Save</span>
+                <span class="int-he">שמירה</span>
+            </div>
+            <a class="button transparent control-elem" href="/my/profile">
+                <span class="int-en">Cancel</span>
+                <span class="int-he">ביטול</span>
+            </a>
+        </div>
     </div>
 	</div>
 </div>