diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-icon-asset-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-icon-asset-and-actions-button-1-snap.png
similarity index 100%
rename from src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-icon-asset-1-snap.png
rename to src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-icon-asset-and-actions-button-1-snap.png
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-icon-asset-and-actions-button-and-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-icon-asset-and-actions-button-and-link-1-snap.png
new file mode 100644
index 0000000000..d01b11e07a
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-icon-asset-and-actions-button-and-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-icon-asset-and-actions-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-icon-asset-and-actions-link-1-snap.png
new file mode 100644
index 0000000000..e66df7dc02
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-icon-asset-and-actions-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-icon-asset-and-actions-none-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-icon-asset-and-actions-none-1-snap.png
new file mode 100644
index 0000000000..98ab1f28e3
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-icon-asset-and-actions-none-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-image-asset-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-image-asset-and-actions-button-1-snap.png
similarity index 100%
rename from src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-image-asset-1-snap.png
rename to src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-image-asset-and-actions-button-1-snap.png
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-image-asset-and-actions-button-and-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-image-asset-and-actions-button-and-link-1-snap.png
new file mode 100644
index 0000000000..a62cd61774
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-image-asset-and-actions-button-and-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-image-asset-and-actions-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-image-asset-and-actions-link-1-snap.png
new file mode 100644
index 0000000000..256e9f2156
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-image-asset-and-actions-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-image-asset-and-actions-none-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-image-asset-and-actions-none-1-snap.png
new file mode 100644
index 0000000000..bab127c885
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-image-asset-and-actions-none-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-img-asset-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-img-asset-and-actions-button-1-snap.png
similarity index 100%
rename from src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-img-asset-1-snap.png
rename to src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-img-asset-and-actions-button-1-snap.png
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-img-asset-and-actions-button-and-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-img-asset-and-actions-button-and-link-1-snap.png
new file mode 100644
index 0000000000..a62cd61774
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-img-asset-and-actions-button-and-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-img-asset-and-actions-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-img-asset-and-actions-link-1-snap.png
new file mode 100644
index 0000000000..256e9f2156
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-img-asset-and-actions-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-img-asset-and-actions-none-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-img-asset-and-actions-none-1-snap.png
new file mode 100644
index 0000000000..bab127c885
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-img-asset-and-actions-none-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-small-image-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-small-image-1-snap.png
index 5245dc2ff4..e670346fa3 100644
Binary files a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-small-image-1-snap.png and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-desktop-with-small-image-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-icon-asset-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-icon-asset-and-actions-button-1-snap.png
similarity index 100%
rename from src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-icon-asset-1-snap.png
rename to src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-icon-asset-and-actions-button-1-snap.png
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-icon-asset-and-actions-button-and-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-icon-asset-and-actions-button-and-link-1-snap.png
new file mode 100644
index 0000000000..e31799bd68
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-icon-asset-and-actions-button-and-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-icon-asset-and-actions-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-icon-asset-and-actions-link-1-snap.png
new file mode 100644
index 0000000000..f7f3ee3412
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-icon-asset-and-actions-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-icon-asset-and-actions-none-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-icon-asset-and-actions-none-1-snap.png
new file mode 100644
index 0000000000..be5da587a9
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-icon-asset-and-actions-none-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-image-asset-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-image-asset-and-actions-button-1-snap.png
similarity index 100%
rename from src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-image-asset-1-snap.png
rename to src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-image-asset-and-actions-button-1-snap.png
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-image-asset-and-actions-button-and-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-image-asset-and-actions-button-and-link-1-snap.png
new file mode 100644
index 0000000000..def3c83c57
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-image-asset-and-actions-button-and-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-image-asset-and-actions-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-image-asset-and-actions-link-1-snap.png
new file mode 100644
index 0000000000..3007e23d87
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-image-asset-and-actions-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-image-asset-and-actions-none-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-image-asset-and-actions-none-1-snap.png
new file mode 100644
index 0000000000..3c3d88586f
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-image-asset-and-actions-none-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-img-asset-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-img-asset-and-actions-button-1-snap.png
similarity index 100%
rename from src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-img-asset-1-snap.png
rename to src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-img-asset-and-actions-button-1-snap.png
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-img-asset-and-actions-button-and-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-img-asset-and-actions-button-and-link-1-snap.png
new file mode 100644
index 0000000000..def3c83c57
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-img-asset-and-actions-button-and-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-img-asset-and-actions-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-img-asset-and-actions-link-1-snap.png
new file mode 100644
index 0000000000..3007e23d87
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-img-asset-and-actions-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-img-asset-and-actions-none-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-img-asset-and-actions-none-1-snap.png
new file mode 100644
index 0000000000..3c3d88586f
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-img-asset-and-actions-none-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-small-image-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-small-image-1-snap.png
index 2b4ab2d130..13c97d757c 100644
Binary files a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-small-image-1-snap.png and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-mobile-ios-with-small-image-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-icon-asset-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-icon-asset-and-actions-button-1-snap.png
similarity index 100%
rename from src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-icon-asset-1-snap.png
rename to src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-icon-asset-and-actions-button-1-snap.png
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-icon-asset-and-actions-button-and-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-icon-asset-and-actions-button-and-link-1-snap.png
new file mode 100644
index 0000000000..8853fd3486
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-icon-asset-and-actions-button-and-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-icon-asset-and-actions-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-icon-asset-and-actions-link-1-snap.png
new file mode 100644
index 0000000000..634ba843f6
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-icon-asset-and-actions-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-icon-asset-and-actions-none-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-icon-asset-and-actions-none-1-snap.png
new file mode 100644
index 0000000000..2c482d1c16
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-icon-asset-and-actions-none-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-image-asset-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-image-asset-and-actions-button-1-snap.png
similarity index 100%
rename from src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-image-asset-1-snap.png
rename to src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-image-asset-and-actions-button-1-snap.png
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-image-asset-and-actions-button-and-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-image-asset-and-actions-button-and-link-1-snap.png
new file mode 100644
index 0000000000..3a2d987303
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-image-asset-and-actions-button-and-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-image-asset-and-actions-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-image-asset-and-actions-link-1-snap.png
new file mode 100644
index 0000000000..3d7c6a5b61
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-image-asset-and-actions-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-image-asset-and-actions-none-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-image-asset-and-actions-none-1-snap.png
new file mode 100644
index 0000000000..11d750f315
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-image-asset-and-actions-none-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-img-asset-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-img-asset-and-actions-button-1-snap.png
similarity index 100%
rename from src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-img-asset-1-snap.png
rename to src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-img-asset-and-actions-button-1-snap.png
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-img-asset-and-actions-button-and-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-img-asset-and-actions-button-and-link-1-snap.png
new file mode 100644
index 0000000000..3a2d987303
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-img-asset-and-actions-button-and-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-img-asset-and-actions-link-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-img-asset-and-actions-link-1-snap.png
new file mode 100644
index 0000000000..3d7c6a5b61
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-img-asset-and-actions-link-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-img-asset-and-actions-none-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-img-asset-and-actions-none-1-snap.png
new file mode 100644
index 0000000000..11d750f315
Binary files /dev/null and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-img-asset-and-actions-none-1-snap.png differ
diff --git a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-small-image-1-snap.png b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-small-image-1-snap.png
index d6d9d2454e..d4c79acd52 100644
Binary files a/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-small-image-1-snap.png and b/src/__screenshot_tests__/__image_snapshots__/empty-state-screenshot-test-tsx-empty-state-in-tablet-with-small-image-1-snap.png differ
diff --git a/src/__screenshot_tests__/empty-state-screenshot-test.tsx b/src/__screenshot_tests__/empty-state-screenshot-test.tsx
index 76efeec925..ebb9c46c6b 100644
--- a/src/__screenshot_tests__/empty-state-screenshot-test.tsx
+++ b/src/__screenshot_tests__/empty-state-screenshot-test.tsx
@@ -4,11 +4,14 @@ import type {Device} from '../test-utils';
 
 const devices: Array<Device> = ['MOBILE_IOS', 'TABLET', 'DESKTOP'];
 const assets = ['Icon', 'Image', 'img'];
