diff --git a/.changeset/fix-dropdown-icon-gap.md b/.changeset/fix-dropdown-icon-gap.md
new file mode 100644
index 0000000000..2114572cf2
--- /dev/null
+++ b/.changeset/fix-dropdown-icon-gap.md
@@ -0,0 +1,6 @@
+---
+"@cloudoperators/juno-ui-components": patch
+---
+
+Fix dropdown icon right-gap in ComboBox and Select components to match Figma design specs.
+Fix input text overlapping toggle button and valid/invalid icons by adding dynamic right padding.
diff --git a/packages/ui-components/src/components/ComboBox/ComboBox.component.tsx b/packages/ui-components/src/components/ComboBox/ComboBox.component.tsx
index de4401322f..dec923dd97 100644
--- a/packages/ui-components/src/components/ComboBox/ComboBox.component.tsx
+++ b/packages/ui-components/src/components/ComboBox/ComboBox.component.tsx
@@ -57,7 +57,7 @@ const inputStyles = `
   jn:text-base
   jn:leading-4
   jn:w-full
-  jn:px-4
+  jn:pl-4
   jn:h-textinput
   jn:text-left
   jn:overflow-hidden
@@ -99,12 +99,12 @@ const buttonStyles = `
   jn:absolute
   jn:top-0
   jn:right-0
+  jn:pr-2
   jn:h-textinput
-  jn:w-6
-  jn:h-4
+  jn:w-8
   jn:border-l-0
-  jn:border-y-[1px]
-  jn:border-r-[1px]
+  jn:border-y
+  jn:border-r
   jn:rounded-tr
   jn:rounded-br
   jn:appearance-none
@@ -141,7 +141,7 @@ const menuStyles = `
 const iconContainerStyles = `
   jn:absolute
   jn:top-[.4rem]
-  jn:right-6
+  jn:right-8
 `
 
 const centeredIconStyles = `
@@ -454,7 +454,7 @@ export const ComboBox = ({
                   ${disabled ? disabledInputStyles : ""}
                   ${isInvalid ? "juno-combobox-invalid " + invalidStyles : ""} 
                   ${isValid ? "juno-combobox-valid " + validStyles : ""}  
-                  ${isValid || isInvalid ? "" : defaultBorderStyles} 
+                  ${isValid || isInvalid ? "jn:pr-16" : "jn:pr-8 " + defaultBorderStyles}
                   ${isLoading ? "juno-combobox-loading jn:cursor-not-allowed" : ""}
                   ${hasError ? "juno-combobox-error jn:cursor-not-allowed" : ""}
                   ${className}
@@ -489,12 +489,12 @@ export const ComboBox = ({
                   {!hasError && !isLoading ? (
                     <ComboboxButton
                       className={`
-                        juno-combobox-toggle 
+                        juno-combobox-toggle
                         ${buttonStyles}
                         ${disabled ? disabledButtonStyles : ""}
                         ${isInvalid ? "juno-combobox-toggle-invalid " + invalidButtonStyles : ""} 
                         ${isValid ? "juno-combobox-toggle-valid " + validButtonStyles : ""}  
-                        ${isValid || isInvalid ? "" : defaultButtonStyles} 
+                        ${isValid || isInvalid ? "" : defaultButtonStyles}
                       `}
                     >
                       <Icon icon={isOpen ? "expandLess" : "expandMore"} />
diff --git a/packages/ui-components/src/components/DataGridToolbar/DataGridToolbar.stories.tsx b/packages/ui-components/src/components/DataGridToolbar/DataGridToolbar.stories.tsx
index 437a4f8245..83060798ef 100644
--- a/packages/ui-components/src/components/DataGridToolbar/DataGridToolbar.stories.tsx
+++ b/packages/ui-components/src/components/DataGridToolbar/DataGridToolbar.stories.tsx
@@ -15,6 +15,7 @@ import { Button } from "../Button"
 import { NativeSelectOption } from "../NativeSelectOption"
 import { NativeSelect } from "../NativeSelect"
 import { InputGroup } from "../InputGroup"
+import { PortalProvider } from "../PortalProvider"
 
 const meta: Meta<typeof DataGridToolbar> = {
   title: "Components/DataGrid/DataGridToolbar",
@@ -49,6 +50,13 @@ export const Default: Story = {
 }
 
 export const ComplexCustomLayout: Story = {
+  decorators: [
+    (Story) => (
+      <PortalProvider>
+        <Story />
+      </PortalProvider>
+    ),
+  ],
   render: (args: DataGridToolbarProps) => (
     <DataGridToolbar {...args}>
       <Stack direction="horizontal" distribution="between">
diff --git a/packages/ui-components/src/components/Select/Select.component.tsx b/packages/ui-components/src/components/Select/Select.component.tsx
index 6cd4bc1cc9..5acf8f97d5 100644
--- a/packages/ui-components/src/components/Select/Select.component.tsx
+++ b/packages/ui-components/src/components/Select/Select.component.tsx
@@ -37,7 +37,8 @@ const toggleStyles = `
   jn:h-[2.375rem]
   jn:inline-flex
   jn:items-center
-  jn:px-4
+  jn:pl-4
+  jn:pr-2
   jn:rounded-3px
   jn:select-none
   jn:text-base