diff --git a/src/app/features/settings/account/ProfileDecoration.tsx b/src/app/features/settings/account/ProfileDecoration.tsx
index ab8e7fb87..f5203c734 100644
--- a/src/app/features/settings/account/ProfileDecoration.tsx
+++ b/src/app/features/settings/account/ProfileDecoration.tsx
@@ -220,26 +220,27 @@ export function ProfileDecoration() {
         )}
 
         {/* Category grid */}
-        <Box
-          direction="Column"
-          gap="300"
+        <div
           style={{
             maxHeight: 480,
             overflowY: 'auto',
+            overflowX: 'hidden',
             paddingRight: 4,
+            display: 'flex',
+            flexDirection: 'column',
+            gap: 24,
           }}
         >
           {DECORATION_CATEGORIES.map((category) => (
-            <Box key={category.id} direction="Column" gap="200">
+            <div key={category.id} style={{ display: 'flex', flexDirection: 'column', gap: 10 }}>
               <Text size="L400" style={{ opacity: 0.7 }}>
                 {category.label}
               </Text>
               <div
                 style={{
-                  display: 'flex',
-                  flexWrap: 'wrap',
-                  gap: 16,
-                  padding: 4,
+                  display: 'grid',
+                  gridTemplateColumns: `repeat(auto-fill, ${CELL_SIZE}px)`,
+                  gap: 20,
                 }}
               >
                 {category.decorations.map((d) => (
@@ -252,9 +253,9 @@ export function ProfileDecoration() {
                   />
                 ))}
               </div>
-            </Box>
+            </div>
           ))}
-        </Box>
+        </div>
       </Box>
     </SettingTile>
   );