1 files changed, 20 insertions, 5 deletions
diff --git a/core/css/server.css b/core/css/server.css
index a7de0baba94..73f1e21dd82 100644
--- a/core/css/server.css
+++ b/core/css/server.css
@@ -957,6 +957,12 @@ span.ui-icon {
 #contactsmenu .menutoggle:hover, #contactsmenu .menutoggle:focus, #contactsmenu .menutoggle:active {
   opacity: 1 !important;
 }
+#contactsmenu #contactsmenu-menu a {
+  padding: 2px;
+}
+#contactsmenu #contactsmenu-menu a:focus-visible {
+  box-shadow: inset 0 0 0 2px var(--color-main-text) !important;
+}
 
 #header .header-right > div#contactsmenu > .menu {
   /* show 2.5 to 4.5 entries depending on the screen height */
@@ -997,9 +1003,6 @@ span.ui-icon {
   border-bottom: 1px solid var(--color-border);
   /* actions menu */
 }
-#header .header-right > div#contactsmenu > .menu .contact :last-of-type {
-  border-bottom: none;
-}
 #header .header-right > div#contactsmenu > .menu .contact .avatar {
   height: 32px;
   width: 32px;
@@ -1026,13 +1029,25 @@ span.ui-icon {
 #header .header-right > div#contactsmenu > .menu .contact .top-action, #header .header-right > div#contactsmenu > .menu .contact .second-action, #header .header-right > div#contactsmenu > .menu .contact .other-actions {
   width: 16px;
   height: 16px;
-  padding: 14px;
   opacity: 0.5;
   cursor: pointer;
 }
-#header .header-right > div#contactsmenu > .menu .contact .top-action :hover, #header .header-right > div#contactsmenu > .menu .contact .second-action :hover, #header .header-right > div#contactsmenu > .menu .contact .other-actions :hover {
+#header .header-right > div#contactsmenu > .menu .contact .top-action:not(button), #header .header-right > div#contactsmenu > .menu .contact .second-action:not(button), #header .header-right > div#contactsmenu > .menu .contact .other-actions:not(button) {
+  padding: 14px;
+}
+#header .header-right > div#contactsmenu > .menu .contact .top-action:hover, #header .header-right > div#contactsmenu > .menu .contact .top-action:active, #header .header-right > div#contactsmenu > .menu .contact .top-action:focus, #header .header-right > div#contactsmenu > .menu .contact .second-action:hover, #header .header-right > div#contactsmenu > .menu .contact .second-action:active, #header .header-right > div#contactsmenu > .menu .contact .second-action:focus, #header .header-right > div#contactsmenu > .menu .contact .other-actions:hover, #header .header-right > div#contactsmenu > .menu .contact .other-actions:active, #header .header-right > div#contactsmenu > .menu .contact .other-actions:focus {
   opacity: 1;
 }
+#header .header-right > div#contactsmenu > .menu .contact button.other-actions {
+  margin: 5px;
+}
+#header .header-right > div#contactsmenu > .menu .contact button.other-actions:focus {
+  border-color: transparent;
+  box-shadow: 0 0 0 2px var(--color-main-text);
+}
+#header .header-right > div#contactsmenu > .menu .contact button.other-actions:focus-visible {
+  border-radius: var(--border-radius-pill);
+}
 #header .header-right > div#contactsmenu > .menu .contact .menu {
   top: 47px;
   margin-right: 13px;