diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json
index 3f2ee3a0c..bfc9e641a 100644
--- a/dashboard/public/translation/en.json
+++ b/dashboard/public/translation/en.json
@@ -911,7 +911,7 @@
         "refresh": "Refresh"
     },
     "settings": {
-        "title": "System",
+        "title": "Settings",
         "appstoreAccount": {
             "title": "Cloudron.io Account",
             "description": "A Cloudron.io account is used to manage your subscription.",
@@ -1053,6 +1053,10 @@
         },
         "locale": {
             "title": "Locale"
+        },
+        "title": "System",
+        "settings": {
+            "title": "Settings"
         }
     },
     "eventlog": {
@@ -2150,5 +2154,8 @@
     },
     "server": {
         "title": "Server"
+    },
+    "docker": {
+        "title": "Docker"
     }
 }
diff --git a/dashboard/src/Index.vue b/dashboard/src/Index.vue
index 54c5af494..3a89e191c 100644
--- a/dashboard/src/Index.vue
+++ b/dashboard/src/Index.vue
@@ -62,7 +62,7 @@ const VIEWS = Object.freeze({
   NETWORK: '#/network',
   PROFILE: '#/profile',
   SERVICES: '#/services',
-  SYSTEM_LOCALE: '#/system-locale',
+  SYSTEM_SETTINGS: '#/system-settings',
   DOCKER: '#/docker',
   SYSTEM_EVENTLOG: '#/system-eventlog',
   SYSTEM_UPDATE: '#/system-update',
@@ -175,8 +175,8 @@ function onHashChange() {
     view.value = VIEWS.PROFILE;
   } else if (v === VIEWS.SERVICES && profile.value.isAtLeastAdmin) {
     view.value = VIEWS.SERVICES;
-  } else if (v === VIEWS.SYSTEM_LOCALE && profile.value.isAtLeastAdmin) {
-    view.value = VIEWS.SYSTEM_LOCALE;
+  } else if (v === VIEWS.SYSTEM_SETTINGS && profile.value.isAtLeastAdmin) {
+    view.value = VIEWS.SYSTEM_SETTINGS;
   } else if (v === VIEWS.DOCKER && profile.value.isAtLeastAdmin) {
     view.value = VIEWS.DOCKER;
   } else if (v === VIEWS.SYSTEM_EVENTLOG && profile.value.isAtLeastAdmin) {
@@ -308,6 +308,10 @@ onMounted(async () => {
             </div>
           </Transition>
 
+          <a class="sidebar-item" :class="{ active: view === VIEWS.NETWORK }" v-show="profile.isAtLeastAdmin" :href="VIEWS.NETWORK" @click="onSidebarClose()"><i class="fas fa-network-wired fa-fw"></i> {{ $t('network.title') }}</a>
+          <a class="sidebar-item" :class="{ active: view === VIEWS.VOLUMES }" v-show="profile.isAtLeastAdmin" :href="VIEWS.VOLUMES" @click="onSidebarClose()"><i class="fa fa-hdd fa-fw"></i> {{ $t('volumes.title') }}</a>
+          <a class="sidebar-item" :class="{ active: view === VIEWS.DOCKER }" :href="VIEWS.DOCKER" @click="onSidebarClose()"><i class="fa-brands fa-fw fa-docker"></i> {{ $t('docker.title') }}</a>
+
           <div class="sidebar-item" v-show="profile.isAtLeastAdmin" @click="onToggleGroup(SIDEBAR_GROUPS.BACKUP)"><i class="fa fa-archive fa-fw"></i> {{ $t('backups.title') }} <i class="collapse fa-solid fa-angle-right" :class="{ expanded: activeSidebarGroups[SIDEBAR_GROUPS.BACKUP] }" style="margin-left: 6px;"></i></div>
           <Transition name="sidebar-item-group-animation">
             <div class="sidebar-item-group" v-if="activeSidebarGroups[SIDEBAR_GROUPS.BACKUP]">
@@ -317,24 +321,20 @@ onMounted(async () => {
             </div>
           </Transition>
 
-          <a class="sidebar-item" :class="{ active: view === VIEWS.VOLUMES }" v-show="profile.isAtLeastAdmin" :href="VIEWS.VOLUMES" @click="onSidebarClose()"><i class="fa fa-hdd fa-fw"></i> {{ $t('volumes.title') }}</a>
-
-          <div class="sidebar-item" v-show="profile.isAtLeastAdmin" @click="onToggleGroup(SIDEBAR_GROUPS.SYSTEM)"><i class="fa fa-wrench fa-fw"></i> {{ $t('settings.title') }} <i class="collapse fa-solid fa-angle-right" :class="{ expanded: activeSidebarGroups[SIDEBAR_GROUPS.SYSTEM] }" style="margin-left: 6px;"></i></div>
+          <div class="sidebar-item" v-show="profile.isAtLeastAdmin" @click="onToggleGroup(SIDEBAR_GROUPS.SYSTEM)"><i class="fa fa-server fa-fw"></i> {{ $t('system.title') }} <i class="collapse fa-solid fa-angle-right" :class="{ expanded: activeSidebarGroups[SIDEBAR_GROUPS.SYSTEM] }" style="margin-left: 6px;"></i></div>
           <Transition name="sidebar-item-group-animation">
             <div class="sidebar-item-group" v-if="activeSidebarGroups[SIDEBAR_GROUPS.SYSTEM]">
               <a class="sidebar-item" :class="{ active: view === VIEWS.APPEARANCE }" v-show="profile.isAtLeastAdmin" :href="VIEWS.APPEARANCE" @click="onSidebarClose()"><i class="fa fa-pen-ruler fa-fw"></i> {{ $t('appearance.title') }}</a>
-              <a class="sidebar-item" :class="{ active: view === VIEWS.DOCKER }" :href="VIEWS.DOCKER" @click="onSidebarClose()"><i class="fa-brands fa-fw fa-docker"></i> {{ $t('dockerRegistries.title') }}</a>
-              <a class="sidebar-item" :class="{ active: view === VIEWS.NETWORK }" v-show="profile.isAtLeastAdmin" :href="VIEWS.NETWORK" @click="onSidebarClose()"><i class="fas fa-network-wired fa-fw"></i> {{ $t('network.title') }}</a>
-              <a class="sidebar-item" :class="{ active: view === VIEWS.SERVICES }" v-show="profile.isAtLeastAdmin" :href="VIEWS.SERVICES" @click="onSidebarClose()"><i class="fa fa-cogs fa-fw"></i> {{ $t('services.title') }}</a>
+              <a class="sidebar-item" :class="{ active: view === VIEWS.SERVICES }" v-show="profile.isAtLeastAdmin" :href="VIEWS.SERVICES" @click="onSidebarClose()"><i class="fa fa-diagram-project fa-fw"></i> {{ $t('services.title') }}</a>
               <a class="sidebar-item" :class="{ active: view === VIEWS.SYSTEM_EVENTLOG }" :href="VIEWS.SYSTEM_EVENTLOG" @click="onSidebarClose()"><i class="fa fa-list-alt fa-fw"></i> {{ $t('eventlog.title') }}</a>
-              <a class="sidebar-item" :class="{ active: view === VIEWS.SYSTEM_LOCALE }" :href="VIEWS.SYSTEM_LOCALE" @click="onSidebarClose()"><i class="fa fa-fw fa-language"></i> {{ $t('system.locale.title') }}</a>
               <a class="sidebar-item" :class="{ active: view === VIEWS.SYSTEM_UPDATE }" :href="VIEWS.DOCKER" @click="onSidebarClose()"><i class="fa fa-fw fa-square-up-right"></i> {{ $t('settings.updates.title') }}</a>
+              <a class="sidebar-item" :class="{ active: view === VIEWS.SYSTEM_SETTINGS }" :href="VIEWS.SYSTEM_SETTINGS" @click="onSidebarClose()"><i class="fa fa-fw fa-screwdriver-wrench"></i> {{ $t('system.settings.title') }}</a>
             </div>
           </Transition>
 
           <hr v-show="profile.isAtLeastAdmin"/>
 
-          <a class="sidebar-item" :class="{ active: view === VIEWS.SERVER }" v-show="profile.isAtLeastAdmin" :href="VIEWS.SERVER" @click="onSidebarClose()"><i class="fa fa-chart-area fa-fw"></i> {{ $t('server.title') }}</a>
+          <a class="sidebar-item" :class="{ active: view === VIEWS.SERVER }" v-show="profile.isAtLeastAdmin" :href="VIEWS.SERVER" @click="onSidebarClose()"><i class="fa fa-microchip fa-fw"></i> {{ $t('server.title') }}</a>
           <a class="sidebar-item" :class="{ active: view === VIEWS.CLOUDRON_ACCOUNT }" v-show="profile.isAtLeastOwner" :href="VIEWS.CLOUDRON_ACCOUNT" @click="onSidebarClose()"><i class="fa fa-crown fa-fw"></i> {{ $t('settings.appstoreAccount.title') }}</a>
         </div>
       </SideBar>
@@ -365,7 +365,7 @@ onMounted(async () => {
           <NetworkView v-else-if="view === VIEWS.NETWORK" />
           <ProfileView v-else-if="view === VIEWS.PROFILE" />
           <ServicesView v-else-if="view === VIEWS.SERVICES" />
-          <SystemLocaleView v-else-if="view === VIEWS.SYSTEM_LOCALE" />
+          <SystemLocaleView v-else-if="view === VIEWS.SYSTEM_SETTINGS" />
           <SystemDockerView v-else-if="view === VIEWS.DOCKER" />
           <SystemUpdateView v-else-if="view === VIEWS.SYSTEM_UPDATE" />
           <UserDirectorySettingsView v-else-if="view === VIEWS.USER_DIRECTORY_SETTINGS" />