diff --git a/src/shared/components/dropdown-menu/dropdown-menu.module.css b/src/shared/components/dropdown-menu/dropdown-menu.module.css
index 889be23c2..598746303 100644
--- a/src/shared/components/dropdown-menu/dropdown-menu.module.css
+++ b/src/shared/components/dropdown-menu/dropdown-menu.module.css
@@ -6,7 +6,7 @@
     cursor: default;
 
     &:hover {
-        background: var(--theme-colors-background);
+        background: var(--theme-colors-surface);
     }
 }
 
@@ -18,7 +18,7 @@
     margin-right: var(--theme-spacing-md);
     margin-left: var(--theme-spacing-md);
     font-size: var(--theme-font-size-sm);
-    color: var(--theme-colors-surface-foreground);
+    color: var(--theme-colors-surfaceforeground);
 }
 
 .selected {
@@ -45,8 +45,8 @@
 
 .menu-dropdown {
     padding: var(--theme-spacing-xs);
-    color: var(--theme-colors-surface-foreground);
-    background: var(--theme-colors-surface);
+    color: var(--theme-colors-foreground);
+    background: var(--theme-colors-background);
     border: 1px solid var(--theme-colors-border);
     filter: drop-shadow(0 0 5px rgb(0 0 0 / 50%));
 }
diff --git a/src/shared/components/popover/popover.module.css b/src/shared/components/popover/popover.module.css
index 70a868178..5be2581b1 100644
--- a/src/shared/components/popover/popover.module.css
+++ b/src/shared/components/popover/popover.module.css
@@ -1,7 +1,7 @@
 .dropdown {
     padding: var(--theme-spacing-xs);
-    color: var(--theme-colors-surface-foreground);
-    background: var(--theme-colors-surface);
+    color: var(--theme-colors-foreground);
+    background: var(--theme-colors-background);
     border: 1px solid var(--theme-colors-border);
     filter: drop-shadow(0 0 5px rgb(0 0 0 / 50%));
 }
diff --git a/src/shared/components/popover/popover.tsx b/src/shared/components/popover/popover.tsx
index fd552c331..98d201c65 100644
--- a/src/shared/components/popover/popover.tsx
+++ b/src/shared/components/popover/popover.tsx
@@ -13,10 +13,12 @@ export interface PopoverProps extends MantinePopoverProps {}
 export const Popover = ({ children, ...props }: PopoverProps) => {
     return (
         <MantinePopover
+            arrowSize={10}
             classNames={{
                 dropdown: styles.dropdown,
             }}
             transitionProps={{ transition: 'fade' }}
+            withArrow
             withinPortal
             {...props}
         >