diff --git a/frontend/projects/ui/src/app/components/backup-drives/backup-drives-header.component.html b/frontend/projects/ui/src/app/components/backup-drives/backup-drives-header.component.html
index b88f376d5..1bfd99d4d 100644
--- a/frontend/projects/ui/src/app/components/backup-drives/backup-drives-header.component.html
+++ b/frontend/projects/ui/src/app/components/backup-drives/backup-drives-header.component.html
@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar>
     <ion-buttons slot="start">
-      <ion-back-button defaultHref="embassy"></ion-back-button>
+      <ion-back-button defaultHref="system"></ion-back-button>
     </ion-buttons>
     <ion-title>{{
       type === 'create' ? 'Create Backup' : 'Restore From Backup'
diff --git a/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html b/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html
index 7e0887cfa..23f70c0e9 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html
+++ b/frontend/projects/ui/src/app/pages/server-routes/lan/lan.page.html
@@ -2,7 +2,7 @@
   <ion-toolbar>
     <ion-title>Secure LAN</ion-title>
     <ion-buttons slot="start">
-      <ion-back-button defaultHref="embassy"></ion-back-button>
+      <ion-back-button defaultHref="system"></ion-back-button>
     </ion-buttons>
   </ion-toolbar>
 </ion-header>
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.html b/frontend/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.html
index 536043f69..a15be170c 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.html
+++ b/frontend/projects/ui/src/app/pages/server-routes/server-backup/backing-up/backing-up.component.html
@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar>
     <ion-buttons slot="start">
-      <ion-back-button defaultHref="embassy"></ion-back-button>
+      <ion-back-button defaultHref="system"></ion-back-button>
     </ion-buttons>
     <ion-title>Backup Progress</ion-title>
   </ion-toolbar>
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html b/frontend/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
index bda576557..e7043e655 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
+++ b/frontend/projects/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar>
     <ion-buttons slot="start">
-      <ion-back-button defaultHref="embassy"></ion-back-button>
+      <ion-back-button defaultHref="system"></ion-back-button>
     </ion-buttons>
     <ion-title>Monitor</ion-title>
     <ion-title slot="end"
diff --git a/frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html b/frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
index 3fd5ee325..74d6c8345 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
+++ b/frontend/projects/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar>
     <ion-buttons slot="start">
-      <ion-back-button defaultHref="embassy"></ion-back-button>
+      <ion-back-button defaultHref="system"></ion-back-button>
     </ion-buttons>
     <ion-title>About</ion-title>
   </ion-toolbar>
diff --git a/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html b/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
index 2cddf45e6..387358473 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
+++ b/frontend/projects/ui/src/app/pages/server-routes/sessions/sessions.page.html
@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar>
     <ion-buttons slot="start">
-      <ion-back-button defaultHref="embassy"></ion-back-button>
+      <ion-back-button defaultHref="system"></ion-back-button>
     </ion-buttons>
     <ion-title>Active Sessions</ion-title>
   </ion-toolbar>
diff --git a/frontend/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html b/frontend/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html
index 2baffedd0..79900b78b 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html
+++ b/frontend/projects/ui/src/app/pages/server-routes/sideload/sideload.page.html
@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar>
     <ion-buttons slot="start">
-      <ion-back-button defaultHref="embassy"></ion-back-button>
+      <ion-back-button defaultHref="system"></ion-back-button>
     </ion-buttons>
     <ion-title>Sideload Service</ion-title>
   </ion-toolbar>
diff --git a/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html b/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html
index 02edc58f6..2ba83a167 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html
+++ b/frontend/projects/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html
@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar>
     <ion-buttons slot="start">
-      <ion-back-button defaultHref="embassy"></ion-back-button>
+      <ion-back-button defaultHref="system"></ion-back-button>
     </ion-buttons>
     <ion-title>SSH Keys</ion-title>
   </ion-toolbar>
diff --git a/frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html b/frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
index 8e1c2326c..fdf1b0b1a 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
+++ b/frontend/projects/ui/src/app/pages/server-routes/wifi/wifi.page.html
@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar>
     <ion-buttons slot="start">
-      <ion-back-button defaultHref="embassy"></ion-back-button>
+      <ion-back-button defaultHref="system"></ion-back-button>
     </ion-buttons>
     <ion-title>WiFi Settings</ion-title>
     <ion-buttons slot="end">