diff --git a/src/components/button.style.js b/src/components/button.style.js
index 84db88fbe6..5a5e42716d 100644
--- a/src/components/button.style.js
+++ b/src/components/button.style.js
@@ -79,8 +79,27 @@ export default {
         shadow: [hoverGlow, ...buttonInsetFakeBorders]
       }
     },
+    {
+      state: ['pressed'],
+      directives: {
+        shadow: [...inputInsetFakeBorders]
+      }
+    },
     {
       state: ['hover', 'pressed'],
+      directives: {
+        shadow: [hoverGlow, ...inputInsetFakeBorders]
+      }
+    },
+    {
+      state: ['toggled'],
+      directives: {
+        background: '--accent,-24.2',
+        shadow: [...inputInsetFakeBorders]
+      }
+    },
+    {
+      state: ['toggled', 'hover'],
       directives: {
         background: '--accent,-24.2',
         shadow: [hoverGlow, ...inputInsetFakeBorders]
diff --git a/src/components/root.style.js b/src/components/root.style.js
index 53ee0ae151..38bcc95499 100644
--- a/src/components/root.style.js
+++ b/src/components/root.style.js
@@ -4,6 +4,7 @@ export default {
   validInnerComponents: [
     'Underlay',
     'Modals',
+    'Popover',
     'TopBar'
   ],
   defaultRules: [