Commit 57f25b4387d for woocommerce

commit 57f25b4387d422f29dfa37cd021e606513808645
Author: Albert Juhé Lluveras <contact@albertjuhe.com>
Date:   Mon Nov 9 15:01:28 2026 +0100

    Make 'Four columns of store features with icons' pattern better adapt to different viewport sizes (#70739)

    * Make 'Four columns of store features with icons' pattern better adapt to different viewport sizes

    * Simplify other patterns

    * Add changelog file

    * Update image width to account for borders

diff --git a/themes/purple/changelog/fix-WOOTHME-529-store-features-icons b/themes/purple/changelog/fix-WOOTHME-529-store-features-icons
new file mode 100644
index 00000000000..f723dbb3498
--- /dev/null
+++ b/themes/purple/changelog/fix-WOOTHME-529-store-features-icons
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Make 'Four columns of store features with icons' pattern better adapt to different viewport sizes
diff --git a/themes/purple/patterns/store-features-four-columns-alternative.php b/themes/purple/patterns/store-features-four-columns-alternative.php
index 4dc71b4e551..1749a51b946 100644
--- a/themes/purple/patterns/store-features-four-columns-alternative.php
+++ b/themes/purple/patterns/store-features-four-columns-alternative.php
@@ -18,11 +18,9 @@
 <div class="wp-block-column" style="padding-top:0;padding-bottom:0"><!-- wp:columns {"align":"wide","style":{"spacing":{"padding":{"top":"0","bottom":"0","left":"0","right":"0"},"blockGap":{"top":"var:preset|spacing|70","left":"0"}}}} -->
 <div class="wp-block-columns alignwide" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:column {"width":"50%"} -->
 <div class="wp-block-column" style="flex-basis:50%"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
-<div class="wp-block-group"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-pin.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-1"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-pin.svg" alt="" style="width:32px"/></figure>
-<!-- /wp:image --></div>
-<!-- /wp:group -->
+<div class="wp-block-group"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-pin.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-1"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-pin.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
+<!-- /wp:image -->

 <!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"600","lineHeight":"1.5"},"elements":{"link":{"color":{"text":"var:preset|color|theme-2"}}}},"textColor":"theme-2"} -->
 <p class="has-theme-2-color has-text-color has-link-color" style="font-style:normal;font-weight:600;line-height:1.5"><?php esc_html_e( 'In store collection', 'purple' ); ?></p>
@@ -32,11 +30,9 @@

 <!-- wp:column {"width":"50%"} -->
 <div class="wp-block-column" style="flex-basis:50%"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
-<div class="wp-block-group"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-gift.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-1"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-gift.svg" alt="" style="width:32px"/></figure>
-<!-- /wp:image --></div>
-<!-- /wp:group -->
+<div class="wp-block-group"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-gift.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-1"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-gift.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
+<!-- /wp:image -->

 <!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"600","lineHeight":"1.5"},"elements":{"link":{"color":{"text":"var:preset|color|theme-2"}}}},"textColor":"theme-2"} -->
 <p class="has-theme-2-color has-text-color has-link-color" style="font-style:normal;font-weight:600;line-height:1.5"><?php esc_html_e( 'Gift wrapping', 'purple' ); ?></p>
@@ -50,11 +46,9 @@
 <div class="wp-block-column"><!-- wp:columns {"align":"wide","style":{"spacing":{"padding":{"top":"0","bottom":"0","left":"0","right":"0"},"blockGap":{"top":"var:preset|spacing|70","left":"0"}}}} -->
 <div class="wp-block-columns alignwide" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:column {"width":"50%"} -->
 <div class="wp-block-column" style="flex-basis:50%"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
-<div class="wp-block-group"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-1"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg" alt="" style="width:32px"/></figure>
-<!-- /wp:image --></div>
-<!-- /wp:group -->
+<div class="wp-block-group"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-1"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
+<!-- /wp:image -->

 <!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"600","lineHeight":"1.5"},"elements":{"link":{"color":{"text":"var:preset|color|theme-2"}}}},"textColor":"theme-2"} -->
 <p class="has-theme-2-color has-text-color has-link-color" style="font-style:normal;font-weight:600;line-height:1.5"><?php esc_html_e( 'Free returns', 'purple' ); ?></p>
