diff --git a/theme/components/Button/Button.pw.tsx b/theme/components/Button/Button.pw.tsx
index 7ad23f7b05..5e50dbf2c8 100644
--- a/theme/components/Button/Button.pw.tsx
+++ b/theme/components/Button/Button.pw.tsx
@@ -1,39 +1,75 @@
-import { Button } from '@chakra-ui/react';
+import { Box, Button, Flex } from '@chakra-ui/react';
 import React from 'react';
 
 import { test, expect } from 'playwright/lib';
 
+test.use({ viewport: { width: 150, height: 350 } });
+
 [
-  { variant: 'solid' },
-  { variant: 'solid', colorScheme: 'gray', withDarkMode: true },
-  { variant: 'outline', colorScheme: 'gray', withDarkMode: true },
-  { variant: 'outline', colorScheme: 'gray-dark', withDarkMode: true },
-  { variant: 'outline', colorScheme: 'blue', withDarkMode: true },
-  { variant: 'simple', withDarkMode: true },
-  { variant: 'ghost', withDarkMode: true },
-  { variant: 'subtle' },
-  { variant: 'subtle', colorScheme: 'gray', withDarkMode: true },
-].forEach(({ variant, colorScheme, withDarkMode }) => {
+  { variant: 'solid', states: [ 'default', 'disabled', 'hovered', 'active' ] },
+  { variant: 'outline', colorScheme: 'gray', withDarkMode: true, states: [ 'default', 'disabled', 'hovered', 'active', 'selected' ] },
+  { variant: 'outline', colorScheme: 'blue', withDarkMode: true, states: [ 'default', 'disabled', 'hovered', 'active', 'selected' ] },
+  { variant: 'simple', withDarkMode: true, states: [ 'default', 'hovered' ] },
+  { variant: 'ghost', withDarkMode: true, states: [ 'default', 'hovered', 'active' ] },
+  { variant: 'subtle', states: [ 'default', 'hovered' ] },
+  { variant: 'subtle', colorScheme: 'gray', states: [ 'default', 'hovered' ], withDarkMode: true },
+].forEach(({ variant, colorScheme, withDarkMode, states }) => {
   test.describe(`variant ${ variant }${ colorScheme ? ` with ${ colorScheme } color scheme` : '' }${ withDarkMode ? ' +@dark-mode' : '' }`, () => {
-    test('base', async({ render }) => {
-      const component = await render(<Button variant={ variant } colorScheme={ colorScheme }>Click me</Button>);
-      await expect(component.locator('button')).toHaveScreenshot();
-    });
-
-    test('disabled', async({ render }) => {
-      const component = await render(<Button variant={ variant } colorScheme={ colorScheme } isDisabled>Click me</Button>);
-      await expect(component.locator('button')).toHaveScreenshot();
-    });
-
-    test('hovered', async({ render }) => {
-      const component = await render(<Button variant={ variant } colorScheme={ colorScheme }>Click me</Button>);
-      await component.getByText(/click/i).hover();
-      await expect(component.locator('button')).toHaveScreenshot();
-    });
+    test('', async({ render }) => {
+      const component = await render(
+        <Flex p={ 2 } flexDir="column" rowGap={ 3 }>
+          { states?.map((state) => {
+            switch (state) {
+              case 'default': {
+                return (
+                  <Box>
+                    <Box color="text_secondary" fontSize="sm">Default:</Box>
+                    <Button variant={ variant } colorScheme={ colorScheme }>Click me</Button>
+                  </Box>
+                );
+              }
+              case 'disabled': {
+                return (
+                  <Box>
+                    <Box color="text_secondary" fontSize="sm">Disabled:</Box>
+                    <Button variant={ variant } colorScheme={ colorScheme } isDisabled>Click me</Button>
+                  </Box>
+                );
+              }
+              case 'active': {
+                return (
+                  <Box>
+                    <Box color="text_secondary" fontSize="sm">Active:</Box>
+                    <Button variant={ variant } colorScheme={ colorScheme } isActive>Click me</Button>
+                  </Box>
+                );
+              }
+              case 'hovered': {
+                return (
+                  <Box>
+                    <Box color="text_secondary" fontSize="sm">Hovered:</Box>
+                    <Button variant={ variant } colorScheme={ colorScheme }>Hover me</Button>
+                  </Box>
+                );
+              }
+              case 'selected': {
+                return (
+                  <Box>
+                    <Box color="text_secondary" fontSize="sm">Selected:</Box>
+                    <Button variant={ variant } colorScheme={ colorScheme } data-selected="true">Click me</Button>
+                  </Box>
+                );
+              }
 
-    test('active', async({ render }) => {
-      const component = await render(<Button variant={ variant } colorScheme={ colorScheme } isActive>Click me</Button>);
-      await expect(component.locator('button')).toHaveScreenshot();
+              default: {
+                return null;
+              }
+            }
+          }) }
+        </Flex>,
+      );
+      await component.getByText('Hover me').hover();
+      await expect(component).toHaveScreenshot();
     });
   });
 });
diff --git a/theme/components/Button/Button.ts b/theme/components/Button/Button.ts
index d96d2d49da..0cac051ad2 100644
--- a/theme/components/Button/Button.ts
+++ b/theme/components/Button/Button.ts
@@ -5,25 +5,10 @@ import { runIfFn } from '@chakra-ui/utils';
 const variantSolid = defineStyle((props) => {
   const { colorScheme: c } = props;
 
-  if (c === 'gray') {
-    const bg = mode(`gray.100`, `whiteAlpha.200`)(props);
-
-    return {
-      bg,
-      _hover: {
-        bg: mode(`gray.200`, `whiteAlpha.300`)(props),
-        _disabled: {
-          bg,
-        },
-      },
-      _active: { bg: mode(`gray.300`, `whiteAlpha.400`)(props) },
-    };
-  }
-
   const bg = `${ c }.600`;
   const color = 'white';
   const hoverBg = `${ c }.400`;
-  const activeBg = `${ c }.700`;
+  const activeBg = hoverBg;
 
   return {
     bg,
@@ -37,6 +22,8 @@ const variantSolid = defineStyle((props) => {
     _disabled: {
       opacity: 0.2,
     },
+    // According to design there is no "active" or "pressed" state
+    // It is simply should be the same as the "hover" state
     _active: { bg: activeBg },
     fontWeight: 600,
   };
@@ -45,22 +32,15 @@ const variantSolid = defineStyle((props) => {
 const variantOutline = defineStyle((props) => {
   const { colorScheme: c } = props;
 
-  const isGrayTheme = c === 'gray' || c === 'gray-dark';
+  const isGrayTheme = c === 'gray';
+
+  const bg = 'transparent';
+
   const color = isGrayTheme ? mode('blackAlpha.800', 'whiteAlpha.800')(props) : mode(`${ c }.600`, `${ c }.300`)(props);
   const borderColor = isGrayTheme ? mode('gray.200', 'gray.600')(props) : mode(`${ c }.600`, `${ c }.300`)(props);
-  const activeBg = isGrayTheme ? mode('blue.50', 'gray.600')(props) : mode(`${ c }.50`, 'gray.600')(props);
-  const activeColor = (() => {
-    if (c === 'gray') {
-      return mode('blue.600', 'gray.50')(props);
-    }
-    if (c === 'gray-dark') {
-      return mode('blue.600', 'gray.50')(props);
-    }
-    if (c === 'blue') {
-      return mode('blue.600', 'gray.50')(props);
-    }
-    return 'blue.600';
-  })();
+
+  const selectedBg = isGrayTheme ? mode('blue.50', 'gray.600')(props) : mode(`${ c }.50`, 'gray.600')(props);
+  const selectedColor = mode('blue.600', 'gray.50')(props);
 
   return {
     color,
@@ -68,42 +48,47 @@ const variantOutline = defineStyle((props) => {
     borderWidth: props.borderWidth || '2px',
     borderStyle: 'solid',
     borderColor,
-    bg: 'transparent',
+    bg,
     _hover: {
       color: 'link_hovered',
       borderColor: 'link_hovered',
-      bg: 'transparent',
-      _active: {
-        bg: props.isActive ? activeBg : 'transparent',
-        borderColor: props.isActive ? activeBg : 'link_hovered',
-        color: props.isActive ? activeColor : 'link_hovered',
-        p: {
-          color: 'link_hovered',
-        },
+      bg,
+      span: {
+        color: 'link_hovered',
       },
       _disabled: {
         color,
         borderColor,
       },
-      p: {
-        color: 'link_hovered',
-      },
     },
     _disabled: {
       opacity: 0.2,
     },
+    // According to design there is no "active" or "pressed" state
+    // It is simply should be the same as the "hover" state
     _active: {
-      bg: activeBg,
-      borderColor: activeBg,
-      color: activeColor,
-      _disabled: {
-        color,
-        borderColor,
+      color: 'link_hovered',
+      borderColor: 'link_hovered',
+      bg,
+      span: {
+        color: 'link_hovered',
       },
-      p: {
-        color: activeColor,
+      _disabled: {
+        color: 'link_hovered',
+        borderColor: 'link_hovered',
       },
     },
+    // We have a special state for this button variant that serves as a popover trigger.
+    // When any items (filters) are selected in the popover, the button should change its background and text color.
+    // The last CSS selector is for redefining styles for the TabList component.
+    [`
+      &[data-selected=true],
+      &[data-selected=true][aria-selected=true]
+    `]: {
+      bg: selectedBg,
+      color: selectedColor,
+      borderColor: selectedBg,
+    },
   };
 });
 
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-1.png
new file mode 100644
index 0000000000..a8c51a2f69
Binary files /dev/null and b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-1.png differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-active-1.png
deleted file mode 100644
index f519401d1e..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-base-1.png
deleted file mode 100644
index 336dd1b8f7..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-disabled-1.png
deleted file mode 100644
index 884ac88b55..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-hovered-1.png
deleted file mode 100644
index 5bb143cf3e..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-ghost-dark-mode-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-1.png
new file mode 100644
index 0000000000..ea247969a5
Binary files /dev/null and b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-1.png differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-active-1.png
deleted file mode 100644
index 62d690fbef..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-base-1.png
deleted file mode 100644
index 63c25c4ef3..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-disabled-1.png
deleted file mode 100644
index c32c9f4700..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-hovered-1.png
deleted file mode 100644
index 289408bbbd..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-blue-color-scheme-dark-mode-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-1.png
new file mode 100644
index 0000000000..8450e14238
Binary files /dev/null and b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-1.png differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-active-1.png
deleted file mode 100644
index 62d690fbef..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-base-1.png
deleted file mode 100644
index fbc8117dce..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-disabled-1.png
deleted file mode 100644
index 723caaac4f..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-hovered-1.png
deleted file mode 100644
index 289408bbbd..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-color-scheme-dark-mode-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-dark-color-scheme-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-dark-color-scheme-dark-mode-active-1.png
deleted file mode 100644
index 62d690fbef..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-dark-color-scheme-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-dark-color-scheme-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-dark-color-scheme-dark-mode-base-1.png
deleted file mode 100644
index fbc8117dce..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-dark-color-scheme-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-dark-color-scheme-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-dark-color-scheme-dark-mode-disabled-1.png
deleted file mode 100644
index 723caaac4f..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-dark-color-scheme-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-dark-color-scheme-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-dark-color-scheme-dark-mode-hovered-1.png
deleted file mode 100644
index 289408bbbd..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-outline-with-gray-dark-color-scheme-dark-mode-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-1.png
new file mode 100644
index 0000000000..e6bda7dbc4
Binary files /dev/null and b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-1.png differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-active-1.png
deleted file mode 100644
index 9d2e16c466..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-base-1.png
deleted file mode 100644
index 9d2e16c466..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-disabled-1.png
deleted file mode 100644
index ce5d907dd2..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-hovered-1.png
deleted file mode 100644
index 62603351af..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-simple-dark-mode-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-solid-with-gray-color-scheme-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-solid-with-gray-color-scheme-dark-mode-active-1.png
deleted file mode 100644
index 3ced2622bc..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-solid-with-gray-color-scheme-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-solid-with-gray-color-scheme-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-solid-with-gray-color-scheme-dark-mode-base-1.png
deleted file mode 100644
index 5dc02f7215..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-solid-with-gray-color-scheme-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-solid-with-gray-color-scheme-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-solid-with-gray-color-scheme-dark-mode-disabled-1.png
deleted file mode 100644
index 061a4a511e..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-solid-with-gray-color-scheme-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-solid-with-gray-color-scheme-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-solid-with-gray-color-scheme-dark-mode-hovered-1.png
deleted file mode 100644
index 7970651830..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-solid-with-gray-color-scheme-dark-mode-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-1.png
new file mode 100644
index 0000000000..a54cabfe22
Binary files /dev/null and b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-1.png differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-active-1.png
deleted file mode 100644
index 9306ab7578..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-base-1.png
deleted file mode 100644
index 9306ab7578..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-disabled-1.png
deleted file mode 100644
index 5d08e00f0f..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-hovered-1.png
deleted file mode 100644
index 0819be4cc5..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_dark-color-mode_variant-subtle-with-gray-color-scheme-dark-mode-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-1.png
new file mode 100644
index 0000000000..11a01abe7d
Binary files /dev/null and b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-1.png differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-active-1.png
deleted file mode 100644
index ff0444b3e3..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-base-1.png
deleted file mode 100644
index 0c80b4f99d..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-disabled-1.png
deleted file mode 100644
index be418bc9d2..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-hovered-1.png
deleted file mode 100644
index eb4b1b612f..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-ghost-dark-mode-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-1.png
new file mode 100644
index 0000000000..698e13cc7b
Binary files /dev/null and b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-1.png differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-active-1.png
deleted file mode 100644
index 04e7804665..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-base-1.png
deleted file mode 100644
index 6b24fb0b36..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-disabled-1.png
deleted file mode 100644
index 258b31af68..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-hovered-1.png
deleted file mode 100644
index f3692b3216..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-blue-color-scheme-dark-mode-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-1.png
new file mode 100644
index 0000000000..4e623efadf
Binary files /dev/null and b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-1.png differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-active-1.png
deleted file mode 100644
index 04e7804665..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-base-1.png
deleted file mode 100644
index 33d32d1e2c..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-disabled-1.png
deleted file mode 100644
index 0a1a9a27f4..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-hovered-1.png
deleted file mode 100644
index f3692b3216..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-color-scheme-dark-mode-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-dark-color-scheme-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-dark-color-scheme-dark-mode-active-1.png
deleted file mode 100644
index 04e7804665..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-dark-color-scheme-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-dark-color-scheme-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-dark-color-scheme-dark-mode-base-1.png
deleted file mode 100644
index 33d32d1e2c..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-dark-color-scheme-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-dark-color-scheme-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-dark-color-scheme-dark-mode-disabled-1.png
deleted file mode 100644
index 0a1a9a27f4..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-dark-color-scheme-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-dark-color-scheme-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-dark-color-scheme-dark-mode-hovered-1.png
deleted file mode 100644
index f3692b3216..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-outline-with-gray-dark-color-scheme-dark-mode-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-1.png
new file mode 100644
index 0000000000..94f93a73b5
Binary files /dev/null and b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-1.png differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-active-1.png
deleted file mode 100644
index 99262ae8a5..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-base-1.png
deleted file mode 100644
index 99262ae8a5..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-disabled-1.png
deleted file mode 100644
index a6e2c3094c..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-hovered-1.png
deleted file mode 100644
index a84dd4a732..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-simple-dark-mode-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-1.png
new file mode 100644
index 0000000000..3bc86f3500
Binary files /dev/null and b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-1.png differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-active-1.png
deleted file mode 100644
index 3b07d16161..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-base-1.png
deleted file mode 100644
index e2b1284365..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-disabled-1.png
deleted file mode 100644
index de9a716a02..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-hovered-1.png
deleted file mode 100644
index a895dc475a..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-with-gray-color-scheme-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-with-gray-color-scheme-dark-mode-active-1.png
deleted file mode 100644
index 8c0cb0427e..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-with-gray-color-scheme-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-with-gray-color-scheme-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-with-gray-color-scheme-dark-mode-base-1.png
deleted file mode 100644
index e014823eae..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-with-gray-color-scheme-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-with-gray-color-scheme-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-with-gray-color-scheme-dark-mode-disabled-1.png
deleted file mode 100644
index ee63e2c93f..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-with-gray-color-scheme-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-with-gray-color-scheme-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-with-gray-color-scheme-dark-mode-hovered-1.png
deleted file mode 100644
index ba1feb7c4d..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-solid-with-gray-color-scheme-dark-mode-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-1.png
new file mode 100644
index 0000000000..69be1fa9a7
Binary files /dev/null and b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-1.png differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-active-1.png
deleted file mode 100644
index 1e13e03bad..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-base-1.png
deleted file mode 100644
index 1e13e03bad..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-disabled-1.png
deleted file mode 100644
index fdd327ee61..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-hovered-1.png
deleted file mode 100644
index b8d4dce465..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-hovered-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-1.png
new file mode 100644
index 0000000000..95cf92e089
Binary files /dev/null and b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-1.png differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-active-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-active-1.png
deleted file mode 100644
index b43cdb9499..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-active-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-base-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-base-1.png
deleted file mode 100644
index b43cdb9499..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-base-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-disabled-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-disabled-1.png
deleted file mode 100644
index 6173c806b7..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-disabled-1.png and /dev/null differ
diff --git a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-hovered-1.png b/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-hovered-1.png
deleted file mode 100644
index 3ff3167615..0000000000
Binary files a/theme/components/Button/__screenshots__/Button.pw.tsx_default_variant-subtle-with-gray-color-scheme-dark-mode-hovered-1.png and /dev/null differ
diff --git a/ui/address/AddressAccountHistory.tsx b/ui/address/AddressAccountHistory.tsx
index 6d76d04302..c0e822e2ea 100644
--- a/ui/address/AddressAccountHistory.tsx
+++ b/ui/address/AddressAccountHistory.tsx
@@ -61,7 +61,7 @@ const AddressAccountHistory = ({ scrollRef, shouldRender = true }: Props) => {
       <AccountHistoryFilter
         defaultFilter={ filterValue }
         onFilterChange={ handleFilterChange }
-        isActive={ Boolean(filterValue) }
+        hasActiveFilter={ Boolean(filterValue) }
         isLoading={ pagination.isLoading }
       />
 
diff --git a/ui/address/AddressAccountHistoryFilter.tsx b/ui/address/AddressAccountHistoryFilter.tsx
index d66519d635..b321051b27 100644
--- a/ui/address/AddressAccountHistoryFilter.tsx
+++ b/ui/address/AddressAccountHistoryFilter.tsx
@@ -1,54 +1,35 @@
-import {
-  Menu,
-  MenuButton,
-  MenuList,
-  MenuOptionGroup,
-  MenuItemOption,
-  useDisclosure,
-} from '@chakra-ui/react';
 import React from 'react';
 
 import type { NovesHistoryFilterValue } from 'types/api/noves';
 
 import useIsInitialLoading from 'lib/hooks/useIsInitialLoading';
-import FilterButton from 'ui/shared/filters/FilterButton';
+import PopoverFilterRadio from 'ui/shared/filters/PopoverFilterRadio';
+
+const OPTIONS = [
+  { value: 'all', label: 'All' },
+  { value: 'received', label: 'Received from' },
+  { value: 'sent', label: 'Sent to' },
+];
 
 interface Props {
-  isActive: boolean;
+  hasActiveFilter: boolean;
   defaultFilter: NovesHistoryFilterValue;
   onFilterChange: (nextValue: string | Array<string>) => void;
   isLoading?: boolean;
 }
 
-const AccountHistoryFilter = ({ onFilterChange, defaultFilter, isActive, isLoading }: Props) => {
-  const { isOpen, onToggle } = useDisclosure();
+const AccountHistoryFilter = ({ onFilterChange, defaultFilter, hasActiveFilter, isLoading }: Props) => {
   const isInitialLoading = useIsInitialLoading(isLoading);
 
-  const onCloseMenu = React.useCallback(() => {
-    if (isOpen) {
-      onToggle();
-    }
-  }, [ isOpen, onToggle ]);
-
   return (
-    <Menu isOpen={ isOpen } onClose={ onCloseMenu }>
-      <MenuButton onClick={ onToggle }>
-        <FilterButton
-          isActive={ isOpen || isActive }
-          isLoading={ isInitialLoading }
-          onClick={ onToggle }
-          appliedFiltersNum={ isActive ? 1 : 0 }
-          as="div"
-        />
-      </MenuButton>
-      <MenuList zIndex={ 2 }>
-        <MenuOptionGroup defaultValue={ defaultFilter || 'all' } type="radio" onChange={ onFilterChange }>
-          <MenuItemOption value="all">All</MenuItemOption>
-          <MenuItemOption value="received">Received from</MenuItemOption>
-          <MenuItemOption value="sent">Sent to</MenuItemOption>
-        </MenuOptionGroup>
-      </MenuList>
-    </Menu>
+    <PopoverFilterRadio
+      name="account_history_filter"
+      options={ OPTIONS }
+      onChange={ onFilterChange }
+      hasActiveFilter={ hasActiveFilter }
+      isLoading={ isInitialLoading }
+      defaultValue={ defaultFilter || OPTIONS[0].value }
+    />
   );
 };
 
diff --git a/ui/address/AddressInternalTxs.tsx b/ui/address/AddressInternalTxs.tsx
index ebaf11cbaf..d61613b567 100644
--- a/ui/address/AddressInternalTxs.tsx
+++ b/ui/address/AddressInternalTxs.tsx
@@ -82,7 +82,7 @@ const AddressInternalTxs = ({ scrollRef, shouldRender = true }: Props) => {
       <AddressTxsFilter
         defaultFilter={ filterValue }
         onFilterChange={ handleFilterChange }
-        isActive={ Boolean(filterValue) }
+        hasActiveFilter={ Boolean(filterValue) }
         isLoading={ pagination.isLoading }
       />
       <AddressCsvExportLink
diff --git a/ui/address/AddressTokens.tsx b/ui/address/AddressTokens.tsx
index ae50bd892c..0cd23e57d2 100644
--- a/ui/address/AddressTokens.tsx
+++ b/ui/address/AddressTokens.tsx
@@ -111,7 +111,7 @@ const AddressTokens = ({ shouldRender = true }: Props) => {
   }
 
   const nftTypeFilter = (
-    <PopoverFilter isActive={ tokenTypes && tokenTypes.length > 0 } contentProps={{ w: '200px' }} appliedFiltersNum={ tokenTypes?.length }>
+    <PopoverFilter contentProps={{ w: '200px' }} appliedFiltersNum={ tokenTypes?.length }>
       <TokenTypeFilter<NFTTokenType> nftOnly onChange={ handleTokenTypesChange } defaultValue={ tokenTypes }/>
     </PopoverFilter>
   );
diff --git a/ui/address/AddressTxs.tsx b/ui/address/AddressTxs.tsx
index 7e960d98d0..7765a95a76 100644
--- a/ui/address/AddressTxs.tsx
+++ b/ui/address/AddressTxs.tsx
@@ -167,7 +167,7 @@ const AddressTxs = ({ scrollRef, overloadCount = OVERLOAD_COUNT, shouldRender =
     <AddressTxsFilter
       defaultFilter={ filterValue }
       onFilterChange={ handleFilterChange }
-      isActive={ Boolean(filterValue) }
+      hasActiveFilter={ Boolean(filterValue) }
       isLoading={ addressTxsQuery.pagination.isLoading }
     />
   );
diff --git a/ui/address/AddressTxsFilter.tsx b/ui/address/AddressTxsFilter.tsx
index c08601123a..d3bdbd61fe 100644
--- a/ui/address/AddressTxsFilter.tsx
+++ b/ui/address/AddressTxsFilter.tsx
@@ -1,48 +1,35 @@
-import {
-  Menu,
-  MenuButton,
-  MenuList,
-  MenuOptionGroup,
-  MenuItemOption,
-  useDisclosure,
-} from '@chakra-ui/react';
 import React from 'react';
 
 import type { AddressFromToFilter } from 'types/api/address';
 
 import useIsInitialLoading from 'lib/hooks/useIsInitialLoading';
-import FilterButton from 'ui/shared/filters/FilterButton';
+import PopoverFilterRadio from 'ui/shared/filters/PopoverFilterRadio';
+
+const OPTIONS = [
+  { value: 'all', label: 'All' },
+  { value: 'from', label: 'Outgoing transactions' },
+  { value: 'to', label: 'Incoming transactions' },
+];
 
 interface Props {
-  isActive: boolean;
+  hasActiveFilter: boolean;
   defaultFilter: AddressFromToFilter;
   onFilterChange: (nextValue: string | Array<string>) => void;
   isLoading?: boolean;
 }
 
-const AddressTxsFilter = ({ onFilterChange, defaultFilter, isActive, isLoading }: Props) => {
-  const { isOpen, onToggle } = useDisclosure();
+const AddressTxsFilter = ({ onFilterChange, defaultFilter, hasActiveFilter, isLoading }: Props) => {
   const isInitialLoading = useIsInitialLoading(isLoading);
 
   return (
-    <Menu>
-      <MenuButton>
-        <FilterButton
-          isActive={ isOpen || isActive }
-          isLoading={ isInitialLoading }
-          onClick={ onToggle }
-          appliedFiltersNum={ isActive ? 1 : 0 }
-          as="div"
-        />
-      </MenuButton>
-      <MenuList zIndex={ 2 }>
-        <MenuOptionGroup defaultValue={ defaultFilter || 'all' } type="radio" onChange={ onFilterChange }>
-          <MenuItemOption value="all">All</MenuItemOption>
-          <MenuItemOption value="from">Outgoing transactions</MenuItemOption>
-          <MenuItemOption value="to">Incoming transactions</MenuItemOption>
-        </MenuOptionGroup>
-      </MenuList>
-    </Menu>
+    <PopoverFilterRadio
+      name="txs_filter"
+      options={ OPTIONS }
+      onChange={ onFilterChange }
+      hasActiveFilter={ hasActiveFilter }
+      isLoading={ isInitialLoading }
+      defaultValue={ defaultFilter || OPTIONS[0].value }
+    />
   );
 };
 
diff --git a/ui/address/SolidityscanReport.tsx b/ui/address/SolidityscanReport.tsx
index f1424a9eff..0a6d11510e 100644
--- a/ui/address/SolidityscanReport.tsx
+++ b/ui/address/SolidityscanReport.tsx
@@ -44,6 +44,7 @@ const SolidityscanReport = ({ hash }: Props) => {
           score={ score }
           isLoading={ isPlaceholderData }
           onClick={ onToggle }
+          isActive={ isOpen }
         />
       </PopoverTrigger>
       <PopoverContent w={{ base: '100vw', lg: '328px' }}>
diff --git a/ui/address/contract/ABI/form/ContractMethodMultiplyButton.tsx b/ui/address/contract/ABI/form/ContractMethodMultiplyButton.tsx
index 7b12ab727e..82ee23210d 100644
--- a/ui/address/contract/ABI/form/ContractMethodMultiplyButton.tsx
+++ b/ui/address/contract/ABI/form/ContractMethodMultiplyButton.tsx
@@ -76,6 +76,7 @@ const ContractMethodMultiplyButton = ({ onClick, isDisabled }: Props) => {
             ml={ 1 }
             p={ 0 }
             onClick={ onToggle }
+            isActive={ isOpen }
             isDisabled={ isDisabled }
           >
             <IconSvg
diff --git a/ui/address/contract/ContractCodeIdes.tsx b/ui/address/contract/ContractCodeIdes.tsx
index 8db304ccb1..4e15dac588 100644
--- a/ui/address/contract/ContractCodeIdes.tsx
+++ b/ui/address/contract/ContractCodeIdes.tsx
@@ -61,6 +61,7 @@ const ContractCodeIde = ({ className, hash, isLoading }: Props) => {
           variant="outline"
           colorScheme="gray"
           onClick={ onToggle }
+          isActive={ isOpen }
           aria-label="Open source code in IDE"
           fontWeight={ 500 }
           px={ 2 }
diff --git a/ui/address/contract/ContractExternalLibraries.tsx b/ui/address/contract/ContractExternalLibraries.tsx
index 02f8abda3f..48dedb4a30 100644
--- a/ui/address/contract/ContractExternalLibraries.tsx
+++ b/ui/address/contract/ContractExternalLibraries.tsx
@@ -65,6 +65,7 @@ const ContractExternalLibraries = ({ className, data, isLoading }: Props) => {
       variant="outline"
       colorScheme="gray"
       onClick={ onToggle }
+      isActive={ isOpen }
       fontWeight={ 600 }
       px={ 2 }
       aria-label="View external libraries"
diff --git a/ui/address/ensDomains/AddressEnsDomains.tsx b/ui/address/ensDomains/AddressEnsDomains.tsx
index 6dcabfcbdd..f84626809d 100644
--- a/ui/address/ensDomains/AddressEnsDomains.tsx
+++ b/ui/address/ensDomains/AddressEnsDomains.tsx
@@ -111,6 +111,7 @@ const AddressEnsDomains = ({ addressHash, mainDomainName }: Props) => {
             variant="outline"
             colorScheme="gray"
             onClick={ onToggle }
+            isActive={ isOpen }
             aria-label="Address domains"
             fontWeight={ 500 }
             px={ 2 }
diff --git a/ui/address/tokenSelect/TokenSelectButton.tsx b/ui/address/tokenSelect/TokenSelectButton.tsx
index 773c06569c..9662b20cc9 100644
--- a/ui/address/tokenSelect/TokenSelectButton.tsx
+++ b/ui/address/tokenSelect/TokenSelectButton.tsx
@@ -1,4 +1,4 @@
-import { Box, Button, Skeleton, Text, useColorModeValue } from '@chakra-ui/react';
+import { Box, Button, Skeleton, chakra, useColorModeValue } from '@chakra-ui/react';
 import React from 'react';
 
 import type { FormattedData } from './types';
@@ -39,20 +39,21 @@ const TokenSelectButton = ({ isOpen, isLoading, onClick, data }: Props, ref: Rea
         variant="outline"
         colorScheme="gray"
         onClick={ handleClick }
+        isActive={ isOpen }
         aria-label="Token select"
       >
         <IconSvg name="tokens" boxSize={ 4 } mr={ 2 }/>
-        <Text fontWeight={ 600 }>{ prefix }{ num }</Text>
-        <Text
+        <chakra.span fontWeight={ 600 }>{ prefix }{ num }</chakra.span>
+        <chakra.span
           whiteSpace="pre"
-          variant="secondary"
+          color="text_secondary"
           fontWeight={ 400 }
           maxW={{ base: 'calc(100vw - 230px)', lg: '500px' }}
           overflow="hidden"
           textOverflow="ellipsis"
         >
           { space }({ prefix }${ usd.toFormat(2) })
-        </Text>
+        </chakra.span>
         <IconSvg name="arrows/east-mini" transform={ isOpen ? 'rotate(90deg)' : 'rotate(-90deg)' } transitionDuration="faster" boxSize={ 5 } ml={ 3 }/>
       </Button>
       { isLoading && !isOpen && <Skeleton h="100%" w="100%" position="absolute" top={ 0 } left={ 0 } bgColor={ skeletonBgColor } borderRadius="base"/> }
diff --git a/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_dark-color-mode_base-view-dark-mode-1.png b/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_dark-color-mode_base-view-dark-mode-1.png
index 0f13fc0097..265abccfcf 100644
Binary files a/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_dark-color-mode_base-view-dark-mode-1.png and b/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_dark-color-mode_base-view-dark-mode-1.png differ
diff --git a/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_dark-color-mode_base-view-dark-mode-2.png b/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_dark-color-mode_base-view-dark-mode-2.png
index dc1db04181..ba536e6cc8 100644
Binary files a/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_dark-color-mode_base-view-dark-mode-2.png and b/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_dark-color-mode_base-view-dark-mode-2.png differ
diff --git a/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_base-view-dark-mode-1.png b/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_base-view-dark-mode-1.png
index 90b6524154..9e934a8b9c 100644
Binary files a/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_base-view-dark-mode-1.png and b/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_base-view-dark-mode-1.png differ
diff --git a/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_base-view-dark-mode-2.png b/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_base-view-dark-mode-2.png
index df33a35e69..08f3482eef 100644
Binary files a/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_base-view-dark-mode-2.png and b/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_base-view-dark-mode-2.png differ
diff --git a/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_sort-1.png b/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_sort-1.png
index 56f4a24113..3fdef2fcca 100644
Binary files a/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_sort-1.png and b/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_sort-1.png differ
diff --git a/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_sort-2.png b/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_sort-2.png
index 0638c45f9e..ee09f5ace7 100644
Binary files a/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_sort-2.png and b/ui/address/tokenSelect/__screenshots__/TokenSelect.pw.tsx_default_sort-2.png differ
diff --git a/ui/marketplace/AppSecurityReport.tsx b/ui/marketplace/AppSecurityReport.tsx
index 55e51a492f..94970b363d 100644
--- a/ui/marketplace/AppSecurityReport.tsx
+++ b/ui/marketplace/AppSecurityReport.tsx
@@ -51,6 +51,7 @@ const AppSecurityReport = ({ id, securityReport, showContractList, isLoading, on
           score={ securityScore }
           isLoading={ isLoading }
           onClick={ handleButtonClick }
+          isActive={ isOpen }
           onlyIcon={ onlyIcon }
           label="The security score is based on analysis of a DApp's smart contracts."
         />
diff --git a/ui/marketplace/ContractSecurityReport.tsx b/ui/marketplace/ContractSecurityReport.tsx
index fe52eef07c..da14a07c8c 100644
--- a/ui/marketplace/ContractSecurityReport.tsx
+++ b/ui/marketplace/ContractSecurityReport.tsx
@@ -40,6 +40,7 @@ const ContractSecurityReport = ({ securityReport }: Props) => {
         <SolidityscanReportButton
           score={ parseFloat(securityScore) }
           onClick={ handleClick }
+          isActive={ isOpen }
         />
       </PopoverTrigger>
       <PopoverContent w={{ base: '100vw', lg: '328px' }}>
diff --git a/ui/marketplace/MarketplaceAppInfo.tsx b/ui/marketplace/MarketplaceAppInfo.tsx
index 00646e3291..ce98a894e7 100644
--- a/ui/marketplace/MarketplaceAppInfo.tsx
+++ b/ui/marketplace/MarketplaceAppInfo.tsx
@@ -36,7 +36,7 @@ const MarketplaceAppInfo = ({ data }: Props) => {
   return (
     <Popover isOpen={ isOpen } onClose={ onClose } placement="bottom-start" isLazy>
       <PopoverTrigger>
-        <TriggerButton onClick={ onToggle }/>
+        <TriggerButton onClick={ onToggle } isActive={ isOpen }/>
       </PopoverTrigger>
       <PopoverContent w="500px">
         <PopoverBody px={ 6 } py={ 5 }>
diff --git a/ui/marketplace/MarketplaceAppInfo/TriggerButton.tsx b/ui/marketplace/MarketplaceAppInfo/TriggerButton.tsx
index 1f3f6371da..172cb4f32a 100644
--- a/ui/marketplace/MarketplaceAppInfo/TriggerButton.tsx
+++ b/ui/marketplace/MarketplaceAppInfo/TriggerButton.tsx
@@ -6,9 +6,10 @@ import IconSvg from 'ui/shared/IconSvg';
 interface Props {
   onClick: () => void;
   onlyIcon?: boolean;
+  isActive?: boolean;
 }
 
-const TriggerButton = ({ onClick, onlyIcon }: Props, ref: React.ForwardedRef<HTMLButtonElement>) => {
+const TriggerButton = ({ onClick, onlyIcon, isActive }: Props, ref: React.ForwardedRef<HTMLButtonElement>) => {
   return (
     <Button
       ref={ ref }
@@ -16,6 +17,7 @@ const TriggerButton = ({ onClick, onlyIcon }: Props, ref: React.ForwardedRef<HTM
       variant="outline"
       colorScheme="gray"
       onClick={ onClick }
+      isActive={ isActive }
       aria-label="Show project info"
       fontWeight={ 500 }
       px={ onlyIcon ? 1 : 2 }
diff --git a/ui/pages/Tokens.tsx b/ui/pages/Tokens.tsx
index 04e6cb477c..910eac6e0a 100644
--- a/ui/pages/Tokens.tsx
+++ b/ui/pages/Tokens.tsx
@@ -106,11 +106,11 @@ const Tokens = () => {
   const hasMultipleTabs = bridgedTokensFeature.isEnabled;
 
   const filter = tab === 'bridged' ? (
-    <PopoverFilter isActive={ bridgeChains && bridgeChains.length > 0 } contentProps={{ maxW: '350px' }} appliedFiltersNum={ bridgeChains?.length }>
+    <PopoverFilter contentProps={{ maxW: '350px' }} appliedFiltersNum={ bridgeChains?.length }>
       <TokensBridgedChainsFilter onChange={ handleBridgeChainsChange } defaultValue={ bridgeChains }/>
     </PopoverFilter>
   ) : (
-    <PopoverFilter isActive={ tokenTypes && tokenTypes.length > 0 } contentProps={{ w: '200px' }} appliedFiltersNum={ tokenTypes?.length }>
+    <PopoverFilter contentProps={{ w: '200px' }} appliedFiltersNum={ tokenTypes?.length }>
       <TokenTypeFilter<TokenType> onChange={ handleTokenTypesChange } defaultValue={ tokenTypes } nftOnly={ false }/>
     </PopoverFilter>
   );
diff --git a/ui/pages/Validators.tsx b/ui/pages/Validators.tsx
index 2756b59083..482e87ec2c 100644
--- a/ui/pages/Validators.tsx
+++ b/ui/pages/Validators.tsx
@@ -83,7 +83,7 @@ const Validators = () => {
     onSortingChange(getSortParamsFromValue(value));
   }, [ onSortingChange ]);
 
-  const filterMenu = <ValidatorsFilter onChange={ handleStateFilterChange } defaultValue={ statusFilter } isActive={ Boolean(statusFilter) }/>;
+  const filterMenu = <ValidatorsFilter onChange={ handleStateFilterChange } defaultValue={ statusFilter } hasActiveFilter={ Boolean(statusFilter) }/>;
 
   // const filterInput = (
   //   <FilterInput
diff --git a/ui/pages/VerifiedContracts.tsx b/ui/pages/VerifiedContracts.tsx
index bb75f1755d..3c17beda81 100644
--- a/ui/pages/VerifiedContracts.tsx
+++ b/ui/pages/VerifiedContracts.tsx
@@ -77,7 +77,13 @@ const VerifiedContracts = () => {
     onSortingChange(getSortParamsFromValue(value));
   }, [ onSortingChange ]);
 
-  const typeFilter = <VerifiedContractsFilter onChange={ handleTypeChange } defaultValue={ type } isActive={ Boolean(type) }/>;
+  const typeFilter = (
+    <VerifiedContractsFilter
+      onChange={ handleTypeChange }
+      defaultValue={ type }
+      hasActiveFilter={ Boolean(type) }
+    />
+  );
 
   const filterInput = (
     <FilterInput
diff --git a/ui/shared/NetworkExplorers.tsx b/ui/shared/NetworkExplorers.tsx
index 1cd0866d0c..5a6f55b70e 100644
--- a/ui/shared/NetworkExplorers.tsx
+++ b/ui/shared/NetworkExplorers.tsx
@@ -62,6 +62,7 @@ const NetworkExplorers = ({ className, type, pathParam }: Props) => {
             variant="outline"
             colorScheme="gray"
             onClick={ onToggle }
+            isActive={ isOpen }
             aria-label="Verify in other explorers"
             fontWeight={ 500 }
             px={ 2 }
diff --git a/ui/shared/Tabs/AdaptiveTabsList.tsx b/ui/shared/Tabs/AdaptiveTabsList.tsx
index e35c3d21a6..5fb881cca3 100644
--- a/ui/shared/Tabs/AdaptiveTabsList.tsx
+++ b/ui/shared/Tabs/AdaptiveTabsList.tsx
@@ -119,6 +119,7 @@ const AdaptiveTabsList = (props: Props) => {
                 color: 'inherit',
               },
             }}
+            { ...(index === props.activeTabIndex ? { 'data-selected': true } : {}) }
           >
             <Skeleton isLoaded={ !props.isLoading }>
               { typeof tab.title === 'function' ? tab.title() : tab.title }
diff --git a/ui/shared/filters/FilterButton.tsx b/ui/shared/filters/FilterButton.tsx
index 8868c27f1d..67bad9989d 100644
--- a/ui/shared/filters/FilterButton.tsx
+++ b/ui/shared/filters/FilterButton.tsx
@@ -22,20 +22,38 @@ const FilterButton = ({ isActive, isLoading, appliedFiltersNum, onClick, as }: P
     return <Skeleton w={{ base: 9, lg: '78px' }} h={ 8 } borderRadius="base" flexShrink={ 0 }/>;
   }
 
+  const num = (
+    <Circle
+      className="AppliedFiltersNum"
+      bg={ isActive ? 'link_hovered' : badgeBgColor }
+      size={ 5 }
+      color={ badgeColor }
+    >
+      { appliedFiltersNum }
+    </Circle>
+  );
+
   return (
     <Button
       ref={ ref }
-      rightIcon={ appliedFiltersNum ? <Circle bg={ badgeBgColor } size={ 5 } color={ badgeColor }>{ appliedFiltersNum }</Circle> : undefined }
+      rightIcon={ appliedFiltersNum ? num : undefined }
       size="sm"
       fontWeight="500"
       variant="outline"
-      colorScheme="gray-dark"
+      colorScheme="gray"
       onClick={ onClick }
       isActive={ isActive }
+      data-selected={ Boolean(appliedFiltersNum) }
       px={ 1.5 }
       flexShrink={ 0 }
       as={ as }
       pointerEvents="all"
+      _hover={ isActive ? {
+        color: 'link_hovered',
+        '.AppliedFiltersNum': {
+          bg: 'link_hovered',
+        },
+      } : undefined }
     >
       { FilterIcon }
       <Box display={{ base: 'none', lg: 'block' }}>Filter</Box>
diff --git a/ui/shared/filters/PopoverFilter.tsx b/ui/shared/filters/PopoverFilter.tsx
index bc09a7ad72..b9e34cb474 100644
--- a/ui/shared/filters/PopoverFilter.tsx
+++ b/ui/shared/filters/PopoverFilter.tsx
@@ -12,20 +12,19 @@ import FilterButton from 'ui/shared/filters/FilterButton';
 
 interface Props {
   appliedFiltersNum?: number;
-  isActive?: boolean;
   children: React.ReactNode;
   contentProps?: PopoverContentProps;
   isLoading?: boolean;
 }
 
-const PopoverFilter = ({ appliedFiltersNum, children, contentProps, isActive, isLoading }: Props) => {
+const PopoverFilter = ({ appliedFiltersNum, children, contentProps, isLoading }: Props) => {
   const { isOpen, onToggle, onClose } = useDisclosure();
 
   return (
     <Popover isOpen={ isOpen } onClose={ onClose } placement="bottom-start" isLazy>
       <PopoverTrigger>
         <FilterButton
-          isActive={ isOpen || isActive || Number(appliedFiltersNum) > 0 }
+          isActive={ isOpen }
           onClick={ onToggle }
           appliedFiltersNum={ appliedFiltersNum }
           isLoading={ isLoading }
diff --git a/ui/shared/filters/PopoverFilterRadio.tsx b/ui/shared/filters/PopoverFilterRadio.tsx
new file mode 100644
index 0000000000..272d4f67b0
--- /dev/null
+++ b/ui/shared/filters/PopoverFilterRadio.tsx
@@ -0,0 +1,102 @@
+import {
+  Popover,
+  PopoverTrigger,
+  PopoverContent,
+  PopoverBody,
+  useDisclosure,
+  useRadio,
+  Box,
+  useRadioGroup,
+  useColorModeValue,
+} from '@chakra-ui/react';
+import React from 'react';
+
+import FilterButton from 'ui/shared/filters/FilterButton';
+import IconSvg from 'ui/shared/IconSvg';
+
+// OPTION
+export interface TOption {
+  value: string;
+  label: string;
+}
+
+type OptionProps = ReturnType<ReturnType<typeof useRadioGroup>['getRadioProps']>;
+
+const Option = (props: OptionProps) => {
+  const { getInputProps, getRadioProps } = useRadio(props);
+
+  const input = getInputProps();
+  const checkbox = getRadioProps();
+  const bgColorHover = useColorModeValue('blue.50', 'whiteAlpha.100');
+
+  return (
+    <Box
+      as="label"
+      px={ 4 }
+      py={ 2 }
+      cursor="pointer"
+      display="flex"
+      columnGap={ 3 }
+      alignItems="center"
+      _hover={{
+        bgColor: bgColorHover,
+      }}
+    >
+      <input { ...input }/>
+      <Box { ...checkbox }>
+        { props.children }
+      </Box>
+      { props.isChecked && <IconSvg name="check" boxSize={ 4 }/> }
+    </Box>
+  );
+};
+
+// FILTER
+
+interface Props {
+  name: string;
+  options: Array<TOption>;
+  hasActiveFilter: boolean;
+  defaultValue?: string;
+  isLoading?: boolean;
+  onChange: (nextValue: string) => void;
+}
+
+const PopoverFilterRadio = ({ name, hasActiveFilter, options, isLoading, onChange, defaultValue }: Props) => {
+  const { isOpen, onToggle, onClose } = useDisclosure();
+
+  const { getRootProps, getRadioProps } = useRadioGroup({
+    name,
+    defaultValue,
+    onChange,
+  });
+
+  const root = getRootProps();
+
+  return (
+    <Popover isOpen={ isOpen } onClose={ onClose } placement="bottom-start" isLazy>
+      <PopoverTrigger>
+        <FilterButton
+          isActive={ isOpen }
+          onClick={ onToggle }
+          appliedFiltersNum={ hasActiveFilter ? 1 : 0 }
+          isLoading={ isLoading }
+        />
+      </PopoverTrigger>
+      <PopoverContent w="fit-content" minW="150px">
+        <PopoverBody { ...root } py={ 2 } px={ 0 } display="flex" flexDir="column">
+          { options.map((option) => {
+            const radio = getRadioProps({ value: option.value });
+            return (
+              <Option key={ option.value } { ...radio }>
+                { option.label }
+              </Option>
+            );
+          }) }
+        </PopoverBody>
+      </PopoverContent>
+    </Popover>
+  );
+};
+
+export default React.memo(PopoverFilterRadio);
diff --git a/ui/shared/logs/LogItem.tsx b/ui/shared/logs/LogItem.tsx
index 184c1b8a60..65f0cc5c6d 100644
--- a/ui/shared/logs/LogItem.tsx
+++ b/ui/shared/logs/LogItem.tsx
@@ -74,7 +74,7 @@ const LogItem = ({ address, index, topics, data, decoded, type, tx_hash: txHash,
         </Tooltip> */ }
         <Skeleton isLoaded={ !isLoading } ml="auto" borderRadius="base">
           <Tooltip label="Log index">
-            <Button variant="outline" colorScheme="gray" isActive size="sm" fontWeight={ 400 }>
+            <Button variant="outline" colorScheme="gray" data-selected="true" size="sm" fontWeight={ 400 }>
               { index }
             </Button>
           </Tooltip>
diff --git a/ui/shared/logs/LogTopic.tsx b/ui/shared/logs/LogTopic.tsx
index bb8e7fdc22..634fe08d97 100644
--- a/ui/shared/logs/LogTopic.tsx
+++ b/ui/shared/logs/LogTopic.tsx
@@ -62,7 +62,7 @@ const LogTopic = ({ hex, index, isLoading }: Props) => {
   return (
     <Flex alignItems="center" px={{ base: 0, lg: 3 }} _notFirst={{ mt: 3 }} overflow="hidden" maxW="100%">
       <Skeleton isLoaded={ !isLoading } mr={ 3 } borderRadius="base">
-        <Button variant="outline" colorScheme="gray" isActive size="xs" fontWeight={ 400 } w={ 6 }>
+        <Button variant="outline" colorScheme="gray" data-selected size="xs" fontWeight={ 400 } w={ 6 }>
           { index }
         </Button>
       </Skeleton>
diff --git a/ui/shared/pagination/Pagination.tsx b/ui/shared/pagination/Pagination.tsx
index 67c2c0593d..203eb9ebf3 100644
--- a/ui/shared/pagination/Pagination.tsx
+++ b/ui/shared/pagination/Pagination.tsx
@@ -48,7 +48,7 @@ const Pagination = ({ page, onNextPageClick, onPrevPageClick, resetPage, hasPage
         <Button
           variant="outline"
           size="sm"
-          isActive
+          data-selected={ true }
           borderWidth="1px"
           fontWeight={ 400 }
           h={ 8 }
diff --git a/ui/shared/solidityscanReport/SolidityscanReportButton.tsx b/ui/shared/solidityscanReport/SolidityscanReportButton.tsx
index 54f4e9de3f..c76ba58b03 100644
--- a/ui/shared/solidityscanReport/SolidityscanReportButton.tsx
+++ b/ui/shared/solidityscanReport/SolidityscanReportButton.tsx
@@ -12,10 +12,11 @@ interface Props {
   onlyIcon?: boolean;
   onClick?: () => void;
   label?: string;
+  isActive: boolean;
 }
 
 const SolidityscanReportButton = (
-  { score, isLoading, onlyIcon, onClick, label = 'Security score' }: Props,
+  { score, isLoading, onlyIcon, onClick, label = 'Security score', isActive }: Props,
   ref: React.ForwardedRef<HTMLButtonElement>,
 ) => {
   const { scoreColor } = useScoreLevelAndColor(score);
@@ -31,6 +32,7 @@ const SolidityscanReportButton = (
         variant="outline"
         colorScheme="gray"
         onClick={ onClick }
+        isActive={ isActive }
         aria-label="SolidityScan score"
         fontWeight={ 500 }
         px="6px"
diff --git a/ui/shared/sort/SortButton.tsx b/ui/shared/sort/SortButton.tsx
index 903bb1fcec..dc28d17c55 100644
--- a/ui/shared/sort/SortButton.tsx
+++ b/ui/shared/sort/SortButton.tsx
@@ -21,7 +21,7 @@ const SortButton = ({ onClick, isActive, className, isLoading }: Props) => {
       aria-label="sort"
       size="sm"
       variant="outline"
-      colorScheme="gray-dark"
+      colorScheme="gray"
       minWidth="36px"
       onClick={ onClick }
       isActive={ isActive }
diff --git a/ui/snippets/networkMenu/NetworkMenuContentDesktop.tsx b/ui/snippets/networkMenu/NetworkMenuContentDesktop.tsx
index 5b9aaae19c..bb640fd1bc 100644
--- a/ui/snippets/networkMenu/NetworkMenuContentDesktop.tsx
+++ b/ui/snippets/networkMenu/NetworkMenuContentDesktop.tsx
@@ -12,9 +12,16 @@ interface Props {
 
 const NetworkMenuPopup = ({ items, tabs }: Props) => {
   const selectedNetwork = items?.find(({ isActive }) => isActive);
-  const selectedTab = tabs.findIndex((tab) => selectedNetwork?.group === tab);
+  const defaultTab = tabs.findIndex((tab) => selectedNetwork?.group === tab);
+
+  const [ tabIndex, setTabIndex ] = React.useState(defaultTab > -1 ? defaultTab : 0);
+
   const bgColor = useColorModeValue('blackAlpha.50', 'whiteAlpha.50');
 
+  const handleTabChange = React.useCallback((index: number) => {
+    setTabIndex(index);
+  }, []);
+
   const content = !items || items.length === 0 ? (
     <>
       <Flex alignItems="center">
@@ -45,11 +52,16 @@ const NetworkMenuPopup = ({ items, tabs }: Props) => {
       colorScheme="gray"
       size="sm"
       isLazy
-      defaultIndex={ selectedTab !== -1 ? selectedTab : undefined }
+      index={ tabIndex }
+      onChange={ handleTabChange }
     >
       { tabs.length > 1 && (
         <TabList columnGap={ 2 }>
-          { tabs.map((tab) => <Tab key={ tab } textTransform="capitalize">{ tab }</Tab>) }
+          { tabs.map((tab, index) => (
+            <Tab key={ tab } textTransform="capitalize" { ...(tabIndex === index ? { 'data-selected': 'true' } : {}) }>
+              { tab }
+            </Tab>
+          )) }
         </TabList>
       ) }
       <TabPanels mt={ 3 }>
diff --git a/ui/snippets/searchBar/SearchBar.pw.tsx b/ui/snippets/searchBar/SearchBar.pw.tsx
index c0b348cfee..12d6d1e28a 100644
--- a/ui/snippets/searchBar/SearchBar.pw.tsx
+++ b/ui/snippets/searchBar/SearchBar.pw.tsx
@@ -186,12 +186,12 @@ test('scroll suggest to category', async({ render, page, mockApiResponse }) => {
   await expect(page).toHaveScreenshot({ clip: { x: 0, y: 0, width: 1200, height: 500 } });
 });
 
-test('recent keywords suggest +@mobile', async({ render, page }) => {
+test('recent keywords suggest +@mobile', async({ render, page }, { project }) => {
   await render(<SearchBar/>);
   // eslint-disable-next-line max-len
   await page.evaluate(() => window.localStorage.setItem('recent_search_keywords', '["10x2d311959270e0bbdc1fc7bc6dbd8ad645c4dd8d6aa32f5f89d54629a924f112b","0x1d311959270e0bbdc1fc7bc6dbd8ad645c4dd8d6aa32f5f89d54629a924f112b","usd","bob"]'));
   await page.getByPlaceholder(/search/i).click();
-  await page.getByText('0x1d311959270e0bbdc1fc7bc6db').isVisible();
+  await page.getByText(project.name === 'mobile' ? '0x1d311959270e0bbdc1fc7bc6dbd...112b' : '0x1d311959270e0bbdc1fc7bc6dbd').isVisible();
   await expect(page).toHaveScreenshot({ clip: { x: 0, y: 0, width: 1200, height: 500 } });
 });
 
diff --git a/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggest.tsx b/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggest.tsx
index 48f998ccd1..05535e4e53 100644
--- a/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggest.tsx
+++ b/ui/snippets/searchBar/SearchBarSuggest/SearchBarSuggest.tsx
@@ -123,7 +123,11 @@ const SearchBarSuggest = ({ query, searchTerm, onItemClick, containerId }: Props
           <Box position="sticky" top="0" width="100%" background={ bgColor } py={ 5 } my={ -5 } ref={ tabsRef }>
             <Tabs variant="outline" colorScheme="gray" size="sm" index={ tabIndex }>
               <TabList columnGap={ 3 } rowGap={ 2 } flexWrap="wrap">
-                { resultCategories.map((cat, index) => <Tab key={ cat.id } onClick={ scrollToCategory(index) }>{ cat.title }</Tab>) }
+                { resultCategories.map((cat, index) => (
+                  <Tab key={ cat.id } onClick={ scrollToCategory(index) } { ...(tabIndex === index ? { 'data-selected': 'true' } : {}) }>
+                    { cat.title }
+                  </Tab>
+                )) }
               </TabList>
             </Tabs>
           </Box>
diff --git a/ui/snippets/searchBar/__screenshots__/SearchBar.pw.tsx_mobile_recent-keywords-suggest-mobile-1.png b/ui/snippets/searchBar/__screenshots__/SearchBar.pw.tsx_mobile_recent-keywords-suggest-mobile-1.png
index be08b1c810..a49472af78 100644
Binary files a/ui/snippets/searchBar/__screenshots__/SearchBar.pw.tsx_mobile_recent-keywords-suggest-mobile-1.png and b/ui/snippets/searchBar/__screenshots__/SearchBar.pw.tsx_mobile_recent-keywords-suggest-mobile-1.png differ
diff --git a/ui/snippets/topBar/DeFiDropdown.tsx b/ui/snippets/topBar/DeFiDropdown.tsx
index af2819ef01..1763266ead 100644
--- a/ui/snippets/topBar/DeFiDropdown.tsx
+++ b/ui/snippets/topBar/DeFiDropdown.tsx
@@ -45,7 +45,7 @@ const DeFiDropdown = () => {
       <PopoverTrigger>
         <Button
           onClick={ onToggle }
-          bgColor={ isOpen ? 'blue.400' : undefined }
+          isActive={ isOpen }
           { ...buttonStyles }
         >
           <chakra.span display={{ base: 'none', lg: 'inline' }} mr={ 1 }>
diff --git a/ui/stats/StatsDropdownMenu.tsx b/ui/stats/StatsDropdownMenu.tsx
index 7ab89f9ebe..a86886373a 100644
--- a/ui/stats/StatsDropdownMenu.tsx
+++ b/ui/stats/StatsDropdownMenu.tsx
@@ -1,4 +1,4 @@
-import { Box, Button, Menu, MenuButton, MenuItemOption, MenuList, MenuOptionGroup, Text } from '@chakra-ui/react';
+import { Box, Button, Menu, MenuButton, MenuItemOption, MenuList, MenuOptionGroup, chakra } from '@chakra-ui/react';
 import React, { useCallback } from 'react';
 
 import IconSvg from 'ui/shared/IconSvg';
@@ -32,13 +32,13 @@ export function StatsDropdownMenu<T extends string>({ items, selectedId, onSelec
           display="flex"
           alignItems="center"
         >
-          <Text
+          <chakra.span
             whiteSpace="nowrap"
             overflow="hidden"
             textOverflow="ellipsis"
           >
             { selectedCategory?.title }
-          </Text>
+          </chakra.span>
           <IconSvg transform="rotate(-90deg)" ml="auto" name="arrows/east-mini" w={ 5 } h={ 5 }/>
         </Box>
       </MenuButton>
diff --git a/ui/token/TokenProjectInfo.tsx b/ui/token/TokenProjectInfo.tsx
index 4aa71e47f2..33ba9a0868 100644
--- a/ui/token/TokenProjectInfo.tsx
+++ b/ui/token/TokenProjectInfo.tsx
@@ -27,7 +27,7 @@ const TokenProjectInfo = ({ data }: Props) => {
   if (isMobile) {
     return (
       <>
-        <TriggerButton onClick={ onToggle }/>
+        <TriggerButton onClick={ onToggle } isActive={ isOpen }/>
         <Modal isOpen={ isOpen } onClose={ onClose } size="full">
           <ModalContent>
             <ModalCloseButton/>
@@ -41,7 +41,7 @@ const TokenProjectInfo = ({ data }: Props) => {
   return (
     <Popover isOpen={ isOpen } onClose={ onClose } placement="bottom-start" isLazy>
       <PopoverTrigger>
-        <TriggerButton onClick={ onToggle }/>
+        <TriggerButton onClick={ onToggle } isActive={ isOpen }/>
       </PopoverTrigger>
       <PopoverContent w="500px">
         <PopoverBody px={ 6 } py={ 5 }>
diff --git a/ui/token/TokenProjectInfo/TriggerButton.tsx b/ui/token/TokenProjectInfo/TriggerButton.tsx
index 9a96e937d5..fa5a03f317 100644
--- a/ui/token/TokenProjectInfo/TriggerButton.tsx
+++ b/ui/token/TokenProjectInfo/TriggerButton.tsx
@@ -5,9 +5,10 @@ import IconSvg from 'ui/shared/IconSvg';
 
 interface Props {
   onClick: () => void;
+  isActive: boolean;
 }
 
-const TriggerButton = ({ onClick }: Props, ref: React.ForwardedRef<HTMLButtonElement>) => {
+const TriggerButton = ({ onClick, isActive }: Props, ref: React.ForwardedRef<HTMLButtonElement>) => {
   return (
     <Button
       ref={ ref }
@@ -15,6 +16,7 @@ const TriggerButton = ({ onClick }: Props, ref: React.ForwardedRef<HTMLButtonEle
       variant="outline"
       colorScheme="gray"
       onClick={ onClick }
+      isActive={ isActive }
       aria-label="Show project info"
       fontWeight={ 500 }
       lineHeight={ 6 }
diff --git a/ui/validators/ValidatorsFilter.tsx b/ui/validators/ValidatorsFilter.tsx
index 08ca7dce94..d0cf690c73 100644
--- a/ui/validators/ValidatorsFilter.tsx
+++ b/ui/validators/ValidatorsFilter.tsx
@@ -1,45 +1,31 @@
-import {
-  Menu,
-  MenuButton,
-  MenuList,
-  MenuOptionGroup,
-  MenuItemOption,
-  useDisclosure,
-} from '@chakra-ui/react';
 import React from 'react';
 
 import type { ValidatorsFilters } from 'types/api/validators';
 
-import FilterButton from 'ui/shared/filters/FilterButton';
+import PopoverFilterRadio from 'ui/shared/filters/PopoverFilterRadio';
+
+const OPTIONS = [
+  { value: 'all', label: 'All' },
+  { value: 'active', label: 'Active' },
+  { value: 'probation', label: 'Probation' },
+  { value: 'inactive', label: 'Inactive' },
+];
 
 interface Props {
-  isActive: boolean;
+  hasActiveFilter: boolean;
   defaultValue: ValidatorsFilters['state_filter'] | undefined;
   onChange: (nextValue: string | Array<string>) => void;
 }
 
-const ValidatorsFilter = ({ onChange, defaultValue, isActive }: Props) => {
-  const { isOpen, onToggle } = useDisclosure();
-
+const ValidatorsFilter = ({ onChange, defaultValue, hasActiveFilter }: Props) => {
   return (
-    <Menu>
-      <MenuButton>
-        <FilterButton
-          isActive={ isOpen || isActive }
-          appliedFiltersNum={ isActive ? 1 : 0 }
-          onClick={ onToggle }
-          as="div"
-        />
-      </MenuButton>
-      <MenuList zIndex="popover">
-        <MenuOptionGroup defaultValue={ defaultValue || 'all' } title="Status" type="radio" onChange={ onChange }>
-          <MenuItemOption value="all">All</MenuItemOption>
-          <MenuItemOption value="active">Active</MenuItemOption>
-          <MenuItemOption value="probation">Probation</MenuItemOption>
-          <MenuItemOption value="inactive">Inactive</MenuItemOption>
-        </MenuOptionGroup>
-      </MenuList>
-    </Menu>
+    <PopoverFilterRadio
+      name="validators_filter"
+      options={ OPTIONS }
+      onChange={ onChange }
+      hasActiveFilter={ hasActiveFilter }
+      defaultValue={ defaultValue || OPTIONS[0].value }
+    />
   );
 };
 
diff --git a/ui/verifiedContracts/VerifiedContractsFilter.tsx b/ui/verifiedContracts/VerifiedContractsFilter.tsx
index 36790c5260..7b8d9e6698 100644
--- a/ui/verifiedContracts/VerifiedContractsFilter.tsx
+++ b/ui/verifiedContracts/VerifiedContractsFilter.tsx
@@ -1,45 +1,31 @@
-import {
-  Menu,
-  MenuButton,
-  MenuList,
-  MenuOptionGroup,
-  MenuItemOption,
-  useDisclosure,
-} from '@chakra-ui/react';
 import React from 'react';
 
 import type { VerifiedContractsFilters } from 'types/api/contracts';
 
-import FilterButton from 'ui/shared/filters/FilterButton';
+import PopoverFilterRadio from 'ui/shared/filters/PopoverFilterRadio';
+
+const OPTIONS = [
+  { value: 'all', label: 'All' },
+  { value: 'solidity', label: 'Solidity' },
+  { value: 'vyper', label: 'Vyper' },
+  { value: 'yul', label: 'Yul' },
+];
 
 interface Props {
-  isActive: boolean;
+  hasActiveFilter: boolean;
   defaultValue: VerifiedContractsFilters['filter'] | undefined;
   onChange: (nextValue: string | Array<string>) => void;
 }
 
-const VerifiedContractsFilter = ({ onChange, defaultValue, isActive }: Props) => {
-  const { isOpen, onToggle } = useDisclosure();
-
+const VerifiedContractsFilter = ({ onChange, defaultValue, hasActiveFilter }: Props) => {
   return (
-    <Menu>
-      <MenuButton>
-        <FilterButton
-          isActive={ isOpen || isActive }
-          appliedFiltersNum={ isActive ? 1 : 0 }
-          onClick={ onToggle }
-          as="div"
-        />
-      </MenuButton>
-      <MenuList zIndex="popover">
-        <MenuOptionGroup defaultValue={ defaultValue || 'all' } title="Filter" type="radio" onChange={ onChange }>
-          <MenuItemOption value="all">All</MenuItemOption>
-          <MenuItemOption value="solidity">Solidity</MenuItemOption>
-          <MenuItemOption value="vyper">Vyper</MenuItemOption>
-          <MenuItemOption value="yul">Yul</MenuItemOption>
-        </MenuOptionGroup>
-      </MenuList>
-    </Menu>
+    <PopoverFilterRadio
+      name="verified_contracts_filter"
+      options={ OPTIONS }
+      onChange={ onChange }
+      hasActiveFilter={ hasActiveFilter }
+      defaultValue={ defaultValue || OPTIONS[0].value }
+    />
   );
 };