diff --git a/apps/storybook/docs-components/CodeSnippet/CodeSnippet.module.css b/apps/storybook/docs-components/CodeSnippet/CodeSnippet.module.css
index c14a0acd12..06fcf127cc 100644
--- a/apps/storybook/docs-components/CodeSnippet/CodeSnippet.module.css
+++ b/apps/storybook/docs-components/CodeSnippet/CodeSnippet.module.css
@@ -7,19 +7,8 @@
   height: fit-content;
 }
 
-.copyContainer {
-  position: sticky;
-  top: 0;
-  left: 0;
-  height: calc(100% - 1px);
-  width: calc(100% - 1px);
-  float: left;
-  margin-right: -100%;
-  pointer-events: none;
-}
-
-.icon {
+.copyButton {
   position: absolute;
-  top: var(--ds-spacing-4);
-  right: var(--ds-spacing-4);
+  top: var(--ds-spacing-2);
+  right: var(--ds-spacing-2);
 }
diff --git a/apps/storybook/docs-components/CodeSnippet/CodeSnippet.tsx b/apps/storybook/docs-components/CodeSnippet/CodeSnippet.tsx
index 4d7b124080..e5af2c6c78 100644
--- a/apps/storybook/docs-components/CodeSnippet/CodeSnippet.tsx
+++ b/apps/storybook/docs-components/CodeSnippet/CodeSnippet.tsx
@@ -72,7 +72,7 @@ const CodeSnippet = ({
             <Button
               onMouseEnter={() => setToolTipText('Kopier')}
               onClick={() => onButtonClick()}
-              className={classes.icon}
+              className={classes.copyButton}
               title='Kopier'
               icon
               color='neutral'
diff --git a/apps/theme/components/ColorPicker/ColorPicker.tsx b/apps/theme/components/ColorPicker/ColorPicker.tsx
index 6086325175..59ee4684c4 100644
--- a/apps/theme/components/ColorPicker/ColorPicker.tsx
+++ b/apps/theme/components/ColorPicker/ColorPicker.tsx
@@ -43,7 +43,7 @@ export const ColorPicker = ({
   const getStatus = () => {
     return (
       <div>
-        <Popover
+        <Popover.Root
           onOpenChange={function Ya() {}}
           placement='top'
           size='sm'
@@ -90,7 +90,7 @@ export const ColorPicker = ({
               )}
             </div>
           </Popover.Content>
-        </Popover>
+        </Popover.Root>
       </div>
     );
   };