diff --git a/packages/keychain/src/components/ErrorAlert.tsx b/packages/keychain/src/components/ErrorAlert.tsx
index 21fdaee00..71188061a 100644
--- a/packages/keychain/src/components/ErrorAlert.tsx
+++ b/packages/keychain/src/components/ErrorAlert.tsx
@@ -4,6 +4,7 @@ import {
   CheckIcon,
   ErrorAlertIcon,
   ErrorAlertIconProps,
+  Button,
 } from "@cartridge/ui-next";
 import {
   Text,
@@ -16,7 +17,6 @@ import {
   Box,
   VStack,
   Link,
-  IconButton,
   Divider,
 } from "@chakra-ui/react";
 import { motion } from "framer-motion";
@@ -105,27 +105,22 @@ export function ErrorAlert({
             {description && (
               <AccordionPanel w="full" position="relative">
                 {copyText && (
-                  <IconButton
+                  <Button
                     size="icon"
-                    w={5}
-                    h={5}
-                    position="absolute"
-                    right={3}
-                    aria-label="Copy stacktrace"
-                    icon={
-                      copied ? (
-                        <CheckIcon size="xs" className="text-[black]" />
-                      ) : (
-                        <CopyIcon size="xs" className="text-[black]" />
-                      )
-                    }
+                    variant="icon"
+                    className="absolute right-3 w-5 h-5 bg-[rgba(0,0,0,0.1)]"
                     onClick={() => {
                       setCopied(true);
                       navigator.clipboard.writeText(copyText);
                     }}
-                  />
+                  >
+                    {copied ? (
+                      <CheckIcon size="xs" className="text-[black]" />
+                    ) : (
+                      <CopyIcon size="xs" className="text-[black]" />
+                    )}
+                  </Button>
                 )}
-
                 <Box
                   h="full"
                   maxH={200}
diff --git a/packages/keychain/src/components/layout/Container/Header/BackButton.tsx b/packages/keychain/src/components/layout/Container/Header/BackButton.tsx
index 4e84d2bcc..978ed06b5 100644
--- a/packages/keychain/src/components/layout/Container/Header/BackButton.tsx
+++ b/packages/keychain/src/components/layout/Container/Header/BackButton.tsx
@@ -1,6 +1,5 @@
-import { ArrowIcon } from "@cartridge/ui-next";
+import { ArrowIcon, Button } from "@cartridge/ui-next";
 import { isIframe } from "@cartridge/utils";
-import { IconButton } from "@chakra-ui/react";
 
 export function BackButton({ onClick }: { onClick?: () => void }) {
   if (!isIframe()) {
@@ -8,15 +7,8 @@ export function BackButton({ onClick }: { onClick?: () => void }) {
   }
 
   return (
-    <IconButton
-      aria-label="Go Back"
-      bg="solid.bg"
-      _hover={{
-        bg: "solid.bg",
-        opacity: 0.75,
-      }}
-      icon={<ArrowIcon variant="left" />}
-      onClick={onClick}
-    />
+    <Button variant="icon" size="icon" onClick={onClick}>
+      <ArrowIcon variant="left" />
+    </Button>
   );
 }
diff --git a/packages/keychain/src/components/layout/Container/Header/CloseButton.tsx b/packages/keychain/src/components/layout/Container/Header/CloseButton.tsx
index 103030660..b8b87eede 100644
--- a/packages/keychain/src/components/layout/Container/Header/CloseButton.tsx
+++ b/packages/keychain/src/components/layout/Container/Header/CloseButton.tsx
@@ -1,6 +1,5 @@
-import { TimesIcon } from "@cartridge/ui-next";
+import { TimesIcon, Button } from "@cartridge/ui-next";
 import { isIframe } from "@cartridge/utils";
-import { IconButton } from "@chakra-ui/react";
 import { useConnection } from "@/hooks/connection";
 import { useCallback } from "react";
 
@@ -24,14 +23,8 @@ export function CloseButton({ onClose }: { onClose?: () => void }) {
   }
 
   return (
-    <IconButton
-      aria-label="Close Controller"
-      bg="solid.bg"
-      _hover={{
-        bg: "hsl(var(solid.primary)/0.75)",
-      }}
-      icon={<TimesIcon />}
-      onClick={handleClose}
-    />
+    <Button variant="icon" size="icon" onClick={handleClose}>
+      <TimesIcon />
+    </Button>
   );
 }
diff --git a/packages/keychain/src/components/layout/Container/Header/SettingsButton.tsx b/packages/keychain/src/components/layout/Container/Header/SettingsButton.tsx
index ba962fd52..9b2e95f74 100644
--- a/packages/keychain/src/components/layout/Container/Header/SettingsButton.tsx
+++ b/packages/keychain/src/components/layout/Container/Header/SettingsButton.tsx
@@ -1,6 +1,5 @@
-import { DotsIcon } from "@cartridge/ui-next";
+import { Button, DotsIcon } from "@cartridge/ui-next";
 import { isIframe } from "@cartridge/utils";
-import { IconButton } from "@chakra-ui/react";
 
 export function SettingsButton({ onClick }: { onClick?: () => void }) {
   if (!isIframe()) {
@@ -8,15 +7,8 @@ export function SettingsButton({ onClick }: { onClick?: () => void }) {
   }
 
   return (
-    <IconButton
-      aria-label="Open Settings"
-      bg="solid.bg"
-      _hover={{
-        bg: "solid.bg",
-        opacity: 0.75,
-      }}
-      icon={<DotsIcon />}
-      onClick={onClick}
-    />
+    <Button variant="icon" size="icon" onClick={onClick}>
+      <DotsIcon />
+    </Button>
   );
 }
diff --git a/packages/keychain/src/components/session/CollapsibleRow.tsx b/packages/keychain/src/components/session/CollapsibleRow.tsx
deleted file mode 100644
index f9305f004..000000000
--- a/packages/keychain/src/components/session/CollapsibleRow.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { PropsWithChildren, useState } from "react";
-import {
-  Accordion,
-  AccordionContent,
-  AccordionItem,
-  AccordionTrigger,
-  CheckboxIcon,
-} from "@cartridge/ui-next";
-
-interface CollapsibleRowProps extends PropsWithChildren {
-  title: string;
-}
-
-export function CollapsibleRow({ title, children }: CollapsibleRowProps) {
-  const [value, setValue] = useState("");
-
-  return (
-    <Accordion type="single" collapsible value={value} onValueChange={setValue}>
-      <AccordionItem value={title} className="flex flex-col">
-        <AccordionTrigger hideIcon className="hover:bg-accent rounded-md">
-          <div className="flex items-center gap-1 py-2">
-            <CheckboxIcon variant={value ? "minus-line" : "plus-line"} />
-            <div>{title}</div>
-          </div>
-        </AccordionTrigger>
-
-        <AccordionContent className="ml-5 flex flex-col">
-          {children}
-        </AccordionContent>
-      </AccordionItem>
-    </Accordion>
-  );
-}
diff --git a/packages/keychain/src/components/session/MessageCard.tsx b/packages/keychain/src/components/session/MessageCard.tsx
index 4a25e14d9..0ce117c65 100644
--- a/packages/keychain/src/components/session/MessageCard.tsx
+++ b/packages/keychain/src/components/session/MessageCard.tsx
@@ -69,15 +69,15 @@ function MessageContent({ messages }: MessageContentProps) {
                 {/* Domain section */}
                 {Object.values(m.domain).filter((f) => typeof f !== "undefined")
                   .length > 0 && (
-                    <CollapsibleRow key="domain" title="domain">
-                      {m.domain.name && (
-                        <ValueRow
-                          values={[{ name: "name", value: m.domain.name }]}
-                        />
-                      )}
-                      {/* ... other domain fields ... */}
-                    </CollapsibleRow>
-                  )}
+                  <CollapsibleRow key="domain" title="domain">
+                    {m.domain.name && (
+                      <ValueRow
+                        values={[{ name: "name", value: m.domain.name }]}
+                      />
+                    )}
+                    {/* ... other domain fields ... */}
+                  </CollapsibleRow>
+                )}
 
                 <ValueRow
                   values={[{ name: "primaryType", value: m.primaryType }]}
@@ -94,13 +94,13 @@ function MessageContent({ messages }: MessageContentProps) {
                             { name: "type", value: t.type },
                             ...(["enum", "merkletree"].includes(t.name)
                               ? [
-                                {
-                                  name: "contains",
-                                  value: (
-                                    t as StarknetEnumType | StarknetMerkleType
-                                  ).contains,
-                                },
-                              ]
+                                  {
+                                    name: "contains",
+                                    value: (
+                                      t as StarknetEnumType | StarknetMerkleType
+                                    ).contains,
+                                  },
+                                ]
                               : []),
                           ]}
                         />
diff --git a/packages/ui-next/src/components/primitives/button.tsx b/packages/ui-next/src/components/primitives/button.tsx
index 980dd39ef..04bc49c19 100644
--- a/packages/ui-next/src/components/primitives/button.tsx
+++ b/packages/ui-next/src/components/primitives/button.tsx
@@ -19,7 +19,7 @@ const buttonVariants = cva(
           "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
         ghost: "hover:bg-accent hover:text-accent-foreground",
         link: "text-primary underline-offset-4 hover:underline",
-        icon: "bg-background text-foreground",
+        icon: "bg-background text-foreground hover:bg-background/60",
       },
       size: {
         default: "h-10 px-4 tracking-wide text-base",