diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 6417dd7d8..3b04f9a3e 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -83,7 +83,25 @@ nav.top-menu {
   padding-inline: 20px;
   display: flex;
   justify-content: space-between;
-  align-items: center;
+  align-items: stretch;
+}
+
+.general-menu {
+  display: flex;
+  margin-inline-start: -6px;
+}
+
+.profile-menu {
+  display: flex;
+  margin-inline-end: -6px;
+}
+
+#account .dropdown-trigger {
+  padding-inline: 6px;
+}
+
+.top-menu__links, .top-menu__links li {
+  display: flex;
 }
 
 .top-menu__links ul {
@@ -91,7 +109,6 @@ nav.top-menu {
   padding: 0;
   display: flex;
   list-style-type: none;
-  gap: 12px;
 }
 
 .top-menu__links a, .top-menu__links a:link, .top-menu__links a:visited {
@@ -101,6 +118,14 @@ nav.top-menu {
   transform-origin: center;
 }
 
+.top-menu__links a {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding-block: 3px;
+  padding-inline: 6px;
+}
+
 .top-menu__links a:hover {
     color: var(--oc-white);
     background-color: rgba(255, 255, 255, 0.12);
@@ -111,10 +136,6 @@ nav.top-menu {
   stroke: var(--oc-white);
 }
 
-#account.top-menu__links {
-  padding-block: 3px;
-}
-
 #account .dropdown-content .user-info {
   padding-block: 6px;
   padding-inline: 16px;
diff --git a/app/assets/themes/classic/stylesheets/application.css b/app/assets/themes/classic/stylesheets/application.css
index f4b647e6e..507c60377 100644
--- a/app/assets/themes/classic/stylesheets/application.css
+++ b/app/assets/themes/classic/stylesheets/application.css
@@ -56,12 +56,12 @@ h2, .wiki h1 { letter-spacing:-1px; }
 h4 { border-block-end: dotted 1px #c0c0c0; }
 
 #top-menu a.home, #top-menu a.my-page, #top-menu a.projects, #top-menu a.administration, #top-menu a.help {
-    background-position: 0% 40%;
+    background-position: 6px 40%;
     background-repeat: no-repeat;
-    padding-inline-start: 20px;
+    padding-inline-start: 26px;
     padding-block: 2px 3px;
 }
-[dir="rtl"] :is(#top-menu a.home, #top-menu a.my-page, #top-menu a.projects, #top-menu a.administration, #top-menu a.help) {background-position: right 0% top 40%;}
+[dir="rtl"] :is(#top-menu a.home, #top-menu a.my-page, #top-menu a.projects, #top-menu a.administration, #top-menu a.help) {background-position: right 6px top 40%;}
 
 #top-menu a.home { background-image: url(/themes/classic/home.png); }
 #top-menu a.my-page { background-image: url(/user.png); }