diff --git a/test_themes/tests/test_new_page_templates.py b/test_themes/tests/test_new_page_templates.py
index 3cd5007a5..fe6772e56 100644
--- a/test_themes/tests/test_new_page_templates.py
+++ b/test_themes/tests/test_new_page_templates.py
@@ -75,7 +75,7 @@ CONFLICTUAL_CLASSES_RE = {
     # Snippets
     re.compile(r'^s_.*'): [
         's_alert_md',
-        's_blockquote_classic',
+        's_blockquote_with_icon', 's_blockquote',
         's_carousel_bordered', 's_carousel_default', 's_carousel_rounded',
         's_dynamic', 's_dynamic_empty', 's_dynamic_snippet_blog_posts',
         's_blog_posts_effect_marley', 's_blog_post_big_picture',
diff --git a/theme_buzzy/views/snippets/s_blockquote.xml b/theme_buzzy/views/snippets/s_blockquote.xml
index 944cf7be2..3797cdf27 100644
--- a/theme_buzzy/views/snippets/s_blockquote.xml
+++ b/theme_buzzy/views/snippets/s_blockquote.xml
@@ -3,8 +3,8 @@
 
 <template id="s_blockquote" inherit_id="website.s_blockquote">
     <!-- Icon -->
-    <xpath expr="//i" position="attributes">
-        <attribute name="class" add="bg-o-color-1" remove="bg-o-color-2" separator=" "/>
+    <xpath expr="//blockquote" position="attributes">
+        <attribute name="class" add="o_cc1" remove="o_cc2" separator=" "/>
     </xpath>
 </template>