diff --git a/packages/frosted-ui/src/components/avatar.tsx b/packages/frosted-ui/src/components/avatar.tsx
index 92ae6a7d..42155e00 100644
--- a/packages/frosted-ui/src/components/avatar.tsx
+++ b/packages/frosted-ui/src/components/avatar.tsx
@@ -44,10 +44,16 @@ const Avatar = React.forwardRef<AvatarElement, AvatarProps>(
     const [status, setStatus] = React.useState<ImageStatus>('idle');
     const dataStatus: ImageStatus = imageProps.src ? status : 'idle';
 
-    const fallback =
-      typeof fallbackProp === 'string'
-        ? getInitials(fallbackProp)
-        : fallbackProp;
+    const fallback = React.useMemo(() => {
+      if (typeof fallbackProp !== 'string') return fallbackProp;
+      try {
+        return getInitials(fallbackProp);
+      } catch (error) {
+        console.error('Error generating initials:', error);
+        return fallbackProp;
+      }
+    }, [fallbackProp]);
+
     return (
       <AvatarPrimitive.Root
         data-accent-color={color}
diff --git a/packages/frosted-ui/src/components/base-button.css b/packages/frosted-ui/src/components/base-button.css
index 4b36a74e..8d5f173e 100644
--- a/packages/frosted-ui/src/components/base-button.css
+++ b/packages/frosted-ui/src/components/base-button.css
@@ -164,13 +164,6 @@
   position: relative;
   background-color: var(--accent-9);
   color: var(--accent-9-contrast);
-  &::after {
-    content: '';
-    position: absolute;
-    inset: 0;
-    border-radius: inherit;
-    border: 1px solid var(--black-a2);
-  }
 
   @media (hover: hover) {
     &:where(:hover) {