1 files changed, 12 insertions, 24 deletions
diff --git a/browser/themes/shared/urlbarView.css b/browser/themes/shared/urlbarView.css
index ee8ee15c2a..c06342fd98 100644
--- a/browser/themes/shared/urlbarView.css
+++ b/browser/themes/shared/urlbarView.css
@@ -56,7 +56,7 @@
     --urlbarView-action-slide-in-distance: -200px;
   }
 
-  &:-moz-lwtheme {
+  &[lwtheme] {
     --urlbarView-action-color: light-dark(rgb(91, 91, 102), rgb(191, 191, 201));
     --urlbarView-highlight-background: light-dark(rgb(0, 99, 255), rgb(0, 99, 225));
     --urlbarView-highlight-color: white;
@@ -611,25 +611,14 @@
   margin-inline-start: 0.35em;
 }
 
-.urlbarView-userContext-iconMode {
-  display: none;
-}
-
-.urlbarView-userContext-textMode {
-  display: inline-block;
-  > span {
-    font-variant: small-caps;
-  }
+.urlbarView-userContext-textMode > span {
+  font-variant: small-caps;
 }
 
 /* Display userContext icon instead of text, when window is too narrow. */
-.urlbarView-results[wrap] {
-  .urlbarView-userContext-textMode {
-    display: none;
-  }
-  .urlbarView-userContext-iconMode {
-    display: inline-block;
-  }
+.urlbarView-results[wrap] .urlbarView-userContext-textMode,
+.urlbarView-results:not([wrap]) .urlbarView-userContext-iconMode {
+  display: none;
 }
 
 /* Tail suggestions */
@@ -722,17 +711,16 @@
     color: var(--urlbar-box-text-color);
     background-color: var(--urlbar-box-focus-bgcolor);
     border-radius: var(--toolbarbutton-border-radius);
-    padding: 6px 8px;
-
-    &.urlbarView-userContext {
-      padding-top: 2px;
-    }
-    margin-block: -6px;
+    padding: 4px 8px;
+    margin-block: -2px;
     margin-inline-start: 8px;
 
     :root[uidensity=compact] & {
       padding: 3px 6px;
-      margin-block: -3px;
+    }
+
+    &.urlbarView-userContext {
+      padding-top: 0;
     }
   }