diff --git a/apps/designer/app/designer/features/style-panel/shared/css-value-input/unit-select.tsx b/apps/designer/app/designer/features/style-panel/shared/css-value-input/unit-select.tsx
index aa8691fde8..6d2c6e412b 100644
--- a/apps/designer/app/designer/features/style-panel/shared/css-value-input/unit-select.tsx
+++ b/apps/designer/app/designer/features/style-panel/shared/css-value-input/unit-select.tsx
@@ -1,6 +1,15 @@
-import { Select } from "@webstudio-is/design-system";
-import { type Unit, type UnitValue, StyleValue } from "@webstudio-is/react-sdk";
 import { useState, useMemo } from "react";
+import { type Unit, type UnitValue, StyleValue } from "@webstudio-is/react-sdk";
+import * as SelectPrimitive from "@radix-ui/react-select";
+import {
+  styled,
+  SelectScrollUpButton,
+  SelectScrollDownButton,
+  SelectViewport,
+  SelectItem,
+  SelectContent,
+} from "@webstudio-is/design-system";
+import { ChevronDownIcon, ChevronUpIcon } from "@webstudio-is/icons";
 
 const unitRenderMap: Map<Unit, string> = new Map([
   ["px", "PX"],
@@ -38,19 +47,22 @@ export const useUnitSelect = ({
     () => units.map((unit) => unitRenderMap.get(unit) ?? unit),
     [units]
   );
-  if (value === undefined) return [isOpen, null];
 
-  const element = (
-    <Select
+  const renderValue = value && unitRenderMap.get(value.unit);
+
+  if (value == undefined || renderValue === undefined) {
+    return [isOpen, null];
+  }
+
+  const select = (
+    <UnitSelect
       {...props}
-      value={unitRenderMap.get(value.unit)}
+      value={renderValue}
       options={renderUnits}
-      suffix={null}
-      ghost
       open={isOpen}
       onOpenChange={setIsOpen}
-      onChange={(item) => {
-        const unit = renderUnitMap.get(item);
+      onChange={(option) => {
+        const unit = renderUnitMap.get(option);
         if (unit === undefined) return;
         onChange?.({
           ...value,
@@ -60,5 +72,70 @@ export const useUnitSelect = ({
     />
   );
 
-  return [isOpen, element];
+  return [isOpen, select];
+};
+
+const StyledTrigger = styled(SelectPrimitive.SelectTrigger, {
+  all: "unset",
+  height: "$5",
+  px: 3,
+  borderRadius: 2,
+  display: "inline-flex",
+  alignItems: "center",
+  color: "$hiContrast",
+  "&:focus": {
+    backgroundColor: "$blue10",
+    color: "$loContrast",
+  },
+  "&:hover": {
+    backgroundColor: "$slate5",
+  },
+});
+
+type UnitSelectProps = {
+  options: Array<string>;
+  value: string;
+  onChange: (value: string) => void;
+  onOpenChange: (open: boolean) => void;
+  onCloseAutoFocus: (event: Event) => void;
+  open: boolean;
+};
+
+const UnitSelect = ({
+  options,
+  value,
+  onChange,
+  onOpenChange,
+  onCloseAutoFocus,
+  open,
+}: UnitSelectProps) => {
+  return (
+    <SelectPrimitive.Root
+      value={value}
+      onValueChange={onChange}
+      onOpenChange={onOpenChange}
+      open={open}
+    >
+      <StyledTrigger>
+        <SelectPrimitive.Value>{value}</SelectPrimitive.Value>
+      </StyledTrigger>
+      <SelectPrimitive.Portal>
+        <SelectContent onCloseAutoFocus={onCloseAutoFocus}>
+          <SelectScrollUpButton>
+            <ChevronUpIcon />
+          </SelectScrollUpButton>
+          <SelectViewport>
+            {options.map((option) => (
+              <SelectItem key={option} value={option} textValue={option}>
+                {option}
+              </SelectItem>
+            ))}
+          </SelectViewport>
+          <SelectScrollDownButton>
+            <ChevronDownIcon />
+          </SelectScrollDownButton>
+        </SelectContent>
+      </SelectPrimitive.Portal>
+    </SelectPrimitive.Root>
+  );
 };
diff --git a/packages/design-system/src/components/select.tsx b/packages/design-system/src/components/select.tsx
index d406542376..ec5e050d0c 100644
--- a/packages/design-system/src/components/select.tsx
+++ b/packages/design-system/src/components/select.tsx
@@ -27,6 +27,7 @@ const StyledTrigger = styled(SelectPrimitive.SelectTrigger, {
     boxShadow:
       "inset 0px 0px 0px 1px $colors$blue8, 0px 0px 0px 1px $colors$blue8",
   },
+  paddingRight: "$1",
 
   variants: {
     ghost: {
@@ -40,14 +41,6 @@ const StyledTrigger = styled(SelectPrimitive.SelectTrigger, {
         width: "100%",
       },
     },
-    withSuffix: {
-      true: {
-        paddingRight: "$1",
-      },
-    },
-  },
-  defaultVariants: {
-    withSuffix: true,
   },
 });
 
@@ -59,7 +52,7 @@ const StyledIcon = styled(SelectPrimitive.Icon, {
   padding: "calc($space$1 / 2)",
 });
 
-const StyledContent = styled(SelectPrimitive.Content, {
+export const SelectContent = styled(SelectPrimitive.Content, {
   overflow: "hidden",
   backgroundColor: "$colors$slate4",
   borderRadius: "$1",
@@ -67,7 +60,7 @@ const StyledContent = styled(SelectPrimitive.Content, {
     "0px 2px 7px rgba(0, 0, 0, 0.1), 0px 5px 17px rgba(0, 0, 0, 0.15), inset 0 0 1px 1px $colors$slate1, 0 0 0 1px $colors$slate8",
 });
 
-const StyledViewport = styled(SelectPrimitive.Viewport, {
+export const SelectViewport = styled(SelectPrimitive.Viewport, {
   py: "$1",
 });
 
@@ -103,12 +96,12 @@ const scrollButtonStyles = {
   cursor: "default",
 };
 
-const SelectScrollUpButton = styled(
+export const SelectScrollUpButton = styled(
   SelectPrimitive.ScrollUpButton,
   scrollButtonStyles
 );
 
-const SelectScrollDownButton = styled(
+export const SelectScrollDownButton = styled(
   SelectPrimitive.ScrollDownButton,
   scrollButtonStyles
 );
@@ -134,13 +127,7 @@ const SelectItemBase = (
 type SelectItemProps = SelectPrimitive.SelectItemProps & {
   children: ReactNode;
 };
-const SelectItem = React.forwardRef(SelectItemBase);
-
-const defaultSuffix = (
-  <StyledIcon>
-    <ChevronDownIcon />
-  </StyledIcon>
-);
+export const SelectItem = React.forwardRef(SelectItemBase);
 
 export type SelectOption = string;
 
@@ -154,10 +141,8 @@ export type SelectProps<Option = SelectOption> = Omit<
   onChange?: (option: Option) => void;
   open?: boolean;
   onOpenChange?: (open: boolean) => void;
-  onCloseAutoFocus?: (event: Event) => void;
   placeholder?: string;
   getLabel?: (option: Option) => string | undefined;
-  suffix?: JSX.Element | null;
 };
 
 const SelectBase = (
@@ -168,11 +153,9 @@ const SelectBase = (
     placeholder = "Select an option",
     onChange,
     onOpenChange,
-    onCloseAutoFocus,
     open,
     getLabel = (option) => option,
     name,
-    suffix = defaultSuffix,
     ...props
   }: SelectProps,
   forwardedRef: Ref<HTMLButtonElement>
@@ -186,28 +169,30 @@ const SelectBase = (
       open={open}
       onOpenChange={onOpenChange}
     >
-      <StyledTrigger ref={forwardedRef} withSuffix={Boolean(suffix)} {...props}>
+      <StyledTrigger ref={forwardedRef} {...props}>
         <SelectPrimitive.Value>
           {value ? getLabel(value) : placeholder}
         </SelectPrimitive.Value>
-        {suffix}
+        <StyledIcon>
+          <ChevronDownIcon />
+        </StyledIcon>
       </StyledTrigger>
       <SelectPrimitive.Portal>
-        <StyledContent onCloseAutoFocus={onCloseAutoFocus}>
+        <SelectContent>
           <SelectScrollUpButton>
             <ChevronUpIcon />
           </SelectScrollUpButton>
-          <StyledViewport>
+          <SelectViewport>
             {options.map((option) => (
               <SelectItem key={option} value={option} textValue={option}>
                 {getLabel(option)}
               </SelectItem>
             ))}
-          </StyledViewport>
+          </SelectViewport>
           <SelectScrollDownButton>
             <ChevronDownIcon />
           </SelectScrollDownButton>
-        </StyledContent>
+        </SelectContent>
       </SelectPrimitive.Portal>
     </SelectPrimitive.Root>
   );