+const actions = ['button and link', 'button', 'link', 'none'];
 const createCases = () => {
     const cases = [];
     for (const device of devices) {
         for (const asset of assets) {
-            cases.push([device, asset]);
+            for (const action of actions) {
+                cases.push([device, asset, action]);
+            }
         }
     }
     return cases;
@@ -26,18 +29,21 @@ test.each(devices)('EmptyState in %s with image', async (device) => {
     expect(image).toMatchImageSnapshot();
 });
 
-test.each(createCases())('EmptyState in %s with %s asset', async (device, asset) => {
-    await openStoryPage({
-        id: 'patterns-empty-states-emptystate--with-icon',
-        device: device as Device,
-        args: {asset},
-    });
+test.each(createCases())(
+    'EmptyState in %s with %s asset and actions = %s',
+    async (device, asset, actions) => {
+        await openStoryPage({
+            id: 'patterns-empty-states-emptystate--with-icon',
+            device: device as Device,
+            args: {asset, actions},
+        });
 
-    const emptyState = await screen.findByTestId('empty-state-with-icon');
-    const image = await emptyState.screenshot();
+        const emptyState = await screen.findByTestId('empty-state-with-icon');
+        const image = await emptyState.screenshot();
 
-    expect(image).toMatchImageSnapshot();
-});
+        expect(image).toMatchImageSnapshot();
+    }
+);
 
 test.each(devices)('EmptyState in %s with small image', async (device) => {
     await openStoryPage({
diff --git a/src/__stories__/empty-state-story.tsx b/src/__stories__/empty-state-story.tsx
index ff6c8b92ed..6e558aa404 100644
--- a/src/__stories__/empty-state-story.tsx
+++ b/src/__stories__/empty-state-story.tsx
@@ -9,29 +9,44 @@ export default {
         fullScreen: true,
     },
     argTypes: {
-        asset: {
-            options: ['Icon', 'Image', 'img'],
+        actions: {
+            options: ['button and link', 'button', 'link', 'none'],
             control: {type: 'select'},
         },
     },
+    args: {
+        actions: 'button and link',
+    },
 };
 
-type Args = {asset: string};
+interface Args {
+    actions: 'button and link' | 'button' | 'link' | 'none';
+}
 
-export const WithImage: StoryComponent = () => (
+export const WithImage: StoryComponent<Args> = ({actions}) => (
     <div data-testid="empty-state-with-image">
         <EmptyState
             largeImageUrl={emptyStateImg}
             title="Your cart is empty"
             description="Check our marketplaces and find something for you. Check our marketplaces and find something"
-            button={<ButtonPrimary onPress={() => {}}>Explore marketplace</ButtonPrimary>}
-            buttonLink={<ButtonLink onPress={() => {}}>More info</ButtonLink>}
+            button={
+                actions.includes('button') ? (
+                    <ButtonPrimary onPress={() => {}}>Explore marketplace</ButtonPrimary>
+                ) : undefined
+            }
+            buttonLink={
+                actions.includes('link') ? <ButtonLink onPress={() => {}}>More info</ButtonLink> : undefined
+            }
         />
     </div>
 );
 WithImage.storyName = 'With image';
 
-export const WithIcon: StoryComponent<Args> = ({asset}) => {
+interface WithIconArgs extends Args {
+    asset: string;
+}
+
+export const WithIcon: StoryComponent<WithIconArgs> = ({actions, asset}) => {
     let assetProps;
     if (asset === 'Icon') {
         assetProps = {
@@ -53,23 +68,46 @@ export const WithIcon: StoryComponent<Args> = ({asset}) => {
                 {...assetProps}
                 title="Your cart is empty"
                 description="Check our marketplaces and find something for you. Check our marketplaces and find something"
-                button={<ButtonPrimary onPress={() => {}}>Explore marketplace</ButtonPrimary>}
+                button={
+                    actions.includes('button') ? (
+                        <ButtonPrimary onPress={() => {}}>Explore marketplace</ButtonPrimary>
+                    ) : undefined
+                }
+                buttonLink={
+                    actions.includes('link') ? (
+                        <ButtonLink onPress={() => {}}>More info</ButtonLink>
+                    ) : undefined
+                }
             />
         </div>
     );
 };
 WithIcon.storyName = 'With icon';
+WithIcon.argTypes = {
+    asset: {
+        options: ['Icon', 'Image', 'img'],
+        control: {type: 'select'},
+    },
+};
 WithIcon.args = {
     asset: 'Icon',
+    actions: 'button and link',
 };
 
-export const WithSmallImage: StoryComponent = () => (
+export const WithSmallImage: StoryComponent<Args> = ({actions}) => (
     <div data-testid="empty-state-with-small-image">
         <EmptyState
             imageUrl={avatars4Img}
             title="Your cart is empty"
             description="Check our marketplaces and find something for you. Check our marketplaces and find something"
-            button={<ButtonPrimary onPress={() => {}}>Explore marketplace</ButtonPrimary>}
+            button={
+                actions.includes('button') ? (
+                    <ButtonPrimary onPress={() => {}}>Explore marketplace</ButtonPrimary>
+                ) : undefined
+            }
+            buttonLink={
+                actions.includes('link') ? <ButtonLink onPress={() => {}}>More info</ButtonLink> : undefined
+            }
         />
     </div>
 );
diff --git a/src/empty-state.tsx b/src/empty-state.tsx
index e47ce3ce24..abe928d62f 100644
--- a/src/empty-state.tsx
+++ b/src/empty-state.tsx
@@ -107,7 +107,7 @@ const EmptyState: React.FC<Props> = ({
                             {description}
                         </Text3>
                     </Stack>
-                    {button && <ButtonGroup {...buttons} />}
+                    <ButtonGroup {...buttons} />
                 </Stack>
             </div>
             <div style={{flex: 1, position: 'relative'}}>