diff --git a/src/components/popover/popover.scss b/src/components/popover/popover.scss
index 9cc9552fe..de1eda866 100644
--- a/src/components/popover/popover.scss
+++ b/src/components/popover/popover.scss
@@ -7,7 +7,8 @@
   position: fixed;
   min-width: 0;
   max-width: calc(100vw - 20px);
-  box-shadow: var(--shadow);
+
+  --_shadow: var(--shadow);
 }
 
 .popover-default {
@@ -19,7 +20,7 @@
     left: -1px;
     right: -1px;
     z-index: -1px;
-    box-shadow: var(--shadow);
+    box-shadow: var(--_shadow);
     pointer-events: none;
   }
 
diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js
index b25e13452..75a8b4feb 100644
--- a/src/services/theme_data/theme_data_3.service.js
+++ b/src/services/theme_data/theme_data_3.service.js
@@ -537,7 +537,7 @@ export const init = ({
 
     // Optimization: we only really need combinations without "normal" because all states implicitly have it
     const permutationStateKeys = Object.keys(states).filter(s => s !== 'normal')
-    const stateCombinations = onlyNormalState
+    const stateCombinations = (onlyNormalState && !virtualComponents.has(component.name))
       ? [
           ['normal']
         ]
diff --git a/static/styles/Redmond DX.iss b/static/styles/Redmond DX.iss
index 76e325932..08d9103ff 100644
--- a/static/styles/Redmond DX.iss	
+++ b/static/styles/Redmond DX.iss	
@@ -167,3 +167,12 @@ Tab:hover:active {
 TopBar Link {
   textColor: #ffffff
 }
+
+MenuItem:hover {
+  background: --fg
+}
+
+Popover {
+  shadow: --buttonDefaultBevel, 5 5 0 0 #000000 / 0.2;
+  roundness: 0
+}