diff --git a/theme_anelusia/views/snippets/s_color_blocks_2.xml b/theme_anelusia/views/snippets/s_color_blocks_2.xml
index 392586bd8..d3b630faa 100644
--- a/theme_anelusia/views/snippets/s_color_blocks_2.xml
+++ b/theme_anelusia/views/snippets/s_color_blocks_2.xml
@@ -4,11 +4,11 @@
 <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
     <!-- Column #1 -->
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
-        <attribute name="class" add="col-lg-4" remove="col-lg-6" separator=" "/>
+        <attribute name="class" add="col-lg-4 o_cc3 text-center" remove="col-lg-6 o_cc4" separator=" "/>
     </xpath>
     <!-- Column #1 - Icon -->
-    <xpath expr="//i" position="attributes">
-        <attribute name="class" add="fa-venus" remove="fa-shield" separator=" "/>
+    <xpath expr="//h2" position="before">
+        <i class="fa fa-5x m-3 fa-venus"/>
     </xpath>
     <!-- Column #1 - Title -->
     <xpath expr="//h2" position="replace" mode="inner">
@@ -25,11 +25,11 @@
 
     <!-- Column #2 -->
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
-        <attribute name="class" add="col-lg-4 o_cc4" remove="col-lg-6 o_cc5" separator=" "/>
+        <attribute name="class" add="o_cc4 col-lg-4 text-center" remove="o_cc5 col-lg-6" separator=" "/>
     </xpath>
     <!-- Column #2 - Icon -->
-    <xpath expr="(//i)[2]" position="attributes">
-        <attribute name="class" add="fa-mars" remove="fa-cube" separator=" "/>
+    <xpath expr="(//h2)[2]" position="before">
+        <i class="fa fa-5x m-3 fa-mars"/>
     </xpath>
     <!-- Column #2 - Title -->
     <xpath expr="(//h2)[2]" position="replace" mode="inner">
@@ -48,7 +48,7 @@
     <xpath expr="(//div[hasclass('col-lg-4')])[2]" position="after">
         <div class="col-lg-4 o_cc o_cc5 text-center">
             <i class="fa fa-venus-mars fa-5x m-3"/>
-            <h2>Fancy for them</h2>
+            <h2 class="h3-fs">Fancy for them</h2>
             <p>Are you looking for sustainable clothing for men or women? Discover our exclusive fashion brand for both of you.</p>
             <a href="#" class="btn btn-primary btn-lg">More Details</a>
         </div>
diff --git a/theme_artists/views/snippets/s_color_blocks_2.xml b/theme_artists/views/snippets/s_color_blocks_2.xml
index 543573899..58b702aee 100644
--- a/theme_artists/views/snippets/s_color_blocks_2.xml
+++ b/theme_artists/views/snippets/s_color_blocks_2.xml
@@ -4,11 +4,11 @@
 <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
     <!-- Left column -->
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
-        <attribute name="class" add="o_cc4 pt208 pb208" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="pt208 pb208 text-center" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/27","flip":["x","y"]}</attribute>
     </xpath>
     <!-- Left column - Shape -->
-    <xpath expr="//div[hasclass('col-lg-6')]//i" position="before">
+    <xpath expr="//div[hasclass('col-lg-6')]//h2" position="before">
         <div class="o_we_shape o_web_editor_Wavy_27 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Wavy/27.svg?c1=o-color-5&amp;c2=o-color-5&amp;flip=xy'); background-position: 50% 50%;"/>
     </xpath>
     <!-- Left column - Button -->
@@ -17,11 +17,11 @@
     </xpath>
     <!-- Right column -->
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
-        <attribute name="class" add="pt208 pb208" separator=" "/>
+        <attribute name="class" add="pt208 pb208 text-center" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/27","flip":[]}</attribute>
     </xpath>
     <!-- Right column - Shape -->
-    <xpath expr="//div[hasclass('col-lg-6')][2]//i" position="before">
+    <xpath expr="//div[hasclass('col-lg-6')][2]//h2" position="before">
         <div class="o_we_shape o_web_editor_Wavy_27"/>
     </xpath>
     <!-- Right column - Button -->
diff --git a/theme_beauty/views/snippets/s_color_blocks_2.xml b/theme_beauty/views/snippets/s_color_blocks_2.xml
index e5b8b58d9..f62b3da47 100644
--- a/theme_beauty/views/snippets/s_color_blocks_2.xml
+++ b/theme_beauty/views/snippets/s_color_blocks_2.xml
@@ -2,10 +2,6 @@
 <odoo>
 
 <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
-    <!-- Column #1 -->
-    <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
-    </xpath>
     <!-- Column #2 -->
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
         <attribute name="class" add="o_cc1" remove="o_cc5" separator=" "/>
diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index 3039c802b..825bf1f1f 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -235,17 +235,13 @@
 <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2" name="Be Wise s_color_blocks_2">
     <!-- Left column -->
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
-        <attribute name="class" add="oe_img_bg o_bg_img_center o_cc5" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="oe_img_bg o_bg_img_center o_cc5" remove="o_cc4" separator=" "/>
         <attribute name="style">background-image: url('/web/image/website.s_media_list_default_image_1');</attribute>
     </xpath>
     <!-- Left column - Filter -->
-    <xpath expr="//div[hasclass('col-lg-6')]//i" position="before">
+    <xpath expr="//div[hasclass('col-lg-6')]//h2" position="before">
         <div class="o_we_bg_filter bg-black-50"/>
     </xpath>
-    <!-- Left column - Icon -->
-    <xpath expr="//div[hasclass('col-lg-6')]//i" position="attributes">
-        <attribute name="class" add="fa-3x fa-book" remove="fa-5x fa-shield" separator=" "/>
-    </xpath>
     <!-- Left column - Title -->
     <xpath expr="//div[hasclass('col-lg-6')]//h2" position="replace" mode="inner">
         Programmes
@@ -267,13 +263,9 @@
         <attribute name="style">background-image: url('/web/image/website.s_media_list_default_image_2');</attribute>
     </xpath>
     <!-- Right column - Filter -->
-    <xpath expr="//div[hasclass('col-lg-6')][2]//i" position="before">
+    <xpath expr="//div[hasclass('col-lg-6')][2]//h2" position="before">
         <div class="o_we_bg_filter bg-black-50"/>
     </xpath>
-    <!-- Right column - Icon -->
-    <xpath expr="//div[hasclass('col-lg-6')][2]//i" position="attributes">
-        <attribute name="class" add="fa-3x fa-institution" remove="fa-5x fa-cube" separator=" "/>
-    </xpath>
     <!-- Right column - Title -->
     <xpath expr="//div[hasclass('col-lg-6')][2]//h2" position="replace" mode="inner">
         The campus
diff --git a/theme_buzzy/views/snippets/s_color_blocks_2.xml b/theme_buzzy/views/snippets/s_color_blocks_2.xml
index 2c0c8d7bf..b728677aa 100644
--- a/theme_buzzy/views/snippets/s_color_blocks_2.xml
+++ b/theme_buzzy/views/snippets/s_color_blocks_2.xml
@@ -4,11 +4,10 @@
 <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
     <!-- Left block -->
     <xpath expr="//div[hasclass('row')]//div" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":["y","x"]}</attribute>
     </xpath>
     <!-- Left block - Shape -->
-    <xpath expr="//div[hasclass('row')]//div//i" position="before">
+    <xpath expr="//div[hasclass('row')]//div//h2" position="before">
         <div class="o_we_shape o_web_editor_Wavy_11" style="background-image: url('/web_editor/shape/web_editor/Wavy/11.svg?c1=o-color-5&amp;c4=o-color-5&amp;flip=xy'); background-position: 50% 0%;"/>
     </xpath>
     <!-- Right block -->
@@ -16,7 +15,7 @@
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Wavy/11","flip":[]}</attribute>
     </xpath>
     <!-- Right block - Shape -->
-    <xpath expr="//div[hasclass('row')]//div[2]//i" position="before">
+    <xpath expr="//div[hasclass('row')]//div[2]//h2" position="before">
         <div class="o_we_shape o_web_editor_Wavy_11 o_second_extra_shape_mapping"/>
     </xpath>
 </template>
diff --git a/theme_clean/views/snippets/s_color_blocks_2.xml b/theme_clean/views/snippets/s_color_blocks_2.xml
index fe42cbed2..488e94bf3 100644
--- a/theme_clean/views/snippets/s_color_blocks_2.xml
+++ b/theme_clean/views/snippets/s_color_blocks_2.xml
@@ -7,7 +7,7 @@
         <attribute name="class" add="oe_img_bg" separator=" "/>
         <attribute name="style">background-image: url('/web/image/website.s_color_blocks_2_default_image_1');</attribute>
     </xpath>
-    <xpath expr="//i" position="before">
+    <xpath expr="//h2" position="before">
         <div class="o_we_bg_filter bg-black-50"/>
     </xpath>
     <!-- Column #2 -->
@@ -15,7 +15,7 @@
         <attribute name="class" add="oe_img_bg" separator=" "/>
         <attribute name="style">background-image: url('/web/image/website.s_color_blocks_2_default_image_2');</attribute>
     </xpath>
-    <xpath expr="(//i)[2]" position="before">
+    <xpath expr="(//h2)[2]" position="before">
         <div class="o_we_bg_filter bg-black-50"/>
     </xpath>
 </template>
