diff --git a/app/src/router/routes.js b/app/src/router/routes.js
index 1dd6fa1b..ef339870 100644
--- a/app/src/router/routes.js
+++ b/app/src/router/routes.js
@@ -283,7 +283,7 @@ const routes = [
     component: () => import(/* webpackChunkName: "views/service/list" */ '@/views/service/ServiceList'),
     meta: {
       args: { trad: 'services' },
-      breadcrumb: ['service-list']
+      breadcrumb: ['tool-list', 'service-list']
     }
   },
   {
@@ -293,7 +293,7 @@ const routes = [
     props: true,
     meta: {
       args: { param: 'name' },
-      breadcrumb: ['service-list', 'service-info']
+      breadcrumb: ['tool-list', 'service-list', 'service-info']
     }
   },
 
diff --git a/app/src/views/Home.vue b/app/src/views/Home.vue
index 8d28d1e6..71558c87 100644
--- a/app/src/views/Home.vue
+++ b/app/src/views/Home.vue
@@ -25,7 +25,6 @@ export default {
         { routeName: 'domain-list', icon: 'globe', translation: 'domains' },
         { routeName: 'app-list', icon: 'cubes', translation: 'applications' },
         { routeName: 'update', icon: 'refresh', translation: 'system_update' },
-        { routeName: 'service-list', icon: 'cog', translation: 'services' },
         { routeName: 'tool-list', icon: 'wrench', translation: 'tools' },
         { routeName: 'diagnosis', icon: 'stethoscope', translation: 'diagnosis' },
         { routeName: 'backup', icon: 'archive', translation: 'backup' }
diff --git a/app/src/views/tool/ToolList.vue b/app/src/views/tool/ToolList.vue
index 10dd5373..0b495e82 100644
--- a/app/src/views/tool/ToolList.vue
+++ b/app/src/views/tool/ToolList.vue
@@ -22,10 +22,11 @@ export default {
       menu: [
         { routeName: 'tool-logs', icon: 'book', translation: 'logs' },
         { routeName: 'tool-migrations', icon: 'share', translation: 'migrations' },
+        { routeName: 'service-list', icon: 'gears', translation: 'services' },
         { routeName: 'tool-firewall', icon: 'shield', translation: 'firewall' },
         { routeName: 'tool-adminpw', icon: 'key-modern', translation: 'tools_adminpw' },
-        { routeName: 'tool-settings', icon: 'cog', translation: 'tools_yunohost_settings' },
-        { routeName: 'tool-webadmin', icon: 'cog', translation: 'tools_webadmin_settings' },
+        { routeName: 'tool-settings', icon: 'sliders', translation: 'tools_yunohost_settings' },
+        { routeName: 'tool-webadmin', icon: 'sliders', translation: 'tools_webadmin_settings' },
         { routeName: 'tool-power', icon: 'power-off', translation: 'tools_shutdown_reboot' }
       ]
     }