diff --git a/theme_artists/views/new_page_template.xml b/theme_artists/views/new_page_template.xml
index 40cd52aeb..681312d9e 100644
--- a/theme_artists/views/new_page_template.xml
+++ b/theme_artists/views/new_page_template.xml
@@ -49,6 +49,15 @@
 </template>
 
 <template id="new_page_template_s_features_grid" inherit_id="website.new_page_template_s_features_grid">
+    <xpath expr="//i" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+    </xpath>
+    <xpath expr="(//i)[2]" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+    </xpath>
+    <xpath expr="(//i)[3]" position="attributes">
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+    </xpath>
     <xpath expr="(//i)[4]" position="attributes">
         <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
     </xpath>
diff --git a/theme_artists/views/snippets/s_features_grid.xml b/theme_artists/views/snippets/s_features_grid.xml
index 2f51ee09f..aaf9b65b9 100644
--- a/theme_artists/views/snippets/s_features_grid.xml
+++ b/theme_artists/views/snippets/s_features_grid.xml
@@ -8,22 +8,22 @@
     </xpath>
     <!-- Icons -->
     <xpath expr="//i" position="attributes">
-        <attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[2]" position="attributes">
-        <attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[4]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[5]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[6]" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-3" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_bewise/views/customizations.xml b/theme_bewise/views/customizations.xml
index 2b6f940ad..c331fdd3d 100644
--- a/theme_bewise/views/customizations.xml
+++ b/theme_bewise/views/customizations.xml
@@ -395,22 +395,22 @@
 <template id="s_features_grid" inherit_id="website.s_features_grid" name="Be Wise s_features_grid">
     <!-- Icons -->
     <xpath expr="//i" position="attributes">
-        <attribute name="class" add="bg-o-color-2" remove="fa-2x bg-o-color-1" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[2]" position="attributes">
-        <attribute name="class" add="bg-o-color-2" remove="fa-2x bg-o-color-1" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-2" remove="fa-2x bg-o-color-1" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[4]" position="attributes">
-        <attribute name="class" add="rounded-circle" remove="fa-2x rounded" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[5]" position="attributes">
-        <attribute name="class" add="rounded-circle" remove="fa-2x rounded" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[6]" position="attributes">
-        <attribute name="class" add="rounded-circle" remove="fa-2x rounded" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="fa-2x bg-o-color-3" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_bookstore/views/snippets/s_features_grid.xml b/theme_bookstore/views/snippets/s_features_grid.xml
index 85b42764c..5274b686c 100644
--- a/theme_bookstore/views/snippets/s_features_grid.xml
+++ b/theme_bookstore/views/snippets/s_features_grid.xml
@@ -2,6 +2,18 @@
 <odoo>
 
 <template id="s_features_grid" inherit_id="website.s_features_grid">
+    <!-- Item #1 -->
+    <xpath expr="(//i)[1]" position="attributes">
+        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
+    </xpath>
+    <!-- Item #2 -->
+    <xpath expr="(//i)[2]" position="attributes">
+        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
+    </xpath>
+    <!-- Item #3 -->
+    <xpath expr="(//i)[3]" position="attributes">
+        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
+    </xpath>
     <!-- Item #4 -->
     <xpath expr="(//i)[4]" position="attributes">
         <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
diff --git a/theme_buzzy/views/snippets/s_features_grid.xml b/theme_buzzy/views/snippets/s_features_grid.xml
index 53e541f46..132c04d4b 100644
--- a/theme_buzzy/views/snippets/s_features_grid.xml
+++ b/theme_buzzy/views/snippets/s_features_grid.xml
@@ -8,22 +8,22 @@
     </xpath>
     <!-- Icons -->
     <xpath expr="//i" position="attributes">
-        <attribute name="class" add="bg-o-color-2" remove="fa-2x bg-o-color-1" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[2]" position="attributes">
-        <attribute name="class" add="bg-o-color-2" remove="fa-2x bg-o-color-1" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="bg-o-color-2" remove="fa-2x bg-o-color-1" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[4]" position="attributes">
-        <attribute name="class" add="rounded-circle" remove="rounded fa-2x" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[5]" position="attributes">
-        <attribute name="class" add="rounded-circle" remove="rounded fa-2x" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <xpath expr="(//i)[6]" position="attributes">
-        <attribute name="class" add="rounded-circle" remove="rounded fa-2x" separator=" "/>
+        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-3" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_loftspace/views/snippets/s_features_grid.xml b/theme_loftspace/views/snippets/s_features_grid.xml
index 059feb8ff..146256b5b 100644
--- a/theme_loftspace/views/snippets/s_features_grid.xml
+++ b/theme_loftspace/views/snippets/s_features_grid.xml
@@ -2,21 +2,25 @@
 <odoo>
 
 <template id="s_features_grid" inherit_id="website.s_features_grid">
+    <!-- Item #1 -->
+    <xpath expr="//i" position="attributes">
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-3" separator=" "/>
+    </xpath>
     <!-- Item #2 -->
     <xpath expr="(//i)[2]" position="attributes">
-        <attribute name="class" add="bg-o-color-2" remove="bg-o-color-1" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <!-- Item #4 -->
     <xpath expr="(//i)[4]" position="attributes">
-        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <!-- Item #5 -->
     <xpath expr="(//i)[5]" position="attributes">
-        <attribute name="class" add="rounded-circle bg-o-color-1" remove="rounded bg-o-color-2" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-3" separator=" "/>
     </xpath>
     <!-- Item #6 -->
     <xpath expr="(//i)[6]" position="attributes">