diff --git a/theme_cobalt/views/customizations.xml b/theme_cobalt/views/customizations.xml
index 185a3e4fc..d1a84fb5e 100644
--- a/theme_cobalt/views/customizations.xml
+++ b/theme_cobalt/views/customizations.xml
@@ -206,11 +206,8 @@
 <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2" name="Cobalt s_color_blocks_2">
     <!-- Left column -->
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc3" separator=" "/>
         <attribute name="style" add="background-image: linear-gradient(135deg, var(--o-color-2) 0%, var(--o-color-1) 100%);" separator=";"/>
     </xpath>
-    <!-- Left column - Icon -->
-    <xpath expr="//div[hasclass('col-lg-6')]//i" position="replace"/>
     <!-- Left column - Text -->
     <xpath expr="//div[hasclass('col-lg-6')]//p" position="replace"/>
     <!-- Left column - Title -->
@@ -227,8 +224,6 @@
         <attribute name="class" add="o_cc3" remove="o_cc5" separator=" "/>
         <attribute name="style" add="background-image: linear-gradient(315deg, var(--o-color-2) 0%, var(--o-color-1) 100%);" separator=";"/>
     </xpath>
-    <!-- Right column - Filter -->
-    <xpath expr="//div[hasclass('col-lg-6')][2]//i" position="replace"/>
     <!-- Right column - Title -->
     <xpath expr="//div[hasclass('col-lg-6')][2]//h2" position="replace" mode="inner">
         Are you an established brand looking for ongoing creative services?
diff --git a/theme_kea/views/snippets/s_color_blocks_2.xml b/theme_kea/views/snippets/s_color_blocks_2.xml
index 6f3314a36..69ec628dd 100644
--- a/theme_kea/views/snippets/s_color_blocks_2.xml
+++ b/theme_kea/views/snippets/s_color_blocks_2.xml
@@ -10,8 +10,6 @@
     <xpath expr="//h2" position="before">
         <div class="o_we_bg_filter bg-black-50"></div>
     </xpath>
-    <!-- Box #1 - Icon -->
-    <xpath expr="//div[hasclass('col-lg-6')]//i" position="replace" />  
     <!-- Box #1 - Title -->
     <xpath expr="//div[hasclass('col-lg-6')]//h2" position="replace" mode="inner">
         Multiplayer
@@ -19,7 +17,7 @@
     <!-- Box #1 - Text -->
     <xpath expr="//div[hasclass('col-lg-6')]//p" position="replace" mode="inner">
         Conquer leaderboards, crush workouts, create with friends and more. Get lost in a growing library of VR classics and all-new experiences.
-    </xpath>                
+    </xpath>
     <!-- Box #2 -->
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
         <attribute name="class" add="oe_img_bg o_bg_img_center pt256 pb256" remove="" separator=" " />
@@ -28,8 +26,6 @@
     <xpath expr="(//h2)[2]" position="before">
         <div class="o_we_bg_filter bg-black-50"></div>
     </xpath>
-    <!-- Box #2 - Icon -->
-    <xpath expr="//div[hasclass('col-lg-6')][2]//i" position="replace" />
     <!-- Box #2 - Title -->
     <xpath expr="//div[hasclass('col-lg-6')][2]//h2" position="replace" mode="inner">
         Freedom
diff --git a/theme_loftspace/views/snippets/s_color_blocks_2.xml b/theme_loftspace/views/snippets/s_color_blocks_2.xml
index 7c51cb0fe..ba095b873 100644
--- a/theme_loftspace/views/snippets/s_color_blocks_2.xml
+++ b/theme_loftspace/views/snippets/s_color_blocks_2.xml
@@ -4,10 +4,10 @@
 <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
     <!-- Left column -->
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
-        <attribute name="class" add="o_cc2" remove="o_cc3" separator=" "/>
+        <attribute name="class" add="o_cc2" remove="o_cc4" separator=" "/>
         <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/04_001','flip':[]}</attribute>
     </xpath>
-    <xpath expr="//i" position="before">
+    <xpath expr="//h2" position="before">
         <div class="o_we_shape o_web_editor_Airy_04_001"/>
     </xpath>
     <!-- Right column -->
@@ -15,7 +15,7 @@
         <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
         <attribute name="data-oe-shape-data">{'shape':'web_editor/Airy/04_001','flip':['x']}</attribute>
     </xpath>
-    <xpath expr="(//i)[2]" position="before">
+    <xpath expr="(//h2)[2]" position="before">
         <div class="o_we_shape o_web_editor_Airy_04_001 o_second_extra_shape_mapping" style="background-image: url('/web_editor/shape/web_editor/Airy/04_001.svg?c1=o-color-5&amp;flip=x'); background-position: 50% 50%;"/>
     </xpath>
 </template>
