diff --git a/templates/settings.html b/templates/settings.html
index 64a291f..9afb5ea 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -8,12 +8,22 @@
         <h3 class="text-dark mb-0 fw-bold">Settings</h3>
         <p class="text-muted small mb-0">Stored locally on this Pi.</p>
     </div>
-    <button class="btn btn-primary btn-sm d-none d-md-inline-flex align-items-center gap-1 settings-save"
-            type="submit" form="settings-form" disabled>
-        <i class="fas fa-save"></i> Save settings
-    </button>
+    <div class="d-flex flex-wrap align-items-center gap-2">
+        <button class="btn btn-outline-secondary btn-sm" id="remote-config-test" type="button" title="Test remote server connection">
+            <i class="fas fa-plug"></i> Test connection
+        </button>
+        <button class="btn btn-outline-secondary btn-sm" id="remote-config-sync-now" type="button" title="Sync device config from server now">
+            <i class="fas fa-rotate"></i> Sync now
+        </button>
+        <button class="btn btn-primary btn-sm d-none d-md-inline-flex align-items-center gap-1 settings-save"
+                type="submit" form="settings-form" disabled>
+            <i class="fas fa-save"></i> Save settings
+        </button>
+    </div>
 </div>
 
+<div id="remote-config-message" class="alert py-2" role="status" hidden></div>
+
 <div id="settings-message" class="alert" role="status" hidden></div>
 
 <form id="settings-form">
@@ -95,11 +105,6 @@
                     </div>
                 </div>
             </div>
-            <div id="remote-config-message" class="alert py-2 mb-3" role="status" hidden></div>
-            <div class="d-flex flex-wrap gap-2 mb-2">
-                <button class="btn btn-sm btn-outline-primary" id="remote-config-test" type="button">Test connection</button>
-                <button class="btn btn-sm btn-outline-secondary" id="remote-config-sync-now" type="button">Sync now</button>
-            </div>
             <p class="form-text small mb-0">
                 These values are stored only on this Pi in <code>db/upload_creds.env</code> and are reused by both uploads and config sync.
             </p>