diff --git a/src/docs/src/components/LangChange.svelte b/src/docs/src/components/LangChange.svelte
index c71612d426e..28ec78a67be 100644
--- a/src/docs/src/components/LangChange.svelte
+++ b/src/docs/src/components/LangChange.svelte
@@ -6,7 +6,7 @@
 <div title="Change Language" class="dropdown dropdown-end">
   <div tabindex="0" role="button" class="btn btn-ghost" aria-label="Language">
     <svg
-      class="h-5 w-5 fill-current"
+      class="h-4 w-4 fill-current"
       xmlns="http://www.w3.org/2000/svg"
       width="20"
       height="20"
diff --git a/src/docs/src/components/Navbar.svelte b/src/docs/src/components/Navbar.svelte
index 99cc02019ee..10d289d00e2 100644
--- a/src/docs/src/components/Navbar.svelte
+++ b/src/docs/src/components/Navbar.svelte
@@ -105,7 +105,7 @@
     </div>
     <div class="flex-0">
       {#if showComponentsBtn}
-        <div class={`hidden flex-none items-center lg:block`}>
+        <div class="hidden flex-none items-center lg:block">
           <a
             data-sveltekit-preload-data
             href="/components/"
@@ -122,6 +122,15 @@
             {$t("components-btn")}
           </a>
         </div>
+
+        <div class="hidden flex-none items-center lg:block">
+          <a
+            data-sveltekit-preload-data
+            href="/store/"
+            class="btn btn-ghost drawer-button font-normal">
+            {$t("Store")}
+          </a>
+        </div>
       {/if}
       {#await import("./ThemeChange.svelte")}
         <div class="btn btn-ghost cursor-wait">
@@ -156,7 +165,7 @@
         {#await import("./LangChange.svelte")}
           <div class="btn btn-ghost cursor-wait">
             <svg
-              class="h-5 w-5 fill-current"
+              class="h-4 w-4 fill-current"
               xmlns="http://www.w3.org/2000/svg"
               width="20"
               height="20"
diff --git a/src/docs/src/lib/data/pages.js b/src/docs/src/lib/data/pages.js
index 51c67b1e2fd..72d6e3d8d7b 100644
--- a/src/docs/src/lib/data/pages.js
+++ b/src/docs/src/lib/data/pages.js
@@ -1,4 +1,11 @@
-export const pagesThatDontNeedSidebar = ["/", "/blog/", "/blog/*/", "/store/", "/resources/*/"]
+export const pagesThatDontNeedSidebar = [
+  "/",
+  "/components/",
+  "/blog/",
+  "/blog/*/",
+  "/store/",
+  "/resources/*/",
+]
 
 export const pages = [
   {
diff --git a/src/docs/src/routes/(docs)/components/+page.svelte b/src/docs/src/routes/(docs)/components/+page.svelte
index 33d517986c8..29e41c50d04 100644
--- a/src/docs/src/routes/(docs)/components/+page.svelte
+++ b/src/docs/src/routes/(docs)/components/+page.svelte
@@ -9,13 +9,13 @@
 
 <SEO title="Components" desc="Tailwind CSS component examples by daisyUI" />
 <div class="flex flex-col-reverse justify-between gap-6 xl:flex-row">
-  <div class="flex flex-col gap-6 pt-10">
+  <div class="flex flex-col gap-6 ps-6 pt-10">
     <div class="prose max-w-4xl flex-grow">
       <h1><Translate text="All daisyUI components" /></h1>
       <p>{Object.keys(components).length} <Translate text="components" /></p>
     </div>
     <div
-      class="not-prose grid grid-cols-1 gap-x-6 gap-y-12 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-2 xl:grid-cols-3">
+      class="not-prose grid grid-cols-1 gap-x-6 gap-y-12 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-3 xl:grid-cols-4">
       {#each components as { slug, title, desc }}
         <a
           class="card card-compact hover:bg-base-200 transition-all duration-200 hover:-translate-y-1"
diff --git a/src/docs/src/translation/ar.json b/src/docs/src/translation/ar.json
index 734b3de26fb..b59d0acd5c4 100644
--- a/src/docs/src/translation/ar.json
+++ b/src/docs/src/translation/ar.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "العناصر",
   "cta-2": "طريقة الاستعمال",
   "components-btn": "العناصر",
+  "Store": "المتجر",
   "change-theme-btn": "تصميم",
   "all-components-btn": "جميع العناصر",
   "components": "عناصر",
diff --git a/src/docs/src/translation/bn.json b/src/docs/src/translation/bn.json
index 1587f5e717b..e4ce733cf8c 100644
--- a/src/docs/src/translation/bn.json
+++ b/src/docs/src/translation/bn.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "কম্পোনেন্টস",
   "cta-2": "কিভাবে ব্যাবহার করবেন?",
   "components-btn": "কম্পোনেন্টস",
+  "Store": "স্টোর",
   "change-theme-btn": "থিম",
   "all-components-btn": "সবগুলো কম্পোনেন্টস দেখুন",
   "components": "কম্পোনেন্টস",
diff --git a/src/docs/src/translation/de.json b/src/docs/src/translation/de.json
index 2458b9865eb..307fdedfee5 100644
--- a/src/docs/src/translation/de.json
+++ b/src/docs/src/translation/de.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "Komponenten",
   "cta-2": "Wie wird es benutzt?",
   "components-btn": "Komponenten",
+  "Store": "Speichern",
   "change-theme-btn": "Thema",
   "all-components-btn": "Alle Komponenten ansehen",
   "components": "Komponenten",
diff --git a/src/docs/src/translation/en.json b/src/docs/src/translation/en.json
index f77f18cad4f..f13a12b6cbf 100644
--- a/src/docs/src/translation/en.json
+++ b/src/docs/src/translation/en.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "Components",
   "cta-2": "How to use?",
   "components-btn": "Components",
+  "Store": "Store",
   "change-theme-btn": "Theme",
   "all-components-btn": "See All Components",
   "components": "Components",
diff --git a/src/docs/src/translation/es.json b/src/docs/src/translation/es.json
index 947966f9fd5..eb396af6fdb 100644
--- a/src/docs/src/translation/es.json
+++ b/src/docs/src/translation/es.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "Componentes",
   "cta-2": "¿Cómo utilizar?",
   "components-btn": "Componentes",
+  "Store": "Tienda",
   "change-theme-btn": "Tema",
   "all-components-btn": "Ver componentes",
   "components": "Componentes",
diff --git a/src/docs/src/translation/fa.json b/src/docs/src/translation/fa.json
index 32b53254c02..1e0c80f92a5 100644
--- a/src/docs/src/translation/fa.json
+++ b/src/docs/src/translation/fa.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "کامپوننت‌ها",
   "cta-2": "چگونه استفاده کنیم؟",
   "components-btn": "کامپوننت‌ها",
+  "Store": "فروشگاه",
   "change-theme-btn": "تم",
   "all-components-btn": "همه‌ی کامپوننت‌ها را ببینید",
   "components": "کامپوننت",
diff --git a/src/docs/src/translation/fr.json b/src/docs/src/translation/fr.json
index 6336fb3f7b0..f9545249e07 100644
--- a/src/docs/src/translation/fr.json
+++ b/src/docs/src/translation/fr.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "Composants",
   "cta-2": "Comment l'utiliser ?",
   "components-btn": "Composants",
+  "Store": "Magasin",
   "change-theme-btn": "Thème",
   "all-components-btn": "Voir tous les composants",
   "components": "Composants",
diff --git a/src/docs/src/translation/id.json b/src/docs/src/translation/id.json
index 1af31f6b73b..4e8908e9e0d 100644
--- a/src/docs/src/translation/id.json
+++ b/src/docs/src/translation/id.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "Komponen",
   "cta-2": "Cara pemakaian",
   "components-btn": "Komponen",
+  "Store": "Toko",
   "change-theme-btn": "Tema",
   "all-components-btn": "Lihat semua komponen",
   "components": "Komponen",
diff --git a/src/docs/src/translation/it.json b/src/docs/src/translation/it.json
index c4a24075f26..e1a3b4477fb 100644
--- a/src/docs/src/translation/it.json
+++ b/src/docs/src/translation/it.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "Componenti",
   "cta-2": "Come usare?",
   "components-btn": "Componenti",
+  "Store": "Negozio",
   "change-theme-btn": "Tema",
   "all-components-btn": "Vedi tutti i componenti",
   "components": "Componenti",
diff --git a/src/docs/src/translation/ja.json b/src/docs/src/translation/ja.json
index 1271e099f0a..452b6289952 100644
--- a/src/docs/src/translation/ja.json
+++ b/src/docs/src/translation/ja.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "コンポーネント",
   "cta-2": "使い方を見る",
   "components-btn": "コンポーネント",
+  "Store": "ストア",
   "change-theme-btn": "テーマ",
   "all-components-btn": "すべてのコンポーネントを表示",
   "components": "コンポーネント",
diff --git a/src/docs/src/translation/ko.json b/src/docs/src/translation/ko.json
index 36341f93174..46888108004 100644
--- a/src/docs/src/translation/ko.json
+++ b/src/docs/src/translation/ko.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "컴포넌트",
   "cta-2": "시작하기",
   "components-btn": "컴포넌트",
+  "Store": "스토어",
   "change-theme-btn": "테마",
   "all-components-btn": "모든 컴포넌트 보기",
   "components": "컴포넌트 개수",
diff --git a/src/docs/src/translation/ms.json b/src/docs/src/translation/ms.json
index 169858d8784..c30b4dcf097 100644
--- a/src/docs/src/translation/ms.json
+++ b/src/docs/src/translation/ms.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "Komponen",
   "cta-2": "Cara untuk guna?",
   "components-btn": "Komponen",
+  "Store": "Simpan",
   "change-theme-btn": "Tema",
   "all-components-btn": "Lihat semua komponen",
   "components": "Komponen",
diff --git a/src/docs/src/translation/pl.json b/src/docs/src/translation/pl.json
index ed2aef4bb4c..2c1f6675008 100644
--- a/src/docs/src/translation/pl.json
+++ b/src/docs/src/translation/pl.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "Komponenty",
   "cta-2": "Jak używać?",
   "components-btn": "Komponenty",
+  "Store": "Sklep",
   "change-theme-btn": "Motyw",
   "all-components-btn": "Zobacz wszystkie komponenty",
   "components": "Komponenty",
diff --git a/src/docs/src/translation/pt.json b/src/docs/src/translation/pt.json
index 9ab5a215e64..27494d3bae0 100644
--- a/src/docs/src/translation/pt.json
+++ b/src/docs/src/translation/pt.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "Componentes",
   "cta-2": "Como utilizar?",
   "components-btn": "Componentes",
+  "Store": "Loja",
   "change-theme-btn": "Tema",
   "all-components-btn": "Ver todos os componentes",
   "components": "Componentes",
diff --git a/src/docs/src/translation/ru.json b/src/docs/src/translation/ru.json
index 2bc19c03051..eb3929eeeff 100644
--- a/src/docs/src/translation/ru.json
+++ b/src/docs/src/translation/ru.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "Компоненты",
   "cta-2": "Как пользоваться?",
   "components-btn": "Компоненты",
+  "Store": "Магазин",
   "change-theme-btn": "Темы",
   "all-components-btn": "Все компоненты",
   "components": "Компонентов",
diff --git a/src/docs/src/translation/uk.json b/src/docs/src/translation/uk.json
index 140d0f44623..68f2bbf7103 100644
--- a/src/docs/src/translation/uk.json
+++ b/src/docs/src/translation/uk.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "Компоненти",
   "cta-2": "Як користуватися?",
   "components-btn": "Компоненти",
+  "Store": "Store",
   "change-theme-btn": "Теми",
   "all-components-btn": "Всі Компоненти",
   "components": "Компоненти",
diff --git a/src/docs/src/translation/vi.json b/src/docs/src/translation/vi.json
index 7685dc00742..e02276ebf86 100644
--- a/src/docs/src/translation/vi.json
+++ b/src/docs/src/translation/vi.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "Các thành phần",
   "cta-2": "Sử dụng thế nào?",
   "components-btn": "Các thành phần",
+  "Store": "Cửa hàng",
   "change-theme-btn": "Chủ đề",
   "all-components-btn": "Xem tất cả các thành phần",
   "components": "Components",
diff --git a/src/docs/src/translation/zh_hans.json b/src/docs/src/translation/zh_hans.json
index 6703ce18501..09f9ee2b6b1 100644
--- a/src/docs/src/translation/zh_hans.json
+++ b/src/docs/src/translation/zh_hans.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "组件",
   "cta-2": "阅读使用方法",
   "components-btn": "组件",
+  "Store": "商店",
   "change-theme-btn": "主题",
   "all-components-btn": "查看全部组件",
   "components": "组件",
@@ -461,7 +462,6 @@
   "Using <code>&lt;a&gt;</code> anchor links: A link adds a parameter to the URL and you only see the modal when the URL has that parameter": "使用 <code>&lt;a&gt;</code> 锚点链接：链接向 URL 添加一个参数，只有当 URL 具有该参数时，您才会看到模态框",
   "This component is deprecated and will be removed in the next major version. Use <a class='link' href='/components/join/'>Join</a> instead.": "这个组件已经被弃用，并且将在下一个主要版本中被移除。请使用 <a class='link' href='/components/join/'>Join</a> 代替。",
   "Playground": "示例",
-  "Store": "商店",
   "Blog": "博客",
   "Resources": "资源",
   "Sponsors": "赞助商",
diff --git a/src/docs/src/translation/zh_hant.json b/src/docs/src/translation/zh_hant.json
index e8c70ce041f..060874504c5 100644
--- a/src/docs/src/translation/zh_hant.json
+++ b/src/docs/src/translation/zh_hant.json
@@ -8,6 +8,7 @@
   "cta-1-mobile": "元件",
   "cta-2": "如何使用？",
   "components-btn": "元件",
+  "Store": "商店",
   "change-theme-btn": "主題",
   "all-components-btn": "查看所有元件",
   "components": "個元件",