diff --git a/theme_notes/views/snippets/s_color_blocks_2.xml b/theme_notes/views/snippets/s_color_blocks_2.xml
index c9dd345e7..e28695b14 100644
--- a/theme_notes/views/snippets/s_color_blocks_2.xml
+++ b/theme_notes/views/snippets/s_color_blocks_2.xml
@@ -8,7 +8,7 @@
     </xpath>
     <!-- Column #1 -->
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
-        <attribute name="class" remove="o_cc o_cc3" separator=" "/>
+        <attribute name="class" remove="o_cc o_cc4" separator=" "/>
     </xpath>
     <!-- Column #2 -->
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
diff --git a/theme_odoo_experts/views/snippets/s_color_blocks_2.xml b/theme_odoo_experts/views/snippets/s_color_blocks_2.xml
index b062e201f..1fd63f194 100644
--- a/theme_odoo_experts/views/snippets/s_color_blocks_2.xml
+++ b/theme_odoo_experts/views/snippets/s_color_blocks_2.xml
@@ -4,7 +4,7 @@
 <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
     <!-- Box #2 -->
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
-        <attribute name="class" add="o_cc4" remove="o_cc5" separator=" "/>
+        <attribute name="class" add="o_cc1" remove="o_cc5" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
index 2377c2726..d18973220 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -344,17 +344,18 @@
 <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2" name="Paptic s_color_blocks_2">
     <!-- Left column -->
     <xpath expr="//div[hasclass('col-lg-6')]" position="attributes">
+        <attribute name="class" add="o_cc3 text-center" remove="o_cc4" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/03","flip":["y"]}</attribute>
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-6')]/i" position="before">
+    <xpath expr="//div[hasclass('col-lg-6')]/h2" position="before">
         <div class="o_we_shape o_web_editor_Blocks_03" style="background-image: url('/web_editor/shape/web_editor/Blocks/03.svg?c1=o-color-1&amp;c4=o-color-4&amp;flip=y'); background-position: 50% 0%"/>
     </xpath>
     <!-- Right column -->
     <xpath expr="//div[hasclass('col-lg-6')][2]" position="attributes">
-        <attribute name="class" add="o_cc3" remove="o_cc5" separator=" "/>
+        <attribute name="class" add="o_cc3 text-center" remove="o_cc5" separator=" "/>
         <attribute name="data-oe-shape-data">{"shape":"web_editor/Blocks/03","flip":["x","y"]}</attribute>
     </xpath>
-    <xpath expr="//div[hasclass('col-lg-6')][2]/i" position="before">
+    <xpath expr="//div[hasclass('col-lg-6')][2]/h2" position="before">
         <div class="o_we_shape o_web_editor_Blocks_03" style="background-image: url('/web_editor/shape/web_editor/Blocks/03.svg?c1=o-color-1&amp;c4=o-color-4&amp;flip=xy'); background-position: 50% 0%"/>
     </xpath>
 </template>
diff --git a/theme_treehouse/views/snippets/s_color_blocks_2.xml b/theme_treehouse/views/snippets/s_color_blocks_2.xml
index e5710e1dc..41f62fb67 100644
--- a/theme_treehouse/views/snippets/s_color_blocks_2.xml
+++ b/theme_treehouse/views/snippets/s_color_blocks_2.xml
@@ -3,9 +3,6 @@
 
 <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
     <!-- Column #01 -->
-    <xpath expr="//i" position="replace">
-        <i class="fa fa-2x fa-cloud bg-white text-secondary rounded-circle m-4 mx-auto"/>
-    </xpath>
     <xpath expr="//h2" position="replace" mode="inner">
         Sky is the limit.
     </xpath>
diff --git a/theme_zap/views/snippets/s_color_blocks_2.xml b/theme_zap/views/snippets/s_color_blocks_2.xml
index 1b603cbb5..2e81e2893 100644
--- a/theme_zap/views/snippets/s_color_blocks_2.xml
+++ b/theme_zap/views/snippets/s_color_blocks_2.xml
@@ -4,10 +4,7 @@
 <template id="s_color_blocks_2" inherit_id="website.s_color_blocks_2">
     <!-- Column #01 -->
     <xpath expr="//*[hasclass('row')]/*[1]" position="attributes">
-        <attribute name="class" add="o_cc4 pt96 pb96" remove="o_cc3 text-center" separator=" "/>
-    </xpath>
-    <xpath expr="//i" position="replace">
-        <i class="fa fa-2x fa-cloud bg-white text-o-color-1 rounded-circle shadow my-4"/>
+        <attribute name="class" add="pt96 pb96" separator=" "/>
     </xpath>
     <xpath expr="//h2" position="replace" mode="inner">
         Cloud <b>Solution</b>