diff --git a/assets/icons/carousel_stroke2_corner1_rounded.svg b/assets/icons/carousel_stroke2_corner1_rounded.svg
new file mode 100644
index 0000000000..b59fd096d8
--- /dev/null
+++ b/assets/icons/carousel_stroke2_corner1_rounded.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M18 7v10h2V7h-2ZM4 17h2V7H4v10ZM8 5v14h8V5H8Zm12 0a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2h-2a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2H4a2 2 0 0 1-2-2V7a2 2 0 0 1 2-2h2a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2h2Z"/></svg>
diff --git a/assets/icons/layoutGrid_stroke2_corner0_rounded.svg b/assets/icons/layoutGrid_stroke2_corner0_rounded.svg
new file mode 100644
index 0000000000..8c2c9e2c89
--- /dev/null
+++ b/assets/icons/layoutGrid_stroke2_corner0_rounded.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><path fill="#000" d="M10 13a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1v-6a1 1 0 0 1 1-1h6Zm10 0a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1h-6a1 1 0 0 1-1-1v-6a1 1 0 0 1 1-1h6Zm-5 6h4v-4h-4v4ZM5 19h4v-4H5v4Zm5-16a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h6Zm10 0a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1h-6a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h6Zm-5 6h4V5h-4v4ZM5 9h4V5H5v4Z"/></svg>
diff --git a/src/components/icons/Carousel.tsx b/src/components/icons/Carousel.tsx
index 10db8858cf..a31ff4886e 100644
--- a/src/components/icons/Carousel.tsx
+++ b/src/components/icons/Carousel.tsx
@@ -1,5 +1,5 @@
 import {createSinglePathSVG} from './TEMPLATE'
 
 export const Carousel_Stroke2_Corner0_Rounded = createSinglePathSVG({
-  path: 'M8 5a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H9a1 1 0 0 1-1-1V5Zm2 1v12h4V6h-4ZM3 6a1 1 0 0 1 2 0v12a1 1 0 1 1-2 0V6Zm16 0a1 1 0 1 1 2 0v12a1 1 0 1 1-2 0V6Z',
+  path: 'M18 7v10h2V7h-2ZM4 17h2V7H4v10ZM8 5v14h8V5H8Zm12 0a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2h-2a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2H4a2 2 0 0 1-2-2V7a2 2 0 0 1 2-2h2a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2h2Z',
 })
diff --git a/src/components/icons/GridSquare.tsx b/src/components/icons/GridSquare.tsx
deleted file mode 100644
index a7e6cb6656..0000000000
--- a/src/components/icons/GridSquare.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import {createSinglePathSVG} from './TEMPLATE'
-
-export const GridSquare2x2_Stroke2_Corner0_Rounded = createSinglePathSVG({
-  path: 'M3 4a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V4Zm2 1v4h4V5H5ZM13 4a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1h-6a1 1 0 0 1-1-1V4Zm2 1v4h4V5h-4ZM3 14a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1v-6Zm2 1v4h4v-4H5Zm8-1a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1h-6a1 1 0 0 1-1-1v-6Zm2 1v4h4v-4h-4Z',
-})
diff --git a/src/components/icons/LayouGrid.tsx b/src/components/icons/LayouGrid.tsx
new file mode 100644
index 0000000000..4b7b64217a
--- /dev/null
+++ b/src/components/icons/LayouGrid.tsx
@@ -0,0 +1,5 @@
+import {createSinglePathSVG} from './TEMPLATE'
+
+export const LayoutGrid_Stroke2_Corner0_Rounded = createSinglePathSVG({
+  path: 'M10 13a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1v-6a1 1 0 0 1 1-1h6Zm10 0a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1h-6a1 1 0 0 1-1-1v-6a1 1 0 0 1 1-1h6Zm-5 6h4v-4h-4v4ZM5 19h4v-4H5v4Zm5-16a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h6Zm10 0a1 1 0 0 1 1 1v6a1 1 0 0 1-1 1h-6a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h6Zm-5 6h4V5h-4v4ZM5 9h4V5H5v4Z',
+})
diff --git a/src/view/com/composer/photos/ImageLayoutBtn.tsx b/src/view/com/composer/photos/ImageLayoutBtn.tsx
index 2c53998dc8..4ff9061339 100644
--- a/src/view/com/composer/photos/ImageLayoutBtn.tsx
+++ b/src/view/com/composer/photos/ImageLayoutBtn.tsx
@@ -3,7 +3,7 @@ import {Trans, useLingui} from '@lingui/react/macro'
 
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import {Carousel_Stroke2_Corner0_Rounded as CarouselIcon} from '#/components/icons/Carousel'
-import {GridSquare2x2_Stroke2_Corner0_Rounded as GridIcon} from '#/components/icons/GridSquare'
+import {LayoutGrid_Stroke2_Corner0_Rounded as GridIcon} from '#/components/icons/LayouGrid'
 import * as Tooltip from '#/components/Tooltip'
 import {Text} from '#/components/Typography'
 import {useAnalytics} from '#/analytics'
@@ -90,10 +90,7 @@ export function ImageLayoutBtn({
       </Tooltip.Target>
       <Tooltip.TextBubble>
         <Text>
-          <Trans>
-            You can now choose to display your images in the new carousel
-            format.
-          </Trans>
+          <Trans>Choose how your images are displayed</Trans>
         </Text>
       </Tooltip.TextBubble>
     </Tooltip.Outer>