diff --git a/test_themes/tests/test_new_page_templates.py b/test_themes/tests/test_new_page_templates.py
index a7e8bbeb8..1ec104593 100644
--- a/test_themes/tests/test_new_page_templates.py
+++ b/test_themes/tests/test_new_page_templates.py
@@ -103,6 +103,7 @@ CONFLICTUAL_CLASSES_RE = {
         's_timeline_card',
         's_website_form_custom', 's_website_form_dnone', 's_website_form_field', 's_website_form_input', 's_website_form_mark', 's_website_form_submit', 's_website_form_no_submit_label',
         's_donation_btn', 's_donation_custom_btn', 's_newsletter_subscribe_form_input_small',
+        's_tabs_common', 's_tabs_nav_vertical', 's_tabs_nav_with_descriptions',
     ],
     # Text
     re.compile(r'^text-(?!(center|end|start|bg-|lg-)).*$'): [
diff --git a/theme_artists/__manifest__.py b/theme_artists/__manifest__.py
index d76792e29..18ffcd658 100644
--- a/theme_artists/__manifest__.py
+++ b/theme_artists/__manifest__.py
@@ -97,6 +97,7 @@
         'views/snippets/s_striped.xml',
         'views/snippets/s_table_of_content.xml',
         'views/snippets/s_tabs.xml',
+        'views/snippets/s_tabs_images.xml',
         'views/snippets/s_timeline.xml',
         'views/snippets/s_timeline_images.xml',
         'views/snippets/s_timeline_list.xml',
diff --git a/theme_artists/views/snippets/s_tabs_images.xml b/theme_artists/views/snippets/s_tabs_images.xml
new file mode 100644
index 000000000..23ff164e8
--- /dev/null
+++ b/theme_artists/views/snippets/s_tabs_images.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_tabs_images" inherit_id="website.s_tabs_images">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc5" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_bistro/views/images_library.xml b/theme_bistro/views/images_library.xml
index e0b7babf7..24c69a60a 100644
--- a/theme_bistro/views/images_library.xml
+++ b/theme_bistro/views/images_library.xml
@@ -629,4 +629,11 @@
     <field name="url">/theme_bistro/static/src/img/content/s_split_intro_default_image.jpg</field>
 </record>
 
+<!-- Tabs Images -->
+<record id="s_tabs_images_default_image_5" model="theme.ir.attachment">
+    <field name="key">website.s_tabs_images_default_image_5</field>
+    <field name="name">website.s_tabs_images_default_image_5</field>
+    <field name="url">/theme_bistro/static/src/img/backgrounds/12.jpg</field>
+</record>
+
 </odoo>
diff --git a/theme_buzzy/views/images_library.xml b/theme_buzzy/views/images_library.xml
index 5c53bde07..6e987054d 100644
--- a/theme_buzzy/views/images_library.xml
+++ b/theme_buzzy/views/images_library.xml
@@ -335,6 +335,16 @@
     <field name="name">website.s_split_intro_default_image</field>
     <field name="url">/theme_buzzy/static/src/img/photos/s_split_intro_default_image.jpg</field>
 </record>
-
+<!-- Tabs Images -->
+<record id="s_tabs_images_default_image_4" model="theme.ir.attachment">
+    <field name="key">website.s_tabs_images_default_image_4</field>
+    <field name="name">website.s_tabs_images_default_image_4</field>
+    <field name="url">/theme_buzzy/static/src/img/photos/s_cover_default_image.jpg</field>
+</record>
+<record id="s_tabs_images_default_image_5" model="theme.ir.attachment">
+    <field name="key">website.s_tabs_images_default_image_5</field>
+    <field name="name">website.s_tabs_images_default_image_5</field>
+    <field name="url">/theme_buzzy/static/src/img/photos/library_image_13.jpg</field>
+</record>
 
 </odoo>
diff --git a/theme_nano/__manifest__.py b/theme_nano/__manifest__.py
index f7d3d04ee..d24d09f09 100644
--- a/theme_nano/__manifest__.py
+++ b/theme_nano/__manifest__.py
@@ -39,6 +39,7 @@
         'views/snippets/s_numbers_showcase.xml',
         'views/snippets/s_key_benefits.xml',
         'views/snippets/s_striped_center_top.xml',
+        'views/snippets/s_tabs_images.xml',
         'views/snippets/s_big_number.xml',
         'views/snippets/s_image_frame.xml',
         'views/snippets/s_shape_image.xml',
diff --git a/theme_nano/views/snippets/s_tabs_images.xml b/theme_nano/views/snippets/s_tabs_images.xml
new file mode 100644
index 000000000..23ff164e8
--- /dev/null
+++ b/theme_nano/views/snippets/s_tabs_images.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_tabs_images" inherit_id="website.s_tabs_images">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc5" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_notes/__manifest__.py b/theme_notes/__manifest__.py
index d2429bea0..ea46b6d29 100644
--- a/theme_notes/__manifest__.py
+++ b/theme_notes/__manifest__.py
@@ -15,6 +15,7 @@
         'views/snippets/s_carousel.xml',
         'views/snippets/s_striped.xml',
         'views/snippets/s_striped_top.xml',
+        'views/snippets/s_tabs_images.xml',
         'views/snippets/s_cards_grid.xml',
         'views/snippets/s_carousel_intro.xml',
         'views/snippets/s_comparisons_horizontal.xml',
diff --git a/theme_notes/views/snippets/s_tabs_images.xml b/theme_notes/views/snippets/s_tabs_images.xml
new file mode 100644
index 000000000..23ff164e8
--- /dev/null
+++ b/theme_notes/views/snippets/s_tabs_images.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="s_tabs_images" inherit_id="website.s_tabs_images">
+    <!-- Section -->
+    <xpath expr="//section" position="attributes">
+        <attribute name="class" add="o_cc o_cc5" separator=" "/>
+    </xpath>
+</template>
+
+</odoo>
diff --git a/theme_treehouse/views/images_library.xml b/theme_treehouse/views/images_library.xml
index dbd2466f9..720afbb05 100644
--- a/theme_treehouse/views/images_library.xml
+++ b/theme_treehouse/views/images_library.xml
@@ -571,6 +571,17 @@
     <field name="name">website.s_faq_horizontal_default_image_1</field>
     <field name="url">/theme_treehouse/static/src/img/backgrounds/15.jpg</field>
 </record>
+<!-- Tabs Images -->
+<record id="s_tabs_images_default_image_4" model="theme.ir.attachment">
+    <field name="key">website.s_tabs_images_default_image_4</field>
+    <field name="name">website.s_tabs_images_default_image_4</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/16.jpg</field>
+</record>
+<record id="s_tabs_images_default_image_5" model="theme.ir.attachment">
+    <field name="key">website.s_tabs_images_default_image_5</field>
+    <field name="name">website.s_tabs_images_default_image_5</field>
+    <field name="url">/theme_treehouse/static/src/img/backgrounds/10.jpg</field>
+</record>
 
 <!-- Website Form Overlay -->
 <record id="s_website_form_overlay_default_image" model="theme.ir.attachment">
diff --git a/theme_treehouse/views/snippets/s_tabs.xml b/theme_treehouse/views/snippets/s_tabs.xml
index d0e6c1752..a6d8f5360 100644
--- a/theme_treehouse/views/snippets/s_tabs.xml
+++ b/theme_treehouse/views/snippets/s_tabs.xml
@@ -11,10 +11,10 @@
         <attribute name="class" add="card" separator=" "/>
     </xpath>
     <xpath expr="//*[hasclass('s_tabs_nav')]" position="attributes">
-        <attribute name="class" add="card-header o_cc o_cc4 border-0 px-0 overflow-x-auto overflow-y-hidden" remove="mb-3" separator=" "/>
+        <attribute name="class" add="card-header o_cc o_cc4 border-0 px-0" remove="mb-3" separator=" "/>
     </xpath>
     <xpath expr="//*[hasclass('nav')]" position="attributes">
-        <attribute name="class" add="nav-tabs card-header-tabs mx-0 px-2 border-bottom" remove="nav-underline overflow-y-hidden overflow-x-auto" separator=" "/>
+        <attribute name="class" add="nav-tabs card-header-tabs mx-0 px-2 border-bottom" remove="nav-underline" separator=" "/>
     </xpath>
     <xpath expr="//*[hasclass('s_tabs_content')]" position="attributes">
         <attribute name="class" add="p-3" separator=" "/>
diff --git a/theme_zap/views/images_library.xml b/theme_zap/views/images_library.xml
index 4d7d16f16..dff3c562d 100644
--- a/theme_zap/views/images_library.xml
+++ b/theme_zap/views/images_library.xml
@@ -513,4 +513,16 @@
     <field name="url">/theme_zap/static/src/img/backgrounds/04.jpg</field>
 </record>
 
+<!-- Tabs Images -->
+<record id="s_tabs_images_default_image_4" model="theme.ir.attachment">
+    <field name="key">website.s_tabs_images_default_image_4</field>
+    <field name="name">website.s_tabs_images_default_image_4</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/13.jpg</field>
+</record>
+<record id="s_tabs_images_default_image_5" model="theme.ir.attachment">
+    <field name="key">website.s_tabs_images_default_image_5</field>
+    <field name="name">website.s_tabs_images_default_image_5</field>
+    <field name="url">/theme_zap/static/src/img/backgrounds/06.jpg</field>
+</record>
+
 </odoo>