-        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
+        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-3" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_notes/views/snippets/s_features_grid.xml b/theme_notes/views/snippets/s_features_grid.xml
index 20345e768..09fdf70a3 100644
--- a/theme_notes/views/snippets/s_features_grid.xml
+++ b/theme_notes/views/snippets/s_features_grid.xml
@@ -4,19 +4,7 @@
 <template id="s_features_grid" inherit_id="website.s_features_grid">
     <!-- Section -->
     <xpath expr="//section" position="attributes">
-        <attribute name="class" add="o_cc o_cc5 pb72 pt96" remove="pt48 pb24" separator=" "/>
-    </xpath>
-    <!-- Item #4 -->
-    <xpath expr="(//i)[4]" position="attributes">
-        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
-    </xpath>
-    <!-- Item #5 -->
-    <xpath expr="(//i)[5]" position="attributes">
-        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
-    </xpath>
-    <!-- Item #6 -->
-    <xpath expr="(//i)[6]" position="attributes">
-        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
+        <attribute name="class" add="o_cc o_cc5 pb72 pt96" remove="pt64 pb64" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_odoo_experts/views/snippets/s_features_grid.xml b/theme_odoo_experts/views/snippets/s_features_grid.xml
index 691172830..dc477d40f 100644
--- a/theme_odoo_experts/views/snippets/s_features_grid.xml
+++ b/theme_odoo_experts/views/snippets/s_features_grid.xml
@@ -4,15 +4,27 @@
 <template id="s_features_grid" inherit_id="website.s_features_grid">
     <!-- Item #1 - Icon -->
     <xpath expr="//i" position="attributes">
-        <attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
+        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
     </xpath>
     <!-- Item #2 - Icon -->
     <xpath expr="(//i)[2]" position="attributes">
-        <attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
+        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
     </xpath>
     <!-- Item #3 - Icon -->
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="rounded" remove="rounded-circle" separator=" "/>
+        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
+    </xpath>
+    <!-- Item #4 - Icon -->
+    <xpath expr="(//i)[4]" position="attributes">
+        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
+    </xpath>
+    <!-- Item #5 - Icon -->
+    <xpath expr="(//i)[5]" position="attributes">
+        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
+    </xpath>
+    <!-- Item #6 - Icon -->
+    <xpath expr="(//i)[6]" position="attributes">
+        <attribute name="class" add="rounded-circle" remove="rounded" separator=" "/>
     </xpath>
 </template>
 
diff --git a/theme_paptic/views/customizations.xml b/theme_paptic/views/customizations.xml
index c53ed5172..5e86402a0 100644
--- a/theme_paptic/views/customizations.xml
+++ b/theme_paptic/views/customizations.xml
@@ -411,22 +411,6 @@
     </xpath>
 </template>
 
-<!-- ==== Features Grid ===== -->
-<template id="s_features_grid" inherit_id="website.s_features_grid" name="Paptic s_features_grid">
-    <!-- Icon #4 -->
-    <xpath expr="(//i)[4]" position="attributes">
-        <attribute name="class" add="rounded-circle bg-o-color-3" remove="rounded bg-o-color-2" separator=" "/>
-    </xpath>
-    <!-- Icon #5 -->
-    <xpath expr="(//i)[5]" position="attributes">
-        <attribute name="class" add="rounded-circle bg-o-color-3" remove="rounded bg-o-color-2" separator=" "/>
-    </xpath>
-    <!-- Icon #6 -->
-    <xpath expr="(//i)[6]" position="attributes">
-        <attribute name="class" add="rounded-circle bg-o-color-3" remove="rounded bg-o-color-2" separator=" "/>
-    </xpath>
-</template>
-
 <!-- ==== Pricelist ===== -->
 <template id="s_product_catalog" inherit_id="website.s_product_catalog" name="Paptic s_product_catalog">
     <!-- Filter -->
diff --git a/theme_vehicle/views/customizations.xml b/theme_vehicle/views/customizations.xml
index fedc6f230..d2415a6dd 100644
--- a/theme_vehicle/views/customizations.xml
+++ b/theme_vehicle/views/customizations.xml
@@ -278,27 +278,27 @@
     </xpath>
     <!-- Item #1 -->
     <xpath expr="//i" position="attributes">
-        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-1" remove="rounded-circle bg-o-color-1" separator=" "/>
+        <attribute name="class" add="text-o-color-1" separator=" "/>
     </xpath>
     <!-- Item #2 -->
     <xpath expr="(//i)[2]" position="attributes">
-        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-1" remove="rounded-circle bg-o-color-1" separator=" "/>
+        <attribute name="class" add="text-o-color-1" separator=" "/>
     </xpath>
         <!-- Item #3 -->
     <xpath expr="(//i)[3]" position="attributes">
-        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-1" remove="rounded-circle bg-o-color-1" separator=" "/>
+        <attribute name="class" add="text-o-color-1" separator=" "/>
     </xpath>
     <!-- Item #4 -->
     <xpath expr="(//i)[4]" position="attributes">
-        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-2" remove="rounded bg-o-color-2" separator=" "/>
+        <attribute name="class" add="text-o-color-1" separator=" "/>
     </xpath>
     <!-- Item #5 -->
     <xpath expr="(//i)[5]" position="attributes">
-        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-2" remove="rounded bg-o-color-2" separator=" "/>
+        <attribute name="class" add="text-o-color-1" separator=" "/>
     </xpath>
     <!-- Item #6 -->
     <xpath expr="(//i)[6]" position="attributes">
-        <attribute name="class" add="rounded-0 bg-o-color-3 text-o-color-2" remove="rounded bg-o-color-2" separator=" "/>
+        <attribute name="class" add="text-o-color-1" separator=" "/>
     </xpath>
 </template>