diff --git a/core/css/server.css b/core/css/server.css
index 1616fea95a20aff1c572e6faa61a97eebde6bee7..13c67805aa7dda363a1f7efdfaadd9e75432bc97 100644
--- a/core/css/server.css
+++ b/core/css/server.css
@@ -226,6 +226,10 @@ div.select2-container-multi.select2-container-active .select2-choices {
     color: var(--color-main-text);
 }
 
+#header .app-menu__overflow.action-item.action-item--default-popover.action-item--tertiary {
+    display: none;
+}
+
 #settings #expanddiv li a.active {
     background-color: var(--color-background-hover);
 }
@@ -361,10 +365,14 @@ li.app-navigation-entry.app-navigation-entry--collapsible > a:hover,
     filter: var(--active-icon-filter);
 }
 
-#header .app-menu .app-menu-entry[data-app-id^='external_index'] img,
-#header .app-menu .app-menu-entry.app-menu-entry--active[data-app-id^='external_index'] img {
-    filter: none;
+#header .app-menu .app-menu-entry a[title^="Murena Vault"] .app-menu-icon__icon,
+#header .app-menu .app-menu-entry a[title^="GitLab"] .app-menu-icon__icon,
+#header .app-menu .app-menu-entry a[title^="Murena Smartphones"] .app-menu-icon__icon,
+#header .app-menu .app-menu-entry a[title^="Murena Search"] .app-menu-icon__icon,
+#header .app-menu .app-menu-entry a[title^="Donate"] .app-menu-icon__icon {
+  filter: none;
 }
+
 #header .app-menu__list .app-menu-entry.app-menu-entry--active::before {
     opacity: 0;
 }
@@ -400,7 +408,7 @@ body .icon-filetype-folder-drag-accept {
     opacity: 1;
 }
 
-#header .app-menu li .app-menu-entry--label {
+#header .app-menu li .app-menu-entry__label {
     color: var(--color-main-text);
 }
 
@@ -1245,15 +1253,15 @@ button.menuitem:hover .icon-delete,
     background-image: var(--icon-delete-e9322d);
 }
 
-#header .app-menu li a .app-menu-entry--label {
+#header .app-menu li a .app-menu-entry__label {
     color: transparent;
 }
 
-#header .app-menu li:hover a .app-menu-entry--label {
+#header .app-menu li:hover a .app-menu-entry__label {
     color: var(--icon-inactive-color);
 }
 
-body.theme--highcontrast #header .app-menu li:hover a .app-menu-entry--label {
+body.theme--highcontrast #header .app-menu li:hover a .app-menu-entry__label {
     color: var(--color-main-text);
 }
 
@@ -1900,4 +1908,7 @@ textarea {
 }
 #header-menu-user-menu .header-menu__content{
     padding: 10px;
+}
+#header .app-menu-entry:hover .app-menu-entry__icon, #header .app-menu-entry:focus-within .app-menu-entry__icon, #header .app-menu__list:hover .app-menu-entry__icon, #header .app-menu__list:focus-within .app-menu-entry__icon {
+  margin-block-end: 0lh;
 }
\ No newline at end of file