diff --git a/app/eventyay/static/common/css/_variables.css b/app/eventyay/static/common/css/_variables.css
index 59d4483587..7e5402767b 100644
--- a/app/eventyay/static/common/css/_variables.css
+++ b/app/eventyay/static/common/css/_variables.css
@@ -15,6 +15,7 @@
     var(--color-primary),
     black 40%
   );
+  --color-primary-hover: color-mix(in srgb, var(--color-primary), black 20%);
   --color-primary-light: color-mix(in srgb, var(--color-primary), white 45%);
   --color-primary-lighter: color-mix(in srgb, var(--color-primary), white 72%);
   --color-secondary: var(--color-grey-medium);
diff --git a/app/eventyay/static/orga/css/_layout.css b/app/eventyay/static/orga/css/_layout.css
index 503ae102ab..d8fd802312 100644
--- a/app/eventyay/static/orga/css/_layout.css
+++ b/app/eventyay/static/orga/css/_layout.css
@@ -312,9 +312,11 @@ aside.sidebar {
     background-color: var(--color-grey-pale);
   }
 
+  #nav-search-wrapper.nav-link:hover {
+    background-color: transparent;
+  }
+
   #nav-search {
-    display: flex;
-    flex-direction: column;
     padding: 8px 0 8px 4px;
     display: flex;
     flex-direction: row;
@@ -323,6 +325,11 @@ aside.sidebar {
     color: var(--color-primary);
     height: 56px;
 
+    &:hover #search-context-icon,
+    &:hover #search-context-text .context-name {
+      color: var(--color-primary-hover);
+    }
+
     &:after {
       /* dropdown indicator */
       margin-right: 12px;
@@ -346,12 +353,15 @@ aside.sidebar {
         text-overflow: ellipsis;
         white-space: nowrap;
         overflow: hidden;
+        line-height: 17px;
       }
 
       .context-name {
         font-family: "Open Sans";
         font-weight: 600;
         font-size: 15px;
+        padding-bottom: 2px;
+        margin-bottom: 2px;
       }
 
       .context-meta {
diff --git a/app/eventyay/static/pretixbase/scss/_variables.scss b/app/eventyay/static/pretixbase/scss/_variables.scss
index 0a7589f053..8671eb1ef6 100644
--- a/app/eventyay/static/pretixbase/scss/_variables.scss
+++ b/app/eventyay/static/pretixbase/scss/_variables.scss
@@ -16,6 +16,7 @@ $gray-lightest: lighten(#000, 97.25%);
 $font-family-sans-serif:  "Open Sans", "OpenSans", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
 $text-color: #222222 !default;
 $text-muted: #767676 !default;
+$body-color-light: rgba(0, 0, 0, 0.6) !default;
 
 $brand-primary: #2185d0 !default;
 $brand-success: #50a167 !default;
diff --git a/app/eventyay/static/pretixcontrol/scss/_sb-admin-2.scss b/app/eventyay/static/pretixcontrol/scss/_sb-admin-2.scss
index 7be58044c0..485202279a 100644
--- a/app/eventyay/static/pretixcontrol/scss/_sb-admin-2.scss
+++ b/app/eventyay/static/pretixcontrol/scss/_sb-admin-2.scss
@@ -182,13 +182,12 @@ body {
             opacity: 1;
         }
     }
-    border-bottom: 2px solid darken($gray-lightest, 6.5%);
+    border-bottom: 1px solid darken($gray-lightest, 6.5%);
 
     .context-indicator {
         display: inline-block;
         padding-left: 5px;
         padding-right: 2px;
-        line-height: 15px;
         vertical-align: middle;
         span {
             display: block;
@@ -196,15 +195,19 @@ body {
             text-overflow: ellipsis;
             white-space: nowrap;
             overflow: hidden;
+            line-height: 17px;
         }
         span.context-name {
-            font-weight: bold;
+            font-weight: 600;
             vertical-align: middle;
             font-size: 15px;
+            padding-bottom: 2px;
+            margin-bottom: 2px;
         }
         span.context-meta {
-            opacity: 0.7;
             font-size: 11px;
+            color: $body-color-light;
+            font-weight: normal;
         }
     }
 }
diff --git a/app/eventyay/static/pretixcontrol/scss/_sidebar.scss b/app/eventyay/static/pretixcontrol/scss/_sidebar.scss
index a25699a6ba..555a7806db 100644
--- a/app/eventyay/static/pretixcontrol/scss/_sidebar.scss
+++ b/app/eventyay/static/pretixcontrol/scss/_sidebar.scss
@@ -107,6 +107,7 @@ body:not(.sidebar-minimized) .sidebar {
       display: flex;
       flex-direction: row;
       align-items: center;
+      height: 56px;
 
       .context-icon {
         min-width: 38px;
@@ -119,22 +120,26 @@ body:not(.sidebar-minimized) .sidebar {
       flex-direction: column;
       flex-grow: 1;
       overflow: hidden;
-      margin-left: 6px;
+      margin-left: 2px;
 
       span {
         text-overflow: ellipsis;
         white-space: nowrap;
         overflow: hidden;
+        line-height: 17px;
       }
 
       span.context-name {
-        font-weight: bold;
+        font-weight: 600;
         font-size: 15px;
+        padding-bottom: 2px;
+        margin-bottom: 2px;
       }
 
       span.context-meta {
-        opacity: 0.7;
         font-size: 11px;
+        color: $body-color-light;
+        font-weight: normal;
       }
     }
   }
@@ -361,22 +366,26 @@ body:not(.sidebar-minimized) #page-wrapper {
         flex-direction: column;
         flex-grow: 1;
         overflow: hidden;
-        margin-left: 6px;
+        margin-left: 2px;
 
         span {
           text-overflow: ellipsis;
           white-space: nowrap;
           overflow: hidden;
+          line-height: 17px;
         }
 
         span.context-name {
-          font-weight: bold;
+          font-weight: 600;
           font-size: 15px;
+          padding-bottom: 2px;
+          margin-bottom: 2px;
         }
 
         span.context-meta {
-          opacity: 0.7;
           font-size: 11px;
+          color: $body-color-light;
+          font-weight: normal;
         }
       }
     }