diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index 9474c389d6..e97d15cb53 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -1964,6 +1964,23 @@ table.floating_recipient {
     line-height: 38px;
 }
 
+.settings-section .loading_indicator_text {
+    font-size: 12px;
+    font-weight: 400;
+    vertical-align: middle;
+    line-height: 20px;
+    display: inline-block;
+    float: none;
+}
+
+.settings-section .loading_indicator_spinner {
+    width: 12px;
+    height: 12px;
+    vertical-align: middle;
+    display: inline-block;
+}
+
+
 .message_inline_image {
     margin-bottom: 5px;
     margin-left: 5px;
@@ -2841,6 +2858,10 @@ div.edit_bot {
     margin-right: 20px;
 }
 
+.upload_avatar_spinner {
+    font-size: 14px;
+}
+
 .edit_bot_avatar_clear_button,
 #user_avatar_clear_button,
 #bot_avatar_clear_button {
@@ -2958,6 +2979,14 @@ div.edit_bot {
     position: relative;
 }
 
+#settings #notify-settings-status {
+    width: 80%;
+    text-align: center;
+    margin: auto;
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
 #settings .settings-section .account-settings-form,
 #settings .settings-section .new-bot-form,
 #settings .settings-section .edit-bot-form-box {
diff --git a/templates/zerver/settings.html b/templates/zerver/settings.html
index 66cf54c146..83d7119c89 100644
--- a/templates/zerver/settings.html
+++ b/templates/zerver/settings.html
@@ -67,17 +67,6 @@
            </div>
            {% endif %}
 
-
-           <div class="control-group">
-             <div class="controls">
-               <input type="submit" name="change_settings"
-                      value="Save changes" class="btn btn-big btn-primary" />
-             </div>
-           </div>
-
-          </form>
-
-
           <div id="user_avatar_file_input_error" class="text-error"></div>
 
           <div class="control-group">
@@ -88,24 +77,30 @@
                 <p>
                     <img id="user-settings-avatar" src="{{ avatar_url }}" />
                 </p>
+                <div id="upload_avatar_spinner"></div>
             </div>
           </div>
 
-          <div id="upload_avatar_spinner"></div>
+           <div class="control-group">
+             <div class="controls">
+               <input type="submit" name="change_settings"
+                      value="Save changes" class="btn btn-big btn-primary" />
+             </div>
+           </div>
 
+          </form>
 
         </div>
     </div>
 
 
-    <div class="alert" id="notify-settings-status"></div>
-
 
     <form action="/json/notify_settings/change" method="post"
           class="form-horizontal notify-settings">{% csrf_token %}
 
     <div id="notification-settings" class="settings-section">
       <div class="settings-section-title"><i class="icon-vector-warning-sign settings-section-icon"></i>Notifications <i class="tiny icon-vector-question-sign" id="notification-docs"></i></div>
+        <div class="alert" id="notify-settings-status"></div>
     <div class="notification-settings-form">
         <div class="control-group">
           <div class="controls">