@@ -64,11 +58,9 @@

 <!-- wp:column {"width":"50%"} -->
 <div class="wp-block-column" style="flex-basis:50%"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
-<div class="wp-block-group"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-payment.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-1"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-payment.svg" alt="" style="width:32px"/></figure>
-<!-- /wp:image --></div>
-<!-- /wp:group -->
+<div class="wp-block-group"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-payment.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-1"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-payment.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
+<!-- /wp:image -->

 <!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"600","lineHeight":"1.5"},"elements":{"link":{"color":{"text":"var:preset|color|theme-2"}}}},"textColor":"theme-2"} -->
 <p class="has-theme-2-color has-text-color has-link-color" style="font-style:normal;font-weight:600;line-height:1.5"><?php esc_html_e( 'Secure payments', 'purple' ); ?></p>
diff --git a/themes/purple/patterns/store-features-four-columns.php b/themes/purple/patterns/store-features-four-columns.php
index 22a4ac133b4..49b962a9e0e 100644
--- a/themes/purple/patterns/store-features-four-columns.php
+++ b/themes/purple/patterns/store-features-four-columns.php
@@ -18,12 +18,10 @@
 <div class="wp-block-column" style="padding-top:0;padding-bottom:0"><!-- wp:columns {"isStackedOnMobile":false,"align":"wide","style":{"spacing":{"padding":{"top":"0","bottom":"0","left":"0","right":"0"},"blockGap":{"top":"var:preset|spacing|70","left":"var:preset|spacing|20"}}}} -->
 <div class="wp-block-columns alignwide is-not-stacked-on-mobile" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:column {"width":"50%"} -->
 <div class="wp-block-column" style="flex-basis:50%"><!-- wp:columns {"verticalAlignment":"center","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|10","left":"var:preset|spacing|20"}}}} -->
-<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"32px"} -->
-<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:32px"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-support.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-2"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-support.svg" alt="" style="width:32px"/></figure>
+<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"top","width":"34px"} -->
+<div class="wp-block-column is-vertically-aligned-top" style="flex-basis:34px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-support.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-2"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-support.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
 <!-- /wp:image --></div>
-<!-- /wp:group --></div>
 <!-- /wp:column -->

 <!-- wp:column {"verticalAlignment":"center","width":""} -->
@@ -42,12 +40,10 @@

 <!-- wp:column {"width":"50%"} -->
 <div class="wp-block-column" style="flex-basis:50%"><!-- wp:columns {"verticalAlignment":"center","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|10","left":"var:preset|spacing|20"}}}} -->
-<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"32px"} -->
-<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:32px"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-gift.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-2"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-gift.svg" alt="" style="width:32px"/></figure>
+<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"top","width":"34px"} -->
+<div class="wp-block-column is-vertically-aligned-top" style="flex-basis:34px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-gift.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-2"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-gift.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
 <!-- /wp:image --></div>
-<!-- /wp:group --></div>
 <!-- /wp:column -->

 <!-- wp:column {"verticalAlignment":"center","width":""} -->
@@ -70,12 +66,10 @@
 <div class="wp-block-column"><!-- wp:columns {"isStackedOnMobile":false,"align":"wide","style":{"spacing":{"padding":{"top":"0","bottom":"0","left":"0","right":"0"},"blockGap":{"top":"var:preset|spacing|70","left":"var:preset|spacing|20"}}}} -->
 <div class="wp-block-columns alignwide is-not-stacked-on-mobile" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:column {"width":"50%"} -->
 <div class="wp-block-column" style="flex-basis:50%"><!-- wp:columns {"verticalAlignment":"center","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|10","left":"var:preset|spacing|20"}}}} -->
-<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"32px"} -->
-<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:32px"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-2"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg" alt="" style="width:32px"/></figure>
+<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"top","width":"34px"} -->
+<div class="wp-block-column is-vertically-aligned-top" style="flex-basis:34px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-2"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
 <!-- /wp:image --></div>
-<!-- /wp:group --></div>
 <!-- /wp:column -->

 <!-- wp:column {"verticalAlignment":"center","width":""} -->
@@ -94,12 +88,10 @@

 <!-- wp:column {"width":"50%"} -->
 <div class="wp-block-column" style="flex-basis:50%"><!-- wp:columns {"verticalAlignment":"center","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|10","left":"var:preset|spacing|20"}}}} -->
-<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"32px"} -->
-<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:32px"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-repair.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-2"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-repair.svg" alt="" style="width:32px"/></figure>
+<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"top","width":"34px"} -->
+<div class="wp-block-column is-vertically-aligned-top" style="flex-basis:34px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-repair.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-2"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-repair.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
 <!-- /wp:image --></div>
-<!-- /wp:group --></div>
 <!-- /wp:column -->

 <!-- wp:column {"verticalAlignment":"center","width":""} -->
diff --git a/themes/purple/patterns/store-features-three-columns-alternative.php b/themes/purple/patterns/store-features-three-columns-alternative.php
index 7902707c94f..5eebb020d83 100644
--- a/themes/purple/patterns/store-features-three-columns-alternative.php
+++ b/themes/purple/patterns/store-features-three-columns-alternative.php
@@ -16,11 +16,9 @@
 <div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0;padding-top:var(--wp--preset--spacing--90);padding-bottom:var(--wp--preset--spacing--90)"><!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|70","left":"var:preset|spacing|50"}}}} -->
 <div class="wp-block-columns alignwide"><!-- wp:column {"width":"33%","style":{"spacing":{"padding":{"right":"var:preset|spacing|70","left":"var:preset|spacing|70"}}}} -->
 <div class="wp-block-column" style="padding-right:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--70);flex-basis:33%"><!-- wp:group {"style":{"spacing":{"padding":{"right":"0","left":"0"},"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
-<div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"},"spacing":{"margin":{"bottom":"var:preset|spacing|10"}}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px;margin-bottom:var(--wp--preset--spacing--10)"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-craft.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-1"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-craft.svg" alt="" style="width:32px"/></figure>
-<!-- /wp:image --></div>
-<!-- /wp:group -->
+<div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-craft.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-1"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}},"spacing":{"margin":{"bottom":"var:preset|spacing|10"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border" style="margin-bottom:var(--wp--preset--spacing--10)"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-craft.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
+<!-- /wp:image -->

 <!-- wp:group {"style":{"spacing":{"blockGap":"0"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
 <div class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"500","lineHeight":"1.18"},"elements":{"link":{"color":{"text":"var:preset|color|theme-2"}}}},"textColor":"theme-2","fontSize":"large"} -->
@@ -36,11 +34,9 @@

 <!-- wp:column {"width":"33%","style":{"spacing":{"padding":{"right":"var:preset|spacing|70","left":"var:preset|spacing|70"}}}} -->
 <div class="wp-block-column" style="padding-right:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--70);flex-basis:33%"><!-- wp:group {"style":{"spacing":{"padding":{"right":"0","left":"0"},"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
-<div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"},"spacing":{"margin":{"bottom":"var:preset|spacing|10"}}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px;margin-bottom:var(--wp--preset--spacing--10)"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-wool.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-1"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-wool.svg" alt="" style="width:32px"/></figure>
-<!-- /wp:image --></div>
-<!-- /wp:group -->
+<div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-wool.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-1"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}},"spacing":{"margin":{"bottom":"var:preset|spacing|10"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border" style="margin-bottom:var(--wp--preset--spacing--10)"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-wool.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
+<!-- /wp:image -->

 <!-- wp:group {"style":{"spacing":{"blockGap":"0"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
 <div class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"500","lineHeight":"1.18"},"elements":{"link":{"color":{"text":"var:preset|color|theme-2"}}}},"textColor":"theme-2","fontSize":"large"} -->
@@ -56,11 +52,9 @@

 <!-- wp:column {"width":"33%","style":{"spacing":{"padding":{"right":"var:preset|spacing|70","left":"var:preset|spacing|70"}}}} -->
 <div class="wp-block-column" style="padding-right:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--70);flex-basis:33%"><!-- wp:group {"style":{"spacing":{"padding":{"right":"0","left":"0"},"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical","verticalAlignment":"center","justifyContent":"center"}} -->
-<div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"},"spacing":{"margin":{"bottom":"var:preset|spacing|10"}}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px;margin-bottom:var(--wp--preset--spacing--10)"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-color.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-1"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-color.svg" alt="" style="width:32px"/></figure>
-<!-- /wp:image --></div>
-<!-- /wp:group -->
+<div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-color.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-1"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}},"spacing":{"margin":{"bottom":"var:preset|spacing|10"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border" style="margin-bottom:var(--wp--preset--spacing--10)"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-color.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
+<!-- /wp:image -->

 <!-- wp:group {"style":{"spacing":{"blockGap":"0"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
 <div class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"500","lineHeight":"1.18"},"elements":{"link":{"color":{"text":"var:preset|color|theme-2"}}}},"textColor":"theme-2","fontSize":"large"} -->
diff --git a/themes/purple/patterns/store-features-three-columns.php b/themes/purple/patterns/store-features-three-columns.php
index d296251e305..f23fcda661f 100644
--- a/themes/purple/patterns/store-features-three-columns.php
+++ b/themes/purple/patterns/store-features-three-columns.php
@@ -16,11 +16,9 @@
 <div class="wp-block-group alignfull" style="margin-top:0;margin-bottom:0;padding-top:var(--wp--preset--spacing--90);padding-bottom:var(--wp--preset--spacing--90)"><!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":{"top":"var:preset|spacing|70","left":"var:preset|spacing|50"}}}} -->
 <div class="wp-block-columns alignwide"><!-- wp:column {"width":"33%","style":{"spacing":{"padding":{"right":"var:preset|spacing|70","left":"var:preset|spacing|70"}}}} -->
 <div class="wp-block-column" style="padding-right:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--70);flex-basis:33%"><!-- wp:group {"style":{"spacing":{"padding":{"right":"0","left":"0"},"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
-<div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"},"spacing":{"margin":{"bottom":"var:preset|spacing|10"}}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px;margin-bottom:var(--wp--preset--spacing--10)"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-truck.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-1"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-truck.svg" alt="" style="width:32px"/></figure>
-<!-- /wp:image --></div>
-<!-- /wp:group -->
+<div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-truck.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-1"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}},"spacing":{"margin":{"bottom":"var:preset|spacing|10"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border" style="margin-bottom:var(--wp--preset--spacing--10)"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-truck.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
+<!-- /wp:image -->

 <!-- wp:group {"style":{"spacing":{"blockGap":"0"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
 <div class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"500","lineHeight":"1.18"},"elements":{"link":{"color":{"text":"var:preset|color|theme-2"}}}},"textColor":"theme-2","fontSize":"large"} -->
@@ -36,11 +34,9 @@

 <!-- wp:column {"width":"33%","style":{"spacing":{"padding":{"right":"var:preset|spacing|70","left":"var:preset|spacing|70"}}}} -->
 <div class="wp-block-column" style="padding-right:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--70);flex-basis:33%"><!-- wp:group {"style":{"spacing":{"padding":{"right":"0","left":"0"},"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center","verticalAlignment":"center"}} -->
-<div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"},"spacing":{"margin":{"bottom":"var:preset|spacing|10"}}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px;margin-bottom:var(--wp--preset--spacing--10)"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-gift.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-1"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-gift.svg" alt="" style="width:32px"/></figure>
-<!-- /wp:image --></div>
-<!-- /wp:group -->
+<div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-gift.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-1"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}},"spacing":{"margin":{"bottom":"var:preset|spacing|10"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border" style="margin-bottom:var(--wp--preset--spacing--10)"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-gift.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
+<!-- /wp:image -->

 <!-- wp:group {"style":{"spacing":{"blockGap":"0"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
 <div class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"500","lineHeight":"1.18"},"elements":{"link":{"color":{"text":"var:preset|color|theme-2"}}}},"textColor":"theme-2","fontSize":"large"} -->
@@ -56,11 +52,9 @@

 <!-- wp:column {"width":"33%","style":{"spacing":{"padding":{"right":"var:preset|spacing|70","left":"var:preset|spacing|70"}}}} -->
 <div class="wp-block-column" style="padding-right:var(--wp--preset--spacing--70);padding-left:var(--wp--preset--spacing--70);flex-basis:33%"><!-- wp:group {"style":{"spacing":{"padding":{"right":"0","left":"0"},"blockGap":"var:preset|spacing|10"}},"layout":{"type":"flex","orientation":"vertical","verticalAlignment":"center","justifyContent":"center"}} -->
-<div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"},"spacing":{"margin":{"bottom":"var:preset|spacing|10"}}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px;margin-bottom:var(--wp--preset--spacing--10)"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-1"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg" alt="" style="width:32px"/></figure>
-<!-- /wp:image --></div>
-<!-- /wp:group -->
+<div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-1"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}},"spacing":{"margin":{"bottom":"var:preset|spacing|10"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border" style="margin-bottom:var(--wp--preset--spacing--10)"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
+<!-- /wp:image -->

 <!-- wp:group {"style":{"spacing":{"blockGap":"0"}},"layout":{"type":"flex","orientation":"vertical","justifyContent":"center"}} -->
 <div class="wp-block-group"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"500","lineHeight":"1.18"},"elements":{"link":{"color":{"text":"var:preset|color|theme-2"}}}},"textColor":"theme-2","fontSize":"large"} -->
diff --git a/themes/purple/patterns/store-features-two-columns.php b/themes/purple/patterns/store-features-two-columns.php
index bb795629d3e..310eca1644b 100644
--- a/themes/purple/patterns/store-features-two-columns.php
+++ b/themes/purple/patterns/store-features-two-columns.php
@@ -16,11 +16,9 @@
 <div class="wp-block-group alignfull has-theme-5-background-color has-background" style="margin-top:0;margin-bottom:0;padding-top:var(--wp--preset--spacing--30);padding-right:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--30);padding-left:var(--wp--preset--spacing--50)"><!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":"var:preset|spacing|30"}}} -->
 <div class="wp-block-columns alignwide"><!-- wp:column {"width":"50%"} -->
 <div class="wp-block-column" style="flex-basis:50%"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"left"}} -->
-<div class="wp-block-group"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-truck.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-2"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-truck.svg" alt="" style="width:32px"/></figure>
-<!-- /wp:image --></div>
-<!-- /wp:group -->
+<div class="wp-block-group"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-truck.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-2"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-truck.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
+<!-- /wp:image -->

 <!-- wp:group {"style":{"spacing":{"padding":{"right":"0","left":"0"},"blockGap":"0"}},"layout":{"type":"flex","orientation":"vertical"}} -->
 <div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"600","lineHeight":"1.5"},"elements":{"link":{"color":{"text":"var:preset|color|theme-2"}}}},"textColor":"theme-2","fontSize":"medium"} -->
@@ -36,11 +34,9 @@

 <!-- wp:column {"width":"50%"} -->
 <div class="wp-block-column" style="flex-basis:50%"><!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","flexWrap":"wrap"}} -->
-<div class="wp-block-group"><!-- wp:group {"style":{"border":{"radius":"999px","width":"1px"}},"borderColor":"theme-6","layout":{"type":"default"}} -->
-<div class="wp-block-group has-border-color has-theme-6-border-color" style="border-radius:999px;border-width:1px"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg","width":"32px","sizeSlug":"full","linkDestination":"none","style":{"color":{"duotone":"var:preset|duotone|duotone-2"}}} -->
-<figure class="wp-block-image size-full is-resized"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg" alt="" style="width:32px"/></figure>
-<!-- /wp:image --></div>
-<!-- /wp:group -->
+<div class="wp-block-group"><!-- wp:image {"url":"<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg","width":"34px","sizeSlug":"full","linkDestination":"none","borderColor":"theme-6","style":{"color":{"duotone":"var:preset|duotone|duotone-2"},"border":{"width":"1px","radius":{"topLeft":"999px","topRight":"999px","bottomLeft":"999px","bottomRight":"999px"}}}} -->
+<figure class="wp-block-image size-full is-resized has-custom-border"><img src="<?php echo esc_url( get_template_directory_uri() ); ?>/assets/images/icon-return.svg" alt="" class="has-border-color has-theme-6-border-color" style="border-width:1px;border-top-left-radius:999px;border-top-right-radius:999px;border-bottom-left-radius:999px;border-bottom-right-radius:999px;width:34px;height:auto"/></figure>
+<!-- /wp:image -->

 <!-- wp:group {"style":{"spacing":{"padding":{"right":"0","left":"0"},"blockGap":"0"}},"layout":{"type":"flex","orientation":"vertical"}} -->
 <div class="wp-block-group" style="padding-right:0;padding-left:0"><!-- wp:paragraph {"style":{"typography":{"fontStyle":"normal","fontWeight":"600","lineHeight":"1.5"},"elements":{"link":{"color":{"text":"var:preset|color|theme-2"}}}},"textColor":"theme-2","fontSize":"medium"} -->