diff --git a/.changeset/2023-12-03-update-icons.md b/.changeset/2023-12-03-update-icons.md
deleted file mode 100644
index 22c25f85c1..0000000000
--- a/.changeset/2023-12-03-update-icons.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@swisspost/design-system-icons': patch
----
-
-Added icons number 2493, 2557, 2558, 2559, 2560, 2561, 2562, 2563, 2564 and 2565.Updated icons number 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1029, 1030, 1031, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 2000, 2001, 2002, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021, 2022, 2023, 2024, 2025, 2026, 2027, 2028, 2029, 2030, 2032, 2034, 2036, 2053, 2054, 2057, 2059, 2060, 2062, 2069, 2071, 2072, 2073, 2074, 2075, 2076, 2077, 2078, 2079, 2080, 2081, 2082, 2083, 2084, 2085, 2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2099, 2100, 2102, 2103, 2104, 2106, 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, 2118, 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129, 2130, 2131, 2132, 2133, 2134, 2135, 2136, 2137, 2138, 2139, 2140, 2141, 2142, 2143, 2144, 2145, 2146, 2147, 2148, 2149, 2150, 2151, 2152, 2153, 2154, 2155, 2156, 2157, 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2166, 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, 2177, 2178, 2179, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189, 2190, 2191, 2192, 2193, 2194, 2195, 2196, 2197, 2198, 2199, 2200, 2201, 2202, 2203, 2205, 2206, 2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, 2215, 2216, 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237, 2238, 2239, 2240, 2241, 2242, 2243, 2244, 2245, 2246, 2247, 2248, 2249, 2250, 2251, 2252, 2253, 2254, 2255, 2256, 2257, 2258, 2259, 2260, 2261, 2262, 2263, 2264, 2265, 2266, 2267, 2268, 2269, 2270, 2271, 2272, 2273, 2274, 2275, 2276, 2277, 2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, 2286, 2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2296, 2297, 2298, 2299, 2300, 2301, 2302, 2303, 2304, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, 2320, 2321, 2322, 2323, 2324, 2325, 2326, 2327, 2328, 2329, 2330, 2331, 2332, 2333, 2334, 2335, 2336, 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2344, 2345, 2346, 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2354, 2355, 2356, 2357, 2358, 2359, 2360, 2361, 2362, 2363, 2364, 2365, 2366, 2367, 2368, 2369, 2370, 2371, 2372, 2373, 2374, 2375, 2376, 2377, 2378, 2379, 2380, 2381, 2382, 2383, 2384, 2385, 2386, 2387, 2388, 2389, 2390, 2391, 2392, 2393, 2394, 2395, 2396, 2397, 2398, 2399, 2400, 2401, 2402, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 2410, 2411, 2412, 2413, 2414, 2415, 2416, 2417, 2418, 2419, 2420, 2421, 2422, 2423, 2424, 2425, 2426, 2427, 2428, 2429, 2430, 2431, 2432, 2433, 2434, 2435, 2436, 2437, 2438, 2439, 2440, 2441, 2442, 2443, 2444, 2445, 2446, 2447, 2448, 2449, 2450, 2451, 2452, 2453, 2454, 2455, 2456, 2457, 2458, 2459, 2460, 2461, 2462, 2463, 2464, 2465, 2466, 2467, 2468, 2469, 2470, 2471, 2472, 2473, 2474, 2475, 2476, 2477, 2478, 2479, 2480, 2481, 2482, 2483, 2484, 2485, 2486, 2487, 2488, 2489, 2490, 2491, 2492, 2494, 2495, 2496, 2497, 2498, 2499, 2500, 2501, 2502, 2503, 2504, 2505, 2506, 2507, 2508, 2509, 2510, 2511, 2512, 2513, 2514, 2515, 2516, 2517, 2518, 2519, 2520, 2521, 2522, 2523, 2524, 2525, 2526, 2527, 2528, 2529, 2530, 2531, 2532, 2533, 2534, 2535, 2536, 2537, 2538, 2539, 2540, 2541, 2542, 2543, 2544, 2545, 2546, 2547, 2548, 2549, 2550, 2551, 2552, 2553, 2554, 2555, 2556, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015, 3016, 3017, 3018, 3019, 3026, 3033, 3034, 3036, 3037, 3038, 3039, 3040, 3041, 3042, 3043, 3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, 3054, 3055, 3056, 3057, 3058, 3059, 3060, 3061, 3062, 3063, 3064, 3065, 3066, 3067, 3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 3076, 3077, 3078, 3079, 3080, 3081, 3082, 3083, 3084, 3085, 3086, 3087, 3088, 3089, 3090, 3091, 3092, 3093, 3094, 3095, 3096, 3097, 3098, 3099, 3100, 3101, 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3110, 3111, 3112, 3113, 3114, 3115, 3116, 3117, 3118, 3119, 3120, 3121, 3122, 3123, 3124, 3125, 3126, 3127, 3128, 3129, 3130, 3131, 3132, 3133, 3134, 3135, 3137, 3138, 3139, 3140, 3141, 3142, 3143, 3146, 3147, 3148, 3149, 3150, 3151, 3152, 3153, 3154, 3155, 3156, 3157, 3158, 3159, 3160, 3161, 3163, 3164, 3165, 3168, 3170, 3171, 3172, 3173, 3174, 3175, 3176, 3177, 3178, 3179, 3180, 3181, 3182, 3183, 3184, 3185, 3186, 3187, 3188, 3189, 3190, 3191, 3193, 3194, 3195, 3196, 3197, 3198, 3199, 3200, 3203, 3204, 3205, 3206, 3208, 3209, 3210, 3211, 3212, 3213, 3214, 3215, 3216, 3217, 3218, 3219, 3220, 3221, 3222, 3223, 3224, 3225, 3226, 3227, 3228, 3229, 3230, 3231, 3232, 3233, 3234, 3235, 3236, 3237, 3238, 3239, 3240, 3241, 3242, 3243, 3244, 3245, 3246, 3247, 3248, 3249, 3250, 3251, 3252, 3253, 3254, 3255, 3256, 3257, 3258, 3259, 3260, 8000, 8001, 8002, 8004, 8005, 8006, 8007, 8008, 8009, 8010, 8011, 8012, 8013, 8014, 8015, 8016, 8017, 8018 and 8019.
-
diff --git a/.changeset/big-carrots-join.md b/.changeset/big-carrots-join.md
deleted file mode 100644
index 63b3b27c56..0000000000
--- a/.changeset/big-carrots-join.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@swisspost/design-system-documentation': patch
----
-
-Removed badge size class at wrapper level. It's only used inside the label.
diff --git a/.changeset/breezy-knives-itch.md b/.changeset/breezy-knives-itch.md
deleted file mode 100644
index 04633fcb11..0000000000
--- a/.changeset/breezy-knives-itch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@swisspost/design-system-styles': patch
----
-
-Updated the accordion styles.
diff --git a/.changeset/clever-dingos-add.md b/.changeset/clever-dingos-add.md
deleted file mode 100644
index db98f84d45..0000000000
--- a/.changeset/clever-dingos-add.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@swisspost/internet-header': patch
-'@swisspost/design-system-components': patch
----
-
-Defined @stencil/core and @stencil/store as a devDependency to avoid compatibilities issues.
diff --git a/.changeset/cuddly-otters-compete.md b/.changeset/cuddly-otters-compete.md
deleted file mode 100644
index 303121c9e7..0000000000
--- a/.changeset/cuddly-otters-compete.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@swisspost/design-system-styles': patch
----
-
-Fixed overflow on datepicker select variant.
diff --git a/.changeset/empty-rules-float.md b/.changeset/empty-rules-float.md
deleted file mode 100644
index c5a2db7edd..0000000000
--- a/.changeset/empty-rules-float.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@swisspost/design-system-migrations': major
-'@swisspost/design-system-styles': minor
----
-
-Separated the migration schematics from the styles to their own package `@swisspost/design-system-migrations`.
diff --git a/.changeset/few-baboons-count.md b/.changeset/few-baboons-count.md
deleted file mode 100644
index eaebcbb7c6..0000000000
--- a/.changeset/few-baboons-count.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@swisspost/design-system-demo': patch
----
-
-- Deprecated Bootstrap accordions in favor of the post-accordion web component.
-- Updated ng-bootstrap component-based accordion example in favor of the directive-based implementation.
diff --git a/.changeset/nasty-spies-explain.md b/.changeset/nasty-spies-explain.md
deleted file mode 100644
index 3a76b9a092..0000000000
--- a/.changeset/nasty-spies-explain.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@swisspost/design-system-styles': patch
----
-
-Fixed intranet-header sticky navigation on mobile which prevent interactivity on the page within a certain viewport width.
diff --git a/.changeset/quiet-moons-begin.md b/.changeset/quiet-moons-begin.md
deleted file mode 100644
index fe08410038..0000000000
--- a/.changeset/quiet-moons-begin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@swisspost/internet-header': patch
----
-
-Fixed display of active navigation in High Contrast Mode.
diff --git a/.changeset/rotten-shirts-agree.md b/.changeset/rotten-shirts-agree.md
deleted file mode 100644
index 3318ec09d8..0000000000
--- a/.changeset/rotten-shirts-agree.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@swisspost/design-system-demo': patch
----
-
-Update the commands to run the Design System migrations.
diff --git a/.changeset/wise-vans-float.md b/.changeset/wise-vans-float.md
deleted file mode 100644
index 476123b0ac..0000000000
--- a/.changeset/wise-vans-float.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@swisspost/design-system-documentation': minor
----
-
-Added a Since v1 label on all the components that got introduced in Version 1
diff --git a/.changeset/witty-cobras-pay.md b/.changeset/witty-cobras-pay.md
deleted file mode 100644
index 1b381ebef1..0000000000
--- a/.changeset/witty-cobras-pay.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@swisspost/design-system-styles': patch
----
-
-Transformed the gap between the label and the radio/checkbox/switch into a clickable area.
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 13566b81b0..2bdf93e6ed 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -6,3 +6,5 @@
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
+
+/misc.xml
diff --git a/package.json b/package.json
index 319a4c7747..7c7a89da97 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
   "scripts": {
     "bootstrap": "pnpm install && pnpm -r build",
     "start": "pnpm docs:start",
+    "start:clean": "pnpm bootstrap && pnpm start",
     "test": "pnpm -r test",
     "unit": "pnpm -r unit",
     "e2e": "start-server-and-test docs:headless 9001 'pnpm -r --stream e2e'",
diff --git a/packages/components-react/CHANGELOG.md b/packages/components-react/CHANGELOG.md
index ca9cec24b5..9a21351254 100644
--- a/packages/components-react/CHANGELOG.md
+++ b/packages/components-react/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @swisspost/design-system-components-react
 
+## 1.0.23
+
+### Patch Changes
+
+- Updated dependencies:
+  - @swisspost/design-system-components@1.6.3
+
 ## 1.0.22
 
 ### Patch Changes
diff --git a/packages/components-react/package.json b/packages/components-react/package.json
index 09627a2a1d..93cc62e70b 100644
--- a/packages/components-react/package.json
+++ b/packages/components-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swisspost/design-system-components-react",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,7 +19,7 @@
     "tsc": "tsc -p ."
   },
   "dependencies": {
-    "@swisspost/design-system-components": "workspace:1.6.2"
+    "@swisspost/design-system-components": "workspace:1.6.3"
   },
   "devDependencies": {
     "@types/node": "18.19.2",
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index b2483d159f..e46e7a86fd 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @swisspost/design-system-components
 
+## 1.6.3
+
+### Patch Changes
+
+- Defined @stencil/core and @stencil/store as a devDependency to avoid compatibilities issues. (by [@imagoiq](https://github.com/imagoiq) with [#2313](https://github.com/swisspost/design-system/pull/2313))
+- Updated dependencies:
+  - @swisspost/design-system-styles@6.5.0
+
 ## 1.6.2
 
 ### Patch Changes
diff --git a/packages/components/package.json b/packages/components/package.json
index 2d5fe5538a..95ba90b159 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swisspost/design-system-components",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "A collection of web components built with Stencil JS for the Swiss Post Design System.",
   "license": "Apache-2.0",
   "main": "loader/index.cjs.js",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@floating-ui/dom": "1.5.3",
     "@oddbird/popover-polyfill": "0.2.3",
-    "@swisspost/design-system-styles": "workspace:6.4.4",
+    "@swisspost/design-system-styles": "workspace:6.5.0",
     "ally.js": "1.4.1",
     "long-press-event": "2.4.6"
   },
diff --git a/packages/demo/CHANGELOG.md b/packages/demo/CHANGELOG.md
index ca34d7f04f..9f7ea5035e 100644
--- a/packages/demo/CHANGELOG.md
+++ b/packages/demo/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @swisspost/design-system-demo
 
+## 7.1.1
+
+### Patch Changes
+
+- Updated ng-bootstrap component-based accordion example in favor of the directive-based implementation. (by [@gfellerph](https://github.com/gfellerph) with [#2368](https://github.com/swisspost/design-system/pull/2368))
+
+- Deprecated Bootstrap accordions in favor of the post-accordion web component. (by [@alizedebray](https://github.com/alizedebray) with [#2310](https://github.com/swisspost/design-system/pull/2310))
+
+- Update the commands to run the Design System migrations. (by [@alizedebray](https://github.com/alizedebray) with [#2270](https://github.com/swisspost/design-system/pull/2270))
+- Updated dependencies:
+  - @swisspost/design-system-styles@6.5.0
+  - @swisspost/design-system-intranet-header@5.0.5
+
 ## 7.1.0
 
 ### Minor Changes
diff --git a/packages/demo/package.json b/packages/demo/package.json
index e4cd30894c..3a1dd74288 100644
--- a/packages/demo/package.json
+++ b/packages/demo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swisspost/design-system-demo",
-  "version": "7.1.0",
+  "version": "7.1.1",
   "description": "Pattern documentation, code snippets and implementation guidelines for the Design System Styles.",
   "author": "Swiss Post <oss@post.ch>",
   "license": "Apache-2.0",
@@ -25,8 +25,8 @@
     "@ng-bootstrap/ng-bootstrap": "15.1.2",
     "@popperjs/core": "2.11.8",
     "@swimlane/ngx-datatable": "20.1.0",
-    "@swisspost/design-system-intranet-header": "workspace:5.0.4",
-    "@swisspost/design-system-styles": "workspace:6.4.4",
+    "@swisspost/design-system-intranet-header": "workspace:5.0.5",
+    "@swisspost/design-system-styles": "workspace:6.5.0",
     "bootstrap": "5.3.2",
     "core-js": "3.33.3",
     "highlight.js": "11.9.0",
diff --git a/packages/documentation/.storybook/preview.ts b/packages/documentation/.storybook/preview.ts
index 288dc1bef3..89e2a484fb 100644
--- a/packages/documentation/.storybook/preview.ts
+++ b/packages/documentation/.storybook/preview.ts
@@ -19,6 +19,7 @@ const preview: Preview = {
   parameters: {
     options: {
       storySort: {
+        method: 'alphabetical',
         order: [
           'Home',
           'Getting Started',
@@ -33,13 +34,25 @@ const preview: Preview = {
             'Accessibility',
           ],
           'Components',
-          'Internet Header',
-          ['Getting Started', 'Migration Guide', 'Header', 'Breadcrumbs', 'Footer'],
-          'Intranet Header',
-          ['Getting Started'],
-          'Icons',
-          ['Getting Started', 'Search for Icons', 'Icon Component'],
-          'Templates',
+          [
+            'Accordion',
+            'Alert',
+            'Badge',
+            'Blockquote',
+            'Button',
+            'Button Group',
+            'Card',
+            'Collapsible',
+            'Forms',
+            'Heading',
+            'Internet Header',
+            ['Getting Started'],
+            'Intranet Header',
+            ['Getting Started'],
+            'Icons',
+            ['Getting Started'],
+          ],
+          'Patterns',
           'Utilities',
           'Misc',
           ['Migration Guide', 'Changelog', 'Versions'],
diff --git a/packages/documentation/.storybook/styles/layout.scss b/packages/documentation/.storybook/styles/layout.scss
index 358828fc81..338ca9cbbb 100644
--- a/packages/documentation/.storybook/styles/layout.scss
+++ b/packages/documentation/.storybook/styles/layout.scss
@@ -2,7 +2,7 @@
 
 .docs-header {
   margin-top: -4rem;
-  background-image: url('/images/header.png');
+  background-image: url('/assets/images/header.png');
   background-repeat: no-repeat;
   background-position: center left 60vw;
   background-size: auto 100%;
diff --git a/packages/documentation/.storybook/styles/themes.ts b/packages/documentation/.storybook/styles/themes.ts
index 612a0475cb..e8332a10a5 100644
--- a/packages/documentation/.storybook/styles/themes.ts
+++ b/packages/documentation/.storybook/styles/themes.ts
@@ -34,7 +34,7 @@ export const light = create({
 
   brandTitle: 'Swiss Post Design System',
   brandUrl: 'https://design-system.post.ch',
-  brandImage: '/images/logo-swisspost.svg',
+  brandImage: '/assets/images/logo-swisspost.svg',
   brandTarget: '_self',
 });
 
@@ -72,7 +72,7 @@ export const dark = create({
 
   brandTitle: 'Swiss Post Design System',
   brandUrl: 'https://design-system.post.ch',
-  brandImage: '/images/logo-swisspost.svg',
+  brandImage: '/assets/images/logo-swisspost.svg',
   brandTarget: '_self',
 });
 
diff --git a/packages/documentation/CHANGELOG.md b/packages/documentation/CHANGELOG.md
index b218479e24..a7b9f707a5 100644
--- a/packages/documentation/CHANGELOG.md
+++ b/packages/documentation/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @swisspost/design-system-documentation
 
+## 2.6.0
+
+### Minor Changes
+
+- Added a Since v1 label on all the components that got introduced in Version 1 (by [@davidritter-dotcom](https://github.com/davidritter-dotcom) with [#2290](https://github.com/swisspost/design-system/pull/2290))
+
+### Patch Changes
+
+- Removed badge size class at wrapper level. It's only used inside the label. (by [@imagoiq](https://github.com/imagoiq) with [#2294](https://github.com/swisspost/design-system/pull/2294))
+
+- Added small variant to floating label select. (by [@gfellerph](https://github.com/gfellerph) with [#2368](https://github.com/swisspost/design-system/pull/2368))
+
+- Updated select styles to match design. (by [@imagoiq](https://github.com/imagoiq) with [#2312](https://github.com/swisspost/design-system/pull/2312))
+- Updated dependencies:
+  - @swisspost/design-system-icons@1.0.16
+  - @swisspost/design-system-styles@6.5.0
+  - @swisspost/internet-header@1.13.1
+  - @swisspost/design-system-components@1.6.3
+  - @swisspost/design-system-components-react@1.0.23
+
 ## 2.5.0
 
 ### Minor Changes
diff --git a/packages/documentation/package.json b/packages/documentation/package.json
index f04ca9176e..5c2fefe73d 100644
--- a/packages/documentation/package.json
+++ b/packages/documentation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swisspost/design-system-documentation",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "Swiss Post Design System Documentation.",
   "author": "Swiss Post <oss@post.ch>",
   "license": "Apache-2.0",
@@ -25,11 +25,11 @@
     "snapshots": "percy exec -- cypress run --config-file ./cypress.snapshot.config.js --record --key 0995e768-43ec-42bd-a127-ff944a2ad8c9"
   },
   "dependencies": {
-    "@swisspost/design-system-components": "workspace:1.6.2",
-    "@swisspost/design-system-components-react": "workspace:1.0.22",
-    "@swisspost/design-system-icons": "workspace:1.0.15",
-    "@swisspost/design-system-styles": "workspace:6.4.4",
-    "@swisspost/internet-header": "workspace:1.13.0",
+    "@swisspost/design-system-components": "workspace:1.6.3",
+    "@swisspost/design-system-components-react": "workspace:1.0.23",
+    "@swisspost/design-system-icons": "workspace:1.0.16",
+    "@swisspost/design-system-styles": "workspace:6.5.0",
+    "@swisspost/internet-header": "workspace:1.13.1",
     "bootstrap": "5.3.2"
   },
   "devDependencies": {
diff --git a/packages/documentation/public/images/header.png b/packages/documentation/public/assets/images/header.png
similarity index 100%
rename from packages/documentation/public/images/header.png
rename to packages/documentation/public/assets/images/header.png
diff --git a/packages/documentation/public/images/logo-swisspost.svg b/packages/documentation/public/assets/images/logo-swisspost.svg
similarity index 100%
rename from packages/documentation/public/images/logo-swisspost.svg
rename to packages/documentation/public/assets/images/logo-swisspost.svg
diff --git a/packages/documentation/public/images/packages/components.svg b/packages/documentation/public/assets/images/packages/components.svg
similarity index 100%
rename from packages/documentation/public/images/packages/components.svg
rename to packages/documentation/public/assets/images/packages/components.svg
diff --git a/packages/documentation/public/images/packages/icons.svg b/packages/documentation/public/assets/images/packages/icons.svg
similarity index 100%
rename from packages/documentation/public/images/packages/icons.svg
rename to packages/documentation/public/assets/images/packages/icons.svg
diff --git a/packages/documentation/public/images/packages/internet-header.svg b/packages/documentation/public/assets/images/packages/internet-header.svg
similarity index 100%
rename from packages/documentation/public/images/packages/internet-header.svg
rename to packages/documentation/public/assets/images/packages/internet-header.svg
diff --git a/packages/documentation/public/images/packages/intranet-header.svg b/packages/documentation/public/assets/images/packages/intranet-header.svg
similarity index 100%
rename from packages/documentation/public/images/packages/intranet-header.svg
rename to packages/documentation/public/assets/images/packages/intranet-header.svg
diff --git a/packages/documentation/public/images/packages/styles.svg b/packages/documentation/public/assets/images/packages/styles.svg
similarity index 100%
rename from packages/documentation/public/images/packages/styles.svg
rename to packages/documentation/public/assets/images/packages/styles.svg
diff --git a/packages/documentation/public/images/technologies/logo-angular.svg b/packages/documentation/public/assets/images/technologies/logo-angular.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-angular.svg
rename to packages/documentation/public/assets/images/technologies/logo-angular.svg
diff --git a/packages/documentation/public/images/technologies/logo-bootstrap.svg b/packages/documentation/public/assets/images/technologies/logo-bootstrap.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-bootstrap.svg
rename to packages/documentation/public/assets/images/technologies/logo-bootstrap.svg
diff --git a/packages/documentation/public/images/technologies/logo-changesets.png b/packages/documentation/public/assets/images/technologies/logo-changesets.png
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-changesets.png
rename to packages/documentation/public/assets/images/technologies/logo-changesets.png
diff --git a/packages/documentation/public/images/technologies/logo-cypress.svg b/packages/documentation/public/assets/images/technologies/logo-cypress.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-cypress.svg
rename to packages/documentation/public/assets/images/technologies/logo-cypress.svg
diff --git a/packages/documentation/public/images/technologies/logo-figma.svg b/packages/documentation/public/assets/images/technologies/logo-figma.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-figma.svg
rename to packages/documentation/public/assets/images/technologies/logo-figma.svg
diff --git a/packages/documentation/public/images/technologies/logo-github.svg b/packages/documentation/public/assets/images/technologies/logo-github.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-github.svg
rename to packages/documentation/public/assets/images/technologies/logo-github.svg
diff --git a/packages/documentation/public/images/technologies/logo-gulp.svg b/packages/documentation/public/assets/images/technologies/logo-gulp.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-gulp.svg
rename to packages/documentation/public/assets/images/technologies/logo-gulp.svg
diff --git a/packages/documentation/public/images/technologies/logo-jest.svg b/packages/documentation/public/assets/images/technologies/logo-jest.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-jest.svg
rename to packages/documentation/public/assets/images/technologies/logo-jest.svg
diff --git a/packages/documentation/public/images/technologies/logo-percy.svg b/packages/documentation/public/assets/images/technologies/logo-percy.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-percy.svg
rename to packages/documentation/public/assets/images/technologies/logo-percy.svg
diff --git a/packages/documentation/public/images/technologies/logo-pnpm.svg b/packages/documentation/public/assets/images/technologies/logo-pnpm.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-pnpm.svg
rename to packages/documentation/public/assets/images/technologies/logo-pnpm.svg
diff --git a/packages/documentation/public/images/technologies/logo-react.svg b/packages/documentation/public/assets/images/technologies/logo-react.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-react.svg
rename to packages/documentation/public/assets/images/technologies/logo-react.svg
diff --git a/packages/documentation/public/images/technologies/logo-sass.svg b/packages/documentation/public/assets/images/technologies/logo-sass.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-sass.svg
rename to packages/documentation/public/assets/images/technologies/logo-sass.svg
diff --git a/packages/documentation/public/images/technologies/logo-stencil.png b/packages/documentation/public/assets/images/technologies/logo-stencil.png
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-stencil.png
rename to packages/documentation/public/assets/images/technologies/logo-stencil.png
diff --git a/packages/documentation/public/images/technologies/logo-storybook.svg b/packages/documentation/public/assets/images/technologies/logo-storybook.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-storybook.svg
rename to packages/documentation/public/assets/images/technologies/logo-storybook.svg
diff --git a/packages/documentation/public/images/technologies/logo-svgo.svg b/packages/documentation/public/assets/images/technologies/logo-svgo.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-svgo.svg
rename to packages/documentation/public/assets/images/technologies/logo-svgo.svg
diff --git a/packages/documentation/public/images/technologies/logo-vue.svg b/packages/documentation/public/assets/images/technologies/logo-vue.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-vue.svg
rename to packages/documentation/public/assets/images/technologies/logo-vue.svg
diff --git a/packages/documentation/public/images/technologies/logo-webpack.svg b/packages/documentation/public/assets/images/technologies/logo-webpack.svg
similarity index 100%
rename from packages/documentation/public/images/technologies/logo-webpack.svg
rename to packages/documentation/public/assets/images/technologies/logo-webpack.svg
diff --git a/packages/documentation/src/stories/components/checkbox/checkbox.docs.mdx b/packages/documentation/src/stories/components/forms/checkbox/checkbox.docs.mdx
similarity index 97%
rename from packages/documentation/src/stories/components/checkbox/checkbox.docs.mdx
rename to packages/documentation/src/stories/components/forms/checkbox/checkbox.docs.mdx
index fc0bc246a9..788caca81b 100644
--- a/packages/documentation/src/stories/components/checkbox/checkbox.docs.mdx
+++ b/packages/documentation/src/stories/components/forms/checkbox/checkbox.docs.mdx
@@ -1,7 +1,7 @@
 import { Canvas, Controls, Meta, Source } from '@storybook/blocks';
 import LinkTo from '@storybook/addon-links/react';
 import * as checkboxStories from './checkbox.stories';
-import StylesPackageImport from '../../../shared/styles-package-import.mdx';
+import StylesPackageImport from '../../../../shared/styles-package-import.mdx';
 
 <Meta of={checkboxStories} />
 
diff --git a/packages/documentation/src/stories/components/checkbox/checkbox.snapshot.stories.ts b/packages/documentation/src/stories/components/forms/checkbox/checkbox.snapshot.stories.ts
similarity index 98%
rename from packages/documentation/src/stories/components/checkbox/checkbox.snapshot.stories.ts
rename to packages/documentation/src/stories/components/forms/checkbox/checkbox.snapshot.stories.ts
index 4c12131207..5c30be1ec9 100644
--- a/packages/documentation/src/stories/components/checkbox/checkbox.snapshot.stories.ts
+++ b/packages/documentation/src/stories/components/forms/checkbox/checkbox.snapshot.stories.ts
@@ -1,7 +1,7 @@
 import type { Args, StoryContext, StoryObj } from '@storybook/web-components';
 import meta, { Inline } from './checkbox.stories';
 import { html } from 'lit';
-import { bombArgs } from '../../../utils';
+import { bombArgs } from '../../../../utils';
 
 export default {
   ...meta,
diff --git a/packages/documentation/src/stories/components/checkbox/checkbox.stories.ts b/packages/documentation/src/stories/components/forms/checkbox/checkbox.stories.ts
similarity index 97%
rename from packages/documentation/src/stories/components/checkbox/checkbox.stories.ts
rename to packages/documentation/src/stories/components/forms/checkbox/checkbox.stories.ts
index 5acff93b50..1b48d5df46 100644
--- a/packages/documentation/src/stories/components/checkbox/checkbox.stories.ts
+++ b/packages/documentation/src/stories/components/forms/checkbox/checkbox.stories.ts
@@ -2,11 +2,11 @@ import { useArgs } from '@storybook/preview-api';
 import type { Args, Meta, StoryContext, StoryObj } from '@storybook/web-components';
 import { html, nothing } from 'lit';
 import { ifDefined } from 'lit/directives/if-defined.js';
-import { BADGE } from '../../../../.storybook/constants';
-import { mapClasses } from '../../../utils';
+import { BADGE } from '../../../../../.storybook/constants';
+import { mapClasses } from '../../../../utils';
 
 const meta: Meta = {
-  title: 'Components/Checkbox',
+  title: 'Components/Forms/Checkbox',
   render: renderCheckbox,
   parameters: {
     badges: [BADGE.NEEDS_REVISION],
diff --git a/packages/documentation/src/stories/components/choice-card/checkbox-card.docs.mdx b/packages/documentation/src/stories/components/forms/choice-card/checkbox-card.docs.mdx
similarity index 96%
rename from packages/documentation/src/stories/components/choice-card/checkbox-card.docs.mdx
rename to packages/documentation/src/stories/components/forms/choice-card/checkbox-card.docs.mdx
index d43638fb22..0d122c2618 100644
--- a/packages/documentation/src/stories/components/choice-card/checkbox-card.docs.mdx
+++ b/packages/documentation/src/stories/components/forms/choice-card/checkbox-card.docs.mdx
@@ -1,6 +1,6 @@
 import { Meta, Canvas, Controls, Source } from '@storybook/blocks';
 import * as CheckboxCardStories from './checkbox-card.stories';
-import StylesPackageImport from '../../../shared/styles-package-import.mdx';
+import StylesPackageImport from '../../../../shared/styles-package-import.mdx';
 import firefoxFallbackSnippet from './firefox-fallback.ts?raw';
 
 <Meta of={CheckboxCardStories} />
diff --git a/packages/documentation/src/stories/components/choice-card/checkbox-card.stories.ts b/packages/documentation/src/stories/components/forms/choice-card/checkbox-card.stories.ts
similarity index 84%
rename from packages/documentation/src/stories/components/choice-card/checkbox-card.stories.ts
rename to packages/documentation/src/stories/components/forms/choice-card/checkbox-card.stories.ts
index 80ae9911e8..04e03c18e9 100644
--- a/packages/documentation/src/stories/components/choice-card/checkbox-card.stories.ts
+++ b/packages/documentation/src/stories/components/forms/choice-card/checkbox-card.stories.ts
@@ -1,9 +1,9 @@
-import { BADGE } from '../../../../.storybook/constants';
+import { BADGE } from '../../../../../.storybook/constants';
 import { choiceCardMeta, choiceCardDefault, choiceCardGroup } from './choice-card';
 
 export default {
   ...choiceCardMeta,
-  title: 'Components/Checkbox Card',
+  title: 'Components/Forms/Checkbox Card',
   parameters: {
     badges: [BADGE.NEEDS_REVISION],
   },
diff --git a/packages/documentation/src/stories/components/choice-card/choice-card.snapshot.stories.ts b/packages/documentation/src/stories/components/forms/choice-card/choice-card.snapshot.stories.ts
similarity index 89%
rename from packages/documentation/src/stories/components/choice-card/choice-card.snapshot.stories.ts
rename to packages/documentation/src/stories/components/forms/choice-card/choice-card.snapshot.stories.ts
index 9e612df209..9dc77a07d2 100644
--- a/packages/documentation/src/stories/components/choice-card/choice-card.snapshot.stories.ts
+++ b/packages/documentation/src/stories/components/forms/choice-card/choice-card.snapshot.stories.ts
@@ -1,4 +1,4 @@
-import { bombArgs } from '../../../utils';
+import { bombArgs } from '../../../../utils';
 import { choiceCardMeta, choiceCardDefault } from './choice-card';
 import { StoryObj } from '@storybook/web-components';
 import { html } from 'lit';
@@ -31,7 +31,7 @@ export const ChoiceCard: StoryObj = {
               ${bombedArgs.map(
                 args =>
                   html`
-                    <div class="col-sm-6">${choiceCardDefault({ ...args, icon: 1000 })}</div>
+                    <div class="col-sm-6">${choiceCardDefault(args)}</div>
                   `,
               )}
             </div>
diff --git a/packages/documentation/src/stories/components/choice-card/choice-card.ts b/packages/documentation/src/stories/components/forms/choice-card/choice-card.ts
similarity index 99%
rename from packages/documentation/src/stories/components/choice-card/choice-card.ts
rename to packages/documentation/src/stories/components/forms/choice-card/choice-card.ts
index 7109cec2bb..0d20993b8a 100644
--- a/packages/documentation/src/stories/components/choice-card/choice-card.ts
+++ b/packages/documentation/src/stories/components/forms/choice-card/choice-card.ts
@@ -1,7 +1,7 @@
 import type { Args, Meta } from '@storybook/web-components';
 import { html } from 'lit/static-html.js';
 import { classMap } from 'lit/directives/class-map.js';
-import { BADGE } from '../../../../.storybook/constants';
+import { BADGE } from '../../../../../.storybook/constants';
 import { nothing } from 'lit';
 import { useArgs } from '@storybook/preview-api';
 
diff --git a/packages/documentation/src/stories/components/choice-card/firefox-fallback.ts b/packages/documentation/src/stories/components/forms/choice-card/firefox-fallback.ts
similarity index 100%
rename from packages/documentation/src/stories/components/choice-card/firefox-fallback.ts
rename to packages/documentation/src/stories/components/forms/choice-card/firefox-fallback.ts
diff --git a/packages/documentation/src/stories/components/choice-card/radiobutton-card.docs.mdx b/packages/documentation/src/stories/components/forms/choice-card/radiobutton-card.docs.mdx
similarity index 96%
rename from packages/documentation/src/stories/components/choice-card/radiobutton-card.docs.mdx
rename to packages/documentation/src/stories/components/forms/choice-card/radiobutton-card.docs.mdx
index de4f868ac0..c8420bc47d 100644
--- a/packages/documentation/src/stories/components/choice-card/radiobutton-card.docs.mdx
+++ b/packages/documentation/src/stories/components/forms/choice-card/radiobutton-card.docs.mdx
@@ -1,6 +1,6 @@
 import { Meta, Canvas, Controls, Source } from '@storybook/blocks';
 import * as RadiobuttonCardStories from './radiobutton-card.stories';
-import StylesPackageImport from '../../../shared/styles-package-import.mdx';
+import StylesPackageImport from '../../../../shared/styles-package-import.mdx';
 import firefoxFallbackSnippet from './firefox-fallback.ts?raw';
 
 <Meta of={RadiobuttonCardStories} />
diff --git a/packages/documentation/src/stories/components/choice-card/radiobutton-card.stories.ts b/packages/documentation/src/stories/components/forms/choice-card/radiobutton-card.stories.ts
similarity index 83%
rename from packages/documentation/src/stories/components/choice-card/radiobutton-card.stories.ts
rename to packages/documentation/src/stories/components/forms/choice-card/radiobutton-card.stories.ts
index 32659175a0..4146a49b17 100644
--- a/packages/documentation/src/stories/components/choice-card/radiobutton-card.stories.ts
+++ b/packages/documentation/src/stories/components/forms/choice-card/radiobutton-card.stories.ts
@@ -1,9 +1,9 @@
-import { BADGE } from '../../../../.storybook/constants';
+import { BADGE } from '../../../../../.storybook/constants';
 import { choiceCardMeta, choiceCardDefault, choiceCardGroup } from './choice-card';
 
 export default {
   ...choiceCardMeta,
-  title: 'Components/Radio Button Card',
+  title: 'Components/Forms/Radio Button Card',
   parameters: {
     badges: [BADGE.NEEDS_REVISION],
   },
diff --git a/packages/documentation/src/stories/components/input-group/input-group.docs.mdx b/packages/documentation/src/stories/components/forms/input-group/input-group.docs.mdx
similarity index 100%
rename from packages/documentation/src/stories/components/input-group/input-group.docs.mdx
rename to packages/documentation/src/stories/components/forms/input-group/input-group.docs.mdx
diff --git a/packages/documentation/src/stories/icons/getting-started.stories.ts b/packages/documentation/src/stories/components/forms/input-group/input-group.stories.ts
similarity index 59%
rename from packages/documentation/src/stories/icons/getting-started.stories.ts
rename to packages/documentation/src/stories/components/forms/input-group/input-group.stories.ts
index 9a5fb8c0b6..7c2cd662d7 100644
--- a/packages/documentation/src/stories/icons/getting-started.stories.ts
+++ b/packages/documentation/src/stories/components/forms/input-group/input-group.stories.ts
@@ -1,10 +1,10 @@
 import { Meta, StoryObj } from '@storybook/web-components';
-import { BADGE } from '../../../.storybook/constants';
+import { BADGE } from '../../../../../.storybook/constants';
 
 const meta: Meta = {
-  title: 'Icons/Getting Started',
+  title: 'Components/Forms/Input Group',
   parameters: {
-    badges: [BADGE.NEEDS_REVISION],
+    badges: [BADGE.TODO],
   },
 };
 
diff --git a/packages/documentation/src/stories/components/input/input.docs.mdx b/packages/documentation/src/stories/components/forms/input/input.docs.mdx
similarity index 97%
rename from packages/documentation/src/stories/components/input/input.docs.mdx
rename to packages/documentation/src/stories/components/forms/input/input.docs.mdx
index 5e0242b618..3e9667cc5f 100644
--- a/packages/documentation/src/stories/components/input/input.docs.mdx
+++ b/packages/documentation/src/stories/components/forms/input/input.docs.mdx
@@ -1,6 +1,6 @@
 import { Canvas, Controls, Meta } from '@storybook/blocks';
 import * as InputStories from './input.stories';
-import StylesPackageImport from '../../../shared/styles-package-import.mdx';
+import StylesPackageImport from '../../../../shared/styles-package-import.mdx';
 
 <Meta of={InputStories} />
 
diff --git a/packages/documentation/src/stories/components/input/input.snapshot.stories.ts b/packages/documentation/src/stories/components/forms/input/input.snapshot.stories.ts
similarity index 96%
rename from packages/documentation/src/stories/components/input/input.snapshot.stories.ts
rename to packages/documentation/src/stories/components/forms/input/input.snapshot.stories.ts
index 2d8109c305..74a94cc21c 100644
--- a/packages/documentation/src/stories/components/input/input.snapshot.stories.ts
+++ b/packages/documentation/src/stories/components/forms/input/input.snapshot.stories.ts
@@ -1,7 +1,7 @@
 import type { Args, StoryContext, StoryObj } from '@storybook/web-components';
 import meta from './input.stories';
 import { html } from 'lit';
-import { getCombinations, COMBINATIONS } from '../../../utils/inputComponentsGetCombinations';
+import { getCombinations, COMBINATIONS } from '../../../../utils/inputComponentsGetCombinations';
 
 export default {
   ...meta,
diff --git a/packages/documentation/src/stories/components/input/input.stories.ts b/packages/documentation/src/stories/components/forms/input/input.stories.ts
similarity index 98%
rename from packages/documentation/src/stories/components/input/input.stories.ts
rename to packages/documentation/src/stories/components/forms/input/input.stories.ts
index 9cc66c04b9..242ebafb4a 100644
--- a/packages/documentation/src/stories/components/input/input.stories.ts
+++ b/packages/documentation/src/stories/components/forms/input/input.stories.ts
@@ -1,5 +1,5 @@
 import { Args, Meta, StoryContext, StoryObj } from '@storybook/web-components';
-import { BADGE } from '../../../../.storybook/constants';
+import { BADGE } from '../../../../../.storybook/constants';
 import { html, nothing, TemplateResult } from 'lit';
 
 const VALIDATION_STATE_MAP: Record<string, undefined | boolean> = {
@@ -9,7 +9,7 @@ const VALIDATION_STATE_MAP: Record<string, undefined | boolean> = {
 };
 
 const meta: Meta = {
-  title: 'Components/Text Input',
+  title: 'Components/Forms/Text Input',
   render: render,
   parameters: {
     badges: [BADGE.NEEDS_REVISION],
diff --git a/packages/documentation/src/stories/components/radio/radio.docs.mdx b/packages/documentation/src/stories/components/forms/radio/radio.docs.mdx
similarity index 96%
rename from packages/documentation/src/stories/components/radio/radio.docs.mdx
rename to packages/documentation/src/stories/components/forms/radio/radio.docs.mdx
index 3fcfcce9c2..842dc98f50 100644
--- a/packages/documentation/src/stories/components/radio/radio.docs.mdx
+++ b/packages/documentation/src/stories/components/forms/radio/radio.docs.mdx
@@ -1,5 +1,5 @@
 import { Canvas, Controls, Meta } from '@storybook/blocks';
-import StylesPackageImport from '../../../shared/styles-package-import.mdx';
+import StylesPackageImport from '../../../../shared/styles-package-import.mdx';
 
 import * as RadioStories from './radio.stories';
 
diff --git a/packages/documentation/src/stories/components/radio/radio.snapshot.stories.ts b/packages/documentation/src/stories/components/forms/radio/radio.snapshot.stories.ts
similarity index 80%
rename from packages/documentation/src/stories/components/radio/radio.snapshot.stories.ts
rename to packages/documentation/src/stories/components/forms/radio/radio.snapshot.stories.ts
index a3ccd2613e..d401a44d4c 100644
--- a/packages/documentation/src/stories/components/radio/radio.snapshot.stories.ts
+++ b/packages/documentation/src/stories/components/forms/radio/radio.snapshot.stories.ts
@@ -1,7 +1,7 @@
 import type { Args, StoryContext, StoryObj } from '@storybook/web-components';
-import meta, { renderInline } from './radio.stories';
+import meta from './radio.stories';
 import { html } from 'lit';
-import { bombArgs } from '../../../utils';
+import { bombArgs } from '../../../../utils';
 
 export default {
   ...meta,
@@ -40,12 +40,6 @@ export const Radio: Story = {
             </div>
           `,
         )}
-
-        <!-- Inline radio buttons (sharing the same name) -->
-        ${renderInline({ checkedRadio: 2, label: 'Not a unique label' }, {
-          viewMode: 'snapshot' as StoryContext['ViewMode'],
-          name: 'Inline',
-        } as Partial<StoryContext>)}
       </div>
     `;
   },
diff --git a/packages/documentation/src/stories/components/radio/radio.stories.ts b/packages/documentation/src/stories/components/forms/radio/radio.stories.ts
similarity index 98%
rename from packages/documentation/src/stories/components/radio/radio.stories.ts
rename to packages/documentation/src/stories/components/forms/radio/radio.stories.ts
index 44856c7b3c..f810e0b7cf 100644
--- a/packages/documentation/src/stories/components/radio/radio.stories.ts
+++ b/packages/documentation/src/stories/components/forms/radio/radio.stories.ts
@@ -1,6 +1,6 @@
 import { Args, Meta, StoryContext, StoryObj } from '@storybook/web-components';
 import { useArgs } from '@storybook/preview-api';
-import { BADGE } from '../../../../.storybook/constants';
+import { BADGE } from '../../../../../.storybook/constants';
 import { html, nothing, TemplateResult } from 'lit';
 
 const VALIDATION_STATE_MAP: Record<string, undefined | boolean> = {
@@ -10,7 +10,7 @@ const VALIDATION_STATE_MAP: Record<string, undefined | boolean> = {
 };
 
 const meta: Meta = {
-  title: 'Components/Radio button',
+  title: 'Components/Forms/Radio button',
   parameters: {
     controls: {
       exclude: ['Hidden Legend'],
diff --git a/packages/documentation/src/stories/components/range/range.docs.mdx b/packages/documentation/src/stories/components/forms/range/range.docs.mdx
similarity index 95%
rename from packages/documentation/src/stories/components/range/range.docs.mdx
rename to packages/documentation/src/stories/components/forms/range/range.docs.mdx
index 070972d92c..f737dc8270 100644
--- a/packages/documentation/src/stories/components/range/range.docs.mdx
+++ b/packages/documentation/src/stories/components/forms/range/range.docs.mdx
@@ -1,6 +1,6 @@
 import { Canvas, Controls, Meta } from '@storybook/blocks';
 import * as RangeStories from './range.stories';
-import StylesPackageImport from '../../../shared/styles-package-import.mdx';
+import StylesPackageImport from '../../../../shared/styles-package-import.mdx';
 
 <Meta of={RangeStories} />
 
diff --git a/packages/documentation/src/stories/components/range/range.snapshot.stories.ts b/packages/documentation/src/stories/components/forms/range/range.snapshot.stories.ts
similarity index 97%
rename from packages/documentation/src/stories/components/range/range.snapshot.stories.ts
rename to packages/documentation/src/stories/components/forms/range/range.snapshot.stories.ts
index e56f1cc249..a1f0bf7c30 100644
--- a/packages/documentation/src/stories/components/range/range.snapshot.stories.ts
+++ b/packages/documentation/src/stories/components/forms/range/range.snapshot.stories.ts
@@ -1,7 +1,7 @@
 import type { Args, StoryContext, StoryObj } from '@storybook/web-components';
 import meta from './range.stories';
 import { html } from 'lit';
-import { bombArgs } from '../../../utils';
+import { bombArgs } from '../../../../utils';
 
 export default {
   ...meta,
diff --git a/packages/documentation/src/stories/components/range/range.stories.ts b/packages/documentation/src/stories/components/forms/range/range.stories.ts
similarity index 98%
rename from packages/documentation/src/stories/components/range/range.stories.ts
rename to packages/documentation/src/stories/components/forms/range/range.stories.ts
index 9353093265..a457b9e19b 100644
--- a/packages/documentation/src/stories/components/range/range.stories.ts
+++ b/packages/documentation/src/stories/components/forms/range/range.stories.ts
@@ -1,6 +1,6 @@
 import { Args, Meta, StoryContext, StoryObj } from '@storybook/web-components';
 import { useArgs } from '@storybook/preview-api';
-import { BADGE } from '../../../../.storybook/constants';
+import { BADGE } from '../../../../../.storybook/constants';
 import { html, nothing, TemplateResult } from 'lit';
 
 const VALIDATION_STATE_MAP: Record<string, undefined | boolean> = {
@@ -12,7 +12,7 @@ const VALIDATION_STATE_MAP: Record<string, undefined | boolean> = {
 const ARROW_KEYS = ['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'];
 
 const meta: Meta = {
-  title: 'Components/Range',
+  title: 'Components/Forms/Range',
   render: render,
   parameters: {
     badges: [BADGE.NEEDS_REVISION],
diff --git a/packages/documentation/src/stories/components/select/select.docs.mdx b/packages/documentation/src/stories/components/forms/select/select.docs.mdx
similarity index 92%
rename from packages/documentation/src/stories/components/select/select.docs.mdx
rename to packages/documentation/src/stories/components/forms/select/select.docs.mdx
index e3e37479e5..3a17efbfb6 100644
--- a/packages/documentation/src/stories/components/select/select.docs.mdx
+++ b/packages/documentation/src/stories/components/forms/select/select.docs.mdx
@@ -1,6 +1,6 @@
 import { Canvas, Controls, Meta } from '@storybook/blocks';
 import * as SelectStories from './select.stories';
-import StylesPackageImport from '../../../shared/styles-package-import.mdx';
+import StylesPackageImport from '../../../../shared/styles-package-import.mdx';
 
 <Meta of={SelectStories} />
 
@@ -60,7 +60,7 @@ The size can be adjusted, by simply adding one of the following four classes:
 
 ### Validation
 
-Simply add the classes `is-valid` or `is-invalid` to the `<select>` element to show it in the expected state.<br/>
+Simply add the classes `is-valid` (with or without `success` class) or `is-invalid` to the `<select>` element to show it in the expected state.<br/>
 When the component has been validated, don't forget to add a `<p className="valid-feedback">...</p>` or `<p className="invalid-feedback">...</p>` element after the `select` element to explain what went wrong. This enables the user to correct the mistake.
 
 <Canvas of={SelectStories.Validation} />
diff --git a/packages/documentation/src/stories/components/forms/select/select.snapshot.stories.ts b/packages/documentation/src/stories/components/forms/select/select.snapshot.stories.ts
new file mode 100644
index 0000000000..c79332a0ee
--- /dev/null
+++ b/packages/documentation/src/stories/components/forms/select/select.snapshot.stories.ts
@@ -0,0 +1,123 @@
+import type { Args, StoryContext, StoryObj } from '@storybook/web-components';
+import meta, { Default, FloatingLabel } from './select.stories';
+import { html } from 'lit';
+import { bombArgs } from '../../../../utils';
+
+export default {
+  ...meta,
+  title: 'Snapshots',
+};
+
+type Story = StoryObj;
+
+export const Select: Story = {
+  render: (_args: Args, context: StoryContext) => {
+    //Arguments for Default Version
+    const bombArgsGeneratedDefault = [
+      ...bombArgs({
+        label: [
+          context.args.label,
+          'Label - Lorem ipsum dolor sit amet consetetur sadipscing elitr sed diam nonumy eirmod tempor',
+        ],
+        hint: [''],
+      }),
+      ...bombArgs({
+        hiddenLabel: [true],
+        hint: ['Hintus textus', context.args.hint],
+      }),
+      ...bombArgs({
+        size: context.argTypes.size.options,
+        disabled: [false, true],
+        validation: context.argTypes.validation.options,
+      }),
+      ...bombArgs({
+        size: context.argTypes.size.options,
+        success: [false, true],
+        validation: context.argTypes.validation.options.filter((option: string) => option !== 'is-invalid'),
+      }),
+    ]
+      // remove disabled & validated examples
+      .filter((args: Args) => !(args.disabled && args.validation !== 'null'));
+
+    console.log('bombArg', bombArgsGeneratedDefault);
+
+    //Arguments for Multiple Version
+    const bombArgsGeneratedMultiple = [
+      ...bombArgs({
+        multiple: [true],
+        label: [
+          context.args.label,
+          'Label - Lorem ipsum dolor sit amet consetetur sadipscing elitr sed diam nonumy eirmod tempor',
+        ],
+        hint: [''],
+      }),
+      ...bombArgs({
+        multiple: [true],
+        hiddenLabel: [true],
+        hint: ['', 'Hintus textus', context.args.hint],
+      }),
+      ...bombArgs({
+        multiple: [true],
+        size: context.argTypes.size.options,
+        disabled: [false, true],
+        validation: context.argTypes.validation.options,
+      }),
+    ]
+      // remove disabled & validated examples
+      .filter((args: Args) => !(args.disabled && args.validation !== 'null'));
+
+    return html`
+      <div class="d-flex gap-3 flex-column">
+        ${['bg-white', 'bg-dark'].map(
+          bg =>
+            html`
+              <div class="${bg} d-flex gap-3 flex-column p-3">
+                <h2>Default</h2>
+                ${bombArgsGeneratedDefault.map(
+                  (args: Args) =>
+                    html`
+                      <div>
+                        ${Default.render?.({ ...context.args, ...Default.args, ...args }, context)}
+                      </div>
+                    `,
+                )}
+                <h2>Floating Label</h2>
+                ${bombArgsGeneratedDefault.map(
+                  (args: Args) =>
+                    html`
+                      <div>
+                        ${FloatingLabel.render?.(
+                          { ...context.args, ...FloatingLabel.args, ...args },
+                          context,
+                        )}
+                      </div>
+                    `,
+                )}
+                <h2>Multiple - Default</h2>
+                ${bombArgsGeneratedMultiple.map(
+                  (args: Args) =>
+                    html`
+                      <div>
+                        ${Default.render?.({ ...context.args, ...Default.args, ...args }, context)}
+                      </div>
+                    `,
+                )}
+                <h2>Multiple - Floating Label</h2>
+                ${bombArgsGeneratedMultiple.map(
+                  (args: Args) =>
+                    html`
+                      <div>
+                        ${FloatingLabel.render?.(
+                          { ...context.args, ...FloatingLabel.args, ...args },
+                          context,
+                        )}
+                      </div>
+                    `,
+                )}
+              </div>
+            `,
+        )}
+      </div>
+    `;
+  },
+};
diff --git a/packages/documentation/src/stories/components/select/select.stories.ts b/packages/documentation/src/stories/components/forms/select/select.stories.ts
similarity index 93%
rename from packages/documentation/src/stories/components/select/select.stories.ts
rename to packages/documentation/src/stories/components/forms/select/select.stories.ts
index 4e16df4135..b08e9d78fb 100644
--- a/packages/documentation/src/stories/components/select/select.stories.ts
+++ b/packages/documentation/src/stories/components/forms/select/select.stories.ts
@@ -1,7 +1,7 @@
 import type { Args, Meta, StoryContext, StoryObj } from '@storybook/web-components';
 import { html, nothing } from 'lit';
 import { useArgs } from '@storybook/preview-api';
-import { BADGE } from '../../../../.storybook/constants';
+import { BADGE } from '../../../../../.storybook/constants';
 import { ifDefined } from 'lit/directives/if-defined.js';
 
 const VALIDATION_STATE_MAP: Record<string, undefined | boolean> = {
@@ -11,7 +11,7 @@ const VALIDATION_STATE_MAP: Record<string, undefined | boolean> = {
 };
 
 const meta: Meta = {
-  title: 'Components/Select',
+  title: 'Components/Forms/Select',
   parameters: {
     badges: [BADGE.NEEDS_REVISION],
   },
@@ -27,6 +27,7 @@ const meta: Meta = {
     hint: 'Hintus textus elare volare cantare hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.',
     disabled: false,
     validation: 'null',
+    success: false,
   },
   argTypes: {
     label: {
@@ -77,10 +78,6 @@ const meta: Meta = {
     size: {
       name: 'Size',
       description: "Sets the size of the component's appearance.",
-      if: {
-        arg: 'floatingLabel',
-        truthy: false,
-      },
       control: {
         type: 'select',
         labels: {
@@ -166,11 +163,29 @@ const meta: Meta = {
           'is-invalid': 'Invalid',
         },
       },
+      if: {
+        arg: 'disabled',
+        truthy: false,
+      },
       options: ['null', 'is-valid', 'is-invalid'],
       table: {
         category: 'States',
       },
     },
+    success: {
+      name: 'Success',
+      description: 'Controls the success state appearance of the component.',
+      control: {
+        type: 'boolean',
+      },
+      if: {
+        arg: 'validation',
+        neq: 'is-invalid',
+      },
+      table: {
+        category: 'States',
+      },
+    },
   },
 };
 
@@ -187,6 +202,7 @@ const Template: Story = {
       args.size,
       args.validation,
       args.floatingLabelPlaceholder && !args.value ? 'form-select-empty' : null,
+      args.success && 'success',
     ]
       .filter(c => c && c !== 'null')
       .join(' ');
@@ -247,7 +263,7 @@ const Template: Story = {
           options[0],
           options.slice(1).map(
             (option, index) => html`
-              <option value="valoro_${index + 1}" ?selected=${index === args.selectedOption - 2}>
+              <option value="valoro_${index + 1}" ?selected="${index === args.selectedOption - 2}">
                 Opcion ${index + 2}
               </option>
             `,
diff --git a/packages/documentation/src/stories/components/switch/switch.docs.mdx b/packages/documentation/src/stories/components/forms/switch/switch.docs.mdx
similarity index 95%
rename from packages/documentation/src/stories/components/switch/switch.docs.mdx
rename to packages/documentation/src/stories/components/forms/switch/switch.docs.mdx
index 5793c0d587..84a4b32451 100644
--- a/packages/documentation/src/stories/components/switch/switch.docs.mdx
+++ b/packages/documentation/src/stories/components/forms/switch/switch.docs.mdx
@@ -1,6 +1,6 @@
 import { Canvas, Controls, Meta } from '@storybook/blocks';
 import * as switchStories from './switch.stories';
-import StylesPackageImport from '../../../shared/styles-package-import.mdx';
+import StylesPackageImport from '../../../../shared/styles-package-import.mdx';
 
 <Meta of={switchStories} />
 
diff --git a/packages/documentation/src/stories/components/switch/switch.snapshot.stories.ts b/packages/documentation/src/stories/components/forms/switch/switch.snapshot.stories.ts
similarity index 96%
rename from packages/documentation/src/stories/components/switch/switch.snapshot.stories.ts
rename to packages/documentation/src/stories/components/forms/switch/switch.snapshot.stories.ts
index 06b6906bde..17c060b03e 100644
--- a/packages/documentation/src/stories/components/switch/switch.snapshot.stories.ts
+++ b/packages/documentation/src/stories/components/forms/switch/switch.snapshot.stories.ts
@@ -1,7 +1,7 @@
 import type { Args, StoryContext, StoryObj } from '@storybook/web-components';
 import meta from './switch.stories';
 import { html } from 'lit';
-import { bombArgs } from '../../../utils';
+import { bombArgs } from '../../../../utils';
 
 export default {
   ...meta,
diff --git a/packages/documentation/src/stories/components/switch/switch.stories.ts b/packages/documentation/src/stories/components/forms/switch/switch.stories.ts
similarity index 97%
rename from packages/documentation/src/stories/components/switch/switch.stories.ts
rename to packages/documentation/src/stories/components/forms/switch/switch.stories.ts
index 487392f990..c9fac8d62b 100644
--- a/packages/documentation/src/stories/components/switch/switch.stories.ts
+++ b/packages/documentation/src/stories/components/forms/switch/switch.stories.ts
@@ -2,11 +2,11 @@ import { useArgs } from '@storybook/preview-api';
 import type { Args, Meta, StoryContext, StoryObj } from '@storybook/web-components';
 import { html, nothing } from 'lit';
 import { ifDefined } from 'lit/directives/if-defined.js';
-import { BADGE } from '../../../../.storybook/constants';
-import { mapClasses } from '../../../utils';
+import { BADGE } from '../../../../../.storybook/constants';
+import { mapClasses } from '../../../../utils';
 
 const meta: Meta = {
-  title: 'Components/Switch',
+  title: 'Components/Forms/Switch',
   render: renderSwitch,
   parameters: {
     badges: [BADGE.NEEDS_REVISION],
diff --git a/packages/documentation/src/stories/components/textarea/textarea.docs.mdx b/packages/documentation/src/stories/components/forms/textarea/textarea.docs.mdx
similarity index 96%
rename from packages/documentation/src/stories/components/textarea/textarea.docs.mdx
rename to packages/documentation/src/stories/components/forms/textarea/textarea.docs.mdx
index 776bfe8b6d..aff25e957b 100644
--- a/packages/documentation/src/stories/components/textarea/textarea.docs.mdx
+++ b/packages/documentation/src/stories/components/forms/textarea/textarea.docs.mdx
@@ -1,6 +1,6 @@
 import { Canvas, Controls, Meta } from '@storybook/blocks';
 import * as TextareaStories from './textarea.stories';
-import StylesPackageImport from '../../../shared/styles-package-import.mdx';
+import StylesPackageImport from '../../../../shared/styles-package-import.mdx';
 
 <Meta of={TextareaStories} />
 
diff --git a/packages/documentation/src/stories/components/textarea/textarea.snapshot.stories.ts b/packages/documentation/src/stories/components/forms/textarea/textarea.snapshot.stories.ts
similarity index 93%
rename from packages/documentation/src/stories/components/textarea/textarea.snapshot.stories.ts
rename to packages/documentation/src/stories/components/forms/textarea/textarea.snapshot.stories.ts
index 927c5f271b..efb8f3bb7c 100644
--- a/packages/documentation/src/stories/components/textarea/textarea.snapshot.stories.ts
+++ b/packages/documentation/src/stories/components/forms/textarea/textarea.snapshot.stories.ts
@@ -1,7 +1,7 @@
 import type { Args, StoryContext, StoryObj } from '@storybook/web-components';
 import meta from './textarea.stories';
 import { html } from 'lit';
-import { getCombinations, COMBINATIONS } from '../../../utils/inputComponentsGetCombinations';
+import { getCombinations, COMBINATIONS } from '../../../../utils/inputComponentsGetCombinations';
 
 export default {
   ...meta,
@@ -26,10 +26,11 @@ export const Textarea: Story = {
         label: `Label - Text inside the Textarea`,
         textInside:
           'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.',
-      },{
+      },
+      {
         label: `Label - Not resizable`,
-        resize: 'resize: none'
-      }
+        resize: 'resize: none',
+      },
     ];
 
     return html`
diff --git a/packages/documentation/src/stories/components/textarea/textarea.stories.ts b/packages/documentation/src/stories/components/forms/textarea/textarea.stories.ts
similarity index 97%
rename from packages/documentation/src/stories/components/textarea/textarea.stories.ts
rename to packages/documentation/src/stories/components/forms/textarea/textarea.stories.ts
index 367f243cc3..ec9338f3fd 100644
--- a/packages/documentation/src/stories/components/textarea/textarea.stories.ts
+++ b/packages/documentation/src/stories/components/forms/textarea/textarea.stories.ts
@@ -1,7 +1,7 @@
 import type { Args, Meta, StoryContext, StoryObj } from '@storybook/web-components';
 import { html, nothing } from 'lit';
-import { BADGE } from '../../../../.storybook/constants';
-import { mapClasses } from '../../../utils';
+import { BADGE } from '../../../../../.storybook/constants';
+import { mapClasses } from '../../../../utils';
 
 const VALIDATION_STATE_MAP: Record<string, undefined | boolean> = {
   'null': undefined,
@@ -10,7 +10,7 @@ const VALIDATION_STATE_MAP: Record<string, undefined | boolean> = {
 };
 
 const meta: Meta = {
-  title: 'Components/Textarea',
+  title: 'Components/Forms/Textarea',
   render: renderTextarea,
   parameters: {
     badges: [BADGE.NEEDS_REVISION],
diff --git a/packages/documentation/src/stories/icons/components/icon.docs.mdx b/packages/documentation/src/stories/components/icons/components/icon.docs.mdx
similarity index 100%
rename from packages/documentation/src/stories/icons/components/icon.docs.mdx
rename to packages/documentation/src/stories/components/icons/components/icon.docs.mdx
diff --git a/packages/documentation/src/stories/icons/components/icon.stories.ts b/packages/documentation/src/stories/components/icons/components/icon.stories.ts
similarity index 98%
rename from packages/documentation/src/stories/icons/components/icon.stories.ts
rename to packages/documentation/src/stories/components/icons/components/icon.stories.ts
index 6207515845..a7861349f4 100644
--- a/packages/documentation/src/stories/icons/components/icon.stories.ts
+++ b/packages/documentation/src/stories/components/icons/components/icon.stories.ts
@@ -3,10 +3,10 @@ import { Args, Meta, StoryObj } from '@storybook/web-components';
 import { Components } from '@swisspost/design-system-components';
 import { html } from 'lit';
 import { ifDefined } from 'lit/directives/if-defined.js';
-import { BADGE } from '../../../../.storybook/constants';
+import { BADGE } from '../../../../../.storybook/constants';
 
 const meta: Meta = {
-  title: 'Icons/Icon Component',
+  title: 'Components/Icons/Icon Component',
   component: 'post-icon',
   parameters: {
     badges: [BADGE.NEEDS_REVISION, BADGE.SINCE_V1],
diff --git a/packages/documentation/src/stories/icons/getting-started-angular-config.sample.json b/packages/documentation/src/stories/components/icons/getting-started-angular-config.sample.json
similarity index 100%
rename from packages/documentation/src/stories/icons/getting-started-angular-config.sample.json
rename to packages/documentation/src/stories/components/icons/getting-started-angular-config.sample.json
diff --git a/packages/documentation/src/stories/icons/getting-started-icon-meta.sample.html b/packages/documentation/src/stories/components/icons/getting-started-icon-meta.sample.html
similarity index 100%
rename from packages/documentation/src/stories/icons/getting-started-icon-meta.sample.html
rename to packages/documentation/src/stories/components/icons/getting-started-icon-meta.sample.html
diff --git a/packages/documentation/src/stories/icons/getting-started-node-16.7.0.sample.json b/packages/documentation/src/stories/components/icons/getting-started-node-16.7.0.sample.json
similarity index 100%
rename from packages/documentation/src/stories/icons/getting-started-node-16.7.0.sample.json
rename to packages/documentation/src/stories/components/icons/getting-started-node-16.7.0.sample.json
diff --git a/packages/documentation/src/stories/icons/getting-started-node-old.sample.js b/packages/documentation/src/stories/components/icons/getting-started-node-old.sample.js
similarity index 100%
rename from packages/documentation/src/stories/icons/getting-started-node-old.sample.js
rename to packages/documentation/src/stories/components/icons/getting-started-node-old.sample.js
diff --git a/packages/documentation/src/stories/icons/getting-started-node-old.sample.json b/packages/documentation/src/stories/components/icons/getting-started-node-old.sample.json
similarity index 100%
rename from packages/documentation/src/stories/icons/getting-started-node-old.sample.json
rename to packages/documentation/src/stories/components/icons/getting-started-node-old.sample.json
diff --git a/packages/documentation/src/stories/icons/getting-started.docs.mdx b/packages/documentation/src/stories/components/icons/getting-started.docs.mdx
similarity index 100%
rename from packages/documentation/src/stories/icons/getting-started.docs.mdx
rename to packages/documentation/src/stories/components/icons/getting-started.docs.mdx
diff --git a/packages/documentation/src/stories/components/input-group/input-group.stories.ts b/packages/documentation/src/stories/components/icons/getting-started.stories.ts
similarity index 75%
rename from packages/documentation/src/stories/components/input-group/input-group.stories.ts
rename to packages/documentation/src/stories/components/icons/getting-started.stories.ts
index b7d4b6dea9..eee6af4796 100644
--- a/packages/documentation/src/stories/components/input-group/input-group.stories.ts
+++ b/packages/documentation/src/stories/components/icons/getting-started.stories.ts
@@ -2,9 +2,9 @@ import { Meta, StoryObj } from '@storybook/web-components';
 import { BADGE } from '../../../../.storybook/constants';
 
 const meta: Meta = {
-  title: 'Components/Input Group',
+  title: 'Components/Icons/Getting Started',
   parameters: {
-    badges: [BADGE.TODO],
+    badges: [BADGE.NEEDS_REVISION],
   },
 };
 
diff --git a/packages/documentation/src/stories/icons/search-icons/search-icons.blocks.tsx b/packages/documentation/src/stories/components/icons/search-icons/search-icons.blocks.tsx
similarity index 100%
rename from packages/documentation/src/stories/icons/search-icons/search-icons.blocks.tsx
rename to packages/documentation/src/stories/components/icons/search-icons/search-icons.blocks.tsx
diff --git a/packages/documentation/src/stories/icons/search-icons/search-icons.docs.mdx b/packages/documentation/src/stories/components/icons/search-icons/search-icons.docs.mdx
similarity index 100%
rename from packages/documentation/src/stories/icons/search-icons/search-icons.docs.mdx
rename to packages/documentation/src/stories/components/icons/search-icons/search-icons.docs.mdx
diff --git a/packages/documentation/src/stories/icons/search-icons/search-icons.stories.ts b/packages/documentation/src/stories/components/icons/search-icons/search-icons.stories.ts
similarity index 78%
rename from packages/documentation/src/stories/icons/search-icons/search-icons.stories.ts
rename to packages/documentation/src/stories/components/icons/search-icons/search-icons.stories.ts
index 4ea7e28385..dd6aa9a2e3 100644
--- a/packages/documentation/src/stories/icons/search-icons/search-icons.stories.ts
+++ b/packages/documentation/src/stories/components/icons/search-icons/search-icons.stories.ts
@@ -1,7 +1,7 @@
 import { Meta, StoryObj } from '@storybook/web-components';
 
 const meta: Meta = {
-  title: 'Icons/Search for Icons',
+  title: 'Components/Icons/Search for Icons',
 };
 
 export default meta;
diff --git a/packages/documentation/src/stories/icons/search-icons/search-icons.styles.scss b/packages/documentation/src/stories/components/icons/search-icons/search-icons.styles.scss
similarity index 100%
rename from packages/documentation/src/stories/icons/search-icons/search-icons.styles.scss
rename to packages/documentation/src/stories/components/icons/search-icons/search-icons.styles.scss
diff --git a/packages/documentation/src/stories/internet-header/components/breadcrumbs/breadcrumbs.docs.mdx b/packages/documentation/src/stories/components/internet-header/components/breadcrumbs/breadcrumbs.docs.mdx
similarity index 100%
rename from packages/documentation/src/stories/internet-header/components/breadcrumbs/breadcrumbs.docs.mdx
rename to packages/documentation/src/stories/components/internet-header/components/breadcrumbs/breadcrumbs.docs.mdx
diff --git a/packages/documentation/src/stories/internet-header/components/breadcrumbs/breadcrumbs.stories.ts b/packages/documentation/src/stories/components/internet-header/components/breadcrumbs/breadcrumbs.stories.ts
similarity index 89%
rename from packages/documentation/src/stories/internet-header/components/breadcrumbs/breadcrumbs.stories.ts
rename to packages/documentation/src/stories/components/internet-header/components/breadcrumbs/breadcrumbs.stories.ts
index 6232d7e08d..8997e8e27c 100644
--- a/packages/documentation/src/stories/internet-header/components/breadcrumbs/breadcrumbs.stories.ts
+++ b/packages/documentation/src/stories/components/internet-header/components/breadcrumbs/breadcrumbs.stories.ts
@@ -1,12 +1,12 @@
 import { Meta, StoryObj } from '@storybook/web-components';
 import { html } from 'lit';
 import { spread } from '@open-wc/lit-helpers';
-import { BADGE } from '../../../../../.storybook/constants';
-import { getAttributes } from '../../../../utils';
+import { BADGE } from '../../../../../../.storybook/constants';
+import { getAttributes } from '../../../../../utils';
 import customItems from './overrides/custom-items';
 
 const meta: Meta<HTMLSwisspostInternetBreadcrumbsElement> = {
-  title: 'Internet Header/Breadcrumbs',
+  title: 'Components/Internet Header/Breadcrumbs',
   component: 'swisspost-internet-breadcrumbs',
   render: renderInternetBreadcrumbs,
   decorators: [hiddenHeader],
diff --git a/packages/documentation/src/stories/internet-header/components/breadcrumbs/overrides/breadcrumbs-config.docs.mdx b/packages/documentation/src/stories/components/internet-header/components/breadcrumbs/overrides/breadcrumbs-config.docs.mdx
similarity index 100%
rename from packages/documentation/src/stories/internet-header/components/breadcrumbs/overrides/breadcrumbs-config.docs.mdx
rename to packages/documentation/src/stories/components/internet-header/components/breadcrumbs/overrides/breadcrumbs-config.docs.mdx
diff --git a/packages/documentation/src/stories/internet-header/components/breadcrumbs/overrides/breadcrumbs-config.stories.ts b/packages/documentation/src/stories/components/internet-header/components/breadcrumbs/overrides/breadcrumbs-config.stories.ts
similarity index 50%
rename from packages/documentation/src/stories/internet-header/components/breadcrumbs/overrides/breadcrumbs-config.stories.ts
rename to packages/documentation/src/stories/components/internet-header/components/breadcrumbs/overrides/breadcrumbs-config.stories.ts
index 8910bb5603..3eca16b0b8 100644
--- a/packages/documentation/src/stories/internet-header/components/breadcrumbs/overrides/breadcrumbs-config.stories.ts
+++ b/packages/documentation/src/stories/components/internet-header/components/breadcrumbs/overrides/breadcrumbs-config.stories.ts
@@ -1,5 +1,8 @@
 import * as BreadcrumbsStories from '../breadcrumbs.stories';
 
-export default { ...BreadcrumbsStories.default, title: 'Internet Header/Breadcrumbs/Custom Items' };
+export default {
+  ...BreadcrumbsStories.default,
+  title: 'Components/Internet Header/Breadcrumbs/Custom Items',
+};
 
 export const Default = BreadcrumbsStories.CustomItems;
diff --git a/packages/documentation/src/stories/internet-header/components/breadcrumbs/overrides/custom-items.ts b/packages/documentation/src/stories/components/internet-header/components/breadcrumbs/overrides/custom-items.ts
similarity index 100%
rename from packages/documentation/src/stories/internet-header/components/breadcrumbs/overrides/custom-items.ts
rename to packages/documentation/src/stories/components/internet-header/components/breadcrumbs/overrides/custom-items.ts
diff --git a/packages/documentation/src/stories/internet-header/components/footer/custom-config/custom-footer-config.ts b/packages/documentation/src/stories/components/internet-header/components/footer/custom-config/custom-footer-config.ts
similarity index 100%
rename from packages/documentation/src/stories/internet-header/components/footer/custom-config/custom-footer-config.ts
rename to packages/documentation/src/stories/components/internet-header/components/footer/custom-config/custom-footer-config.ts
diff --git a/packages/documentation/src/stories/internet-header/components/footer/custom-config/footer-config.docs.mdx b/packages/documentation/src/stories/components/internet-header/components/footer/custom-config/footer-config.docs.mdx
similarity index 100%
rename from packages/documentation/src/stories/internet-header/components/footer/custom-config/footer-config.docs.mdx
rename to packages/documentation/src/stories/components/internet-header/components/footer/custom-config/footer-config.docs.mdx
diff --git a/packages/documentation/src/stories/components/internet-header/components/footer/custom-config/footer-config.stories.ts b/packages/documentation/src/stories/components/internet-header/components/footer/custom-config/footer-config.stories.ts
new file mode 100644
index 0000000000..15ee19e727
--- /dev/null
+++ b/packages/documentation/src/stories/components/internet-header/components/footer/custom-config/footer-config.stories.ts
@@ -0,0 +1,8 @@
+import * as FooterStories from '../footer.stories';
+
+export default {
+  ...FooterStories.default,
+  title: 'Components/Internet Header/Footer/Custom Config',
+};
+
+export const Default = FooterStories.CustomConfig;
diff --git a/packages/documentation/src/stories/internet-header/components/footer/footer.docs.mdx b/packages/documentation/src/stories/components/internet-header/components/footer/footer.docs.mdx
similarity index 100%
rename from packages/documentation/src/stories/internet-header/components/footer/footer.docs.mdx
rename to packages/documentation/src/stories/components/internet-header/components/footer/footer.docs.mdx
diff --git a/packages/documentation/src/stories/internet-header/components/footer/footer.stories.ts b/packages/documentation/src/stories/components/internet-header/components/footer/footer.stories.ts
similarity index 92%
rename from packages/documentation/src/stories/internet-header/components/footer/footer.stories.ts
rename to packages/documentation/src/stories/components/internet-header/components/footer/footer.stories.ts
index e18dedc762..0524b4f9b3 100644
--- a/packages/documentation/src/stories/internet-header/components/footer/footer.stories.ts
+++ b/packages/documentation/src/stories/components/internet-header/components/footer/footer.stories.ts
@@ -1,11 +1,11 @@
 import { Args, Meta, StoryContext, StoryObj } from '@storybook/web-components';
 import { html } from 'lit';
-import { BADGE } from '../../../../../.storybook/constants';
+import { BADGE } from '../../../../../../.storybook/constants';
 import customFooterConfig from './custom-config/custom-footer-config';
 import { spread } from '@open-wc/lit-helpers';
 
 const meta: Meta = {
-  title: 'Internet Header/Footer',
+  title: 'Components/Internet Header/Footer',
   component: 'swisspost-internet-footer',
   render: renderInternetFooter,
   decorators: [hiddenHeader],
diff --git a/packages/documentation/src/stories/internet-header/components/header/config/custom-config.ts b/packages/documentation/src/stories/components/internet-header/components/header/config/custom-config.ts
similarity index 100%
rename from packages/documentation/src/stories/internet-header/components/header/config/custom-config.ts
rename to packages/documentation/src/stories/components/internet-header/components/header/config/custom-config.ts
diff --git a/packages/documentation/src/stories/internet-header/components/header/config/language-switch-overrides.ts b/packages/documentation/src/stories/components/internet-header/components/header/config/language-switch-overrides.ts
similarity index 100%
rename from packages/documentation/src/stories/internet-header/components/header/config/language-switch-overrides.ts
rename to packages/documentation/src/stories/components/internet-header/components/header/config/language-switch-overrides.ts
diff --git a/packages/documentation/src/stories/internet-header/components/header/config/os-flyout-overrides.ts b/packages/documentation/src/stories/components/internet-header/components/header/config/os-flyout-overrides.ts
similarity index 100%
rename from packages/documentation/src/stories/internet-header/components/header/config/os-flyout-overrides.ts
rename to packages/documentation/src/stories/components/internet-header/components/header/config/os-flyout-overrides.ts
diff --git a/packages/documentation/src/stories/internet-header/components/header/header.docs.mdx b/packages/documentation/src/stories/components/internet-header/components/header/header.docs.mdx
similarity index 87%
rename from packages/documentation/src/stories/internet-header/components/header/header.docs.mdx
rename to packages/documentation/src/stories/components/internet-header/components/header/header.docs.mdx
index a935f7a30f..98c3778c5a 100644
--- a/packages/documentation/src/stories/internet-header/components/header/header.docs.mdx
+++ b/packages/documentation/src/stories/components/internet-header/components/header/header.docs.mdx
@@ -1,5 +1,4 @@
 import { Meta, Canvas, Controls } from '@storybook/blocks';
-import { BADGE } from '../../../../../.storybook/constants';
 import * as HeaderStories from './header.stories';
 import './header.scss';
 
diff --git a/packages/documentation/src/stories/internet-header/components/header/header.scss b/packages/documentation/src/stories/components/internet-header/components/header/header.scss
similarity index 100%
rename from packages/documentation/src/stories/internet-header/components/header/header.scss
rename to packages/documentation/src/stories/components/internet-header/components/header/header.scss
diff --git a/packages/documentation/src/stories/internet-header/components/header/header.stories.ts b/packages/documentation/src/stories/components/internet-header/components/header/header.stories.ts
similarity index 96%
rename from packages/documentation/src/stories/internet-header/components/header/header.stories.ts
rename to packages/documentation/src/stories/components/internet-header/components/header/header.stories.ts
index f4fb26587a..9ba76acfbf 100644
--- a/packages/documentation/src/stories/internet-header/components/header/header.stories.ts
+++ b/packages/documentation/src/stories/components/internet-header/components/header/header.stories.ts
@@ -1,14 +1,14 @@
 import { Args, Meta, StoryObj } from '@storybook/web-components';
-import { BADGE } from '../../../../../.storybook/constants';
+import { BADGE } from '../../../../../../.storybook/constants';
 import { html } from 'lit';
 import { spread } from '@open-wc/lit-helpers';
-import { getAttributes } from '../../../../utils';
+import { getAttributes } from '../../../../../utils';
 import customConfig from './config/custom-config';
 import osFlyoutOverrides from './config/os-flyout-overrides';
 import languageSwitchOverrides from './config/language-switch-overrides';
 
 const meta: Meta = {
-  title: 'Internet Header/Header',
+  title: 'Components/Internet Header/Header',
   component: 'swisspost-internet-header',
   parameters: {
     badges: [BADGE.STABLE],
diff --git a/packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-custom-config.docs.mdx b/packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-custom-config.docs.mdx
similarity index 87%
rename from packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-custom-config.docs.mdx
rename to packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-custom-config.docs.mdx
index a567fc003a..2c9c0c3e80 100644
--- a/packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-custom-config.docs.mdx
+++ b/packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-custom-config.docs.mdx
@@ -1,5 +1,4 @@
 import { Meta, Canvas, Controls } from '@storybook/blocks';
-import { BADGE } from '../../../../../../.storybook/constants';
 import * as HeaderStories from './header-custom-config.stories';
 import '../header.scss';
 
diff --git a/packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-custom-config.stories.ts b/packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-custom-config.stories.ts
new file mode 100644
index 0000000000..e133107815
--- /dev/null
+++ b/packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-custom-config.stories.ts
@@ -0,0 +1,8 @@
+import * as HeaderStories from '../header.stories';
+
+export default {
+  ...HeaderStories.default,
+  title: 'Components/Internet Header/Header/Custom Config',
+};
+
+export const Default = HeaderStories.CustomConfig;
diff --git a/packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-language-switch-overrides.docs.mdx b/packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-language-switch-overrides.docs.mdx
similarity index 88%
rename from packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-language-switch-overrides.docs.mdx
rename to packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-language-switch-overrides.docs.mdx
index efb026d77d..52322a76f7 100644
--- a/packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-language-switch-overrides.docs.mdx
+++ b/packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-language-switch-overrides.docs.mdx
@@ -1,5 +1,4 @@
 import { Meta, Canvas, Controls } from '@storybook/blocks';
-import { BADGE } from '../../../../../../.storybook/constants';
 import * as HeaderStories from './header-language-switch-overrides.stories';
 import '../header.scss';
 
diff --git a/packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-language-switch-overrides.stories.ts b/packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-language-switch-overrides.stories.ts
similarity index 69%
rename from packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-language-switch-overrides.stories.ts
rename to packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-language-switch-overrides.stories.ts
index c2a53a22e9..5d1c40e44e 100644
--- a/packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-language-switch-overrides.stories.ts
+++ b/packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-language-switch-overrides.stories.ts
@@ -2,7 +2,7 @@ import * as HeaderStories from '../header.stories';
 
 export default {
   ...HeaderStories.default,
-  title: 'Internet Header/Header/Language Switch Overrides',
+  title: 'Components/Internet Header/Header/Language Switch Overrides',
 };
 
 export const Default = HeaderStories.LanguageSwitchOverrides;
diff --git a/packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-os-flyout-overrides.docs.mdx b/packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-os-flyout-overrides.docs.mdx
similarity index 87%
rename from packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-os-flyout-overrides.docs.mdx
rename to packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-os-flyout-overrides.docs.mdx
index 1ed0d93a45..93242da710 100644
--- a/packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-os-flyout-overrides.docs.mdx
+++ b/packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-os-flyout-overrides.docs.mdx
@@ -1,5 +1,4 @@
 import { Meta, Canvas, Controls } from '@storybook/blocks';
-import { BADGE } from '../../../../../../.storybook/constants';
 import * as HeaderStories from './header-os-flyout-overrides.stories';
 import '../header.scss';
 
diff --git a/packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-os-flyout-overrides.stories.ts b/packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-os-flyout-overrides.stories.ts
similarity index 70%
rename from packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-os-flyout-overrides.stories.ts
rename to packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-os-flyout-overrides.stories.ts
index 9047146cd2..1502225361 100644
--- a/packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-os-flyout-overrides.stories.ts
+++ b/packages/documentation/src/stories/components/internet-header/components/header/overrides-stories/header-os-flyout-overrides.stories.ts
@@ -2,7 +2,7 @@ import * as HeaderStories from '../header.stories';
 
 export default {
   ...HeaderStories.default,
-  title: 'Internet Header/Header/Os Flyout Overrides',
+  title: 'Components/Internet Header/Header/Os Flyout Overrides',
 };
 
 export const Default = HeaderStories.OSFlyoutOverrides;
diff --git a/packages/documentation/src/stories/internet-header/getting-started.docs.mdx b/packages/documentation/src/stories/components/internet-header/getting-started.docs.mdx
similarity index 98%
rename from packages/documentation/src/stories/internet-header/getting-started.docs.mdx
rename to packages/documentation/src/stories/components/internet-header/getting-started.docs.mdx
index d7c91faf0c..df41f3f0b8 100644
--- a/packages/documentation/src/stories/internet-header/getting-started.docs.mdx
+++ b/packages/documentation/src/stories/components/internet-header/getting-started.docs.mdx
@@ -5,7 +5,7 @@ import SampleLazyLoaded from './internet-header-lazy-loaded.sample.js?raw';
 import SampleBareComponent from './internet-header-bare-component.sample.js?raw';
 import SampleCDNLazyLoaded from './internet-header-cdn-lazy-loaded.sample.html?raw';
 import SampleCDNBareComponent from './internet-header-cdn-bare-component.sample.html?raw';
-import { SourceDarkMode } from '../../../.storybook/preview';
+import { SourceDarkMode } from '../../../../.storybook/preview';
 import * as GettingStartedStories from './getting-started.stories';
 
 <Meta of={GettingStartedStories} />
diff --git a/packages/documentation/src/stories/internet-header/getting-started.stories.ts b/packages/documentation/src/stories/components/internet-header/getting-started.stories.ts
similarity index 65%
rename from packages/documentation/src/stories/internet-header/getting-started.stories.ts
rename to packages/documentation/src/stories/components/internet-header/getting-started.stories.ts
index f4620ec745..78e0c93f49 100644
--- a/packages/documentation/src/stories/internet-header/getting-started.stories.ts
+++ b/packages/documentation/src/stories/components/internet-header/getting-started.stories.ts
@@ -1,8 +1,8 @@
 import { Meta, StoryObj } from '@storybook/web-components';
-import { BADGE } from '../../../.storybook/constants';
+import { BADGE } from '../../../../.storybook/constants';
 
 const meta: Meta = {
-  title: 'Internet Header/Getting Started',
+  title: 'Components/Internet Header/Getting Started',
   parameters: {
     badges: [BADGE.STABLE],
   },
diff --git a/packages/documentation/src/stories/internet-header/internet-header-bare-component.sample.js b/packages/documentation/src/stories/components/internet-header/internet-header-bare-component.sample.js
similarity index 100%
rename from packages/documentation/src/stories/internet-header/internet-header-bare-component.sample.js
rename to packages/documentation/src/stories/components/internet-header/internet-header-bare-component.sample.js
diff --git a/packages/documentation/src/stories/internet-header/internet-header-cdn-bare-component.sample.html b/packages/documentation/src/stories/components/internet-header/internet-header-cdn-bare-component.sample.html
similarity index 100%
rename from packages/documentation/src/stories/internet-header/internet-header-cdn-bare-component.sample.html
rename to packages/documentation/src/stories/components/internet-header/internet-header-cdn-bare-component.sample.html
diff --git a/packages/documentation/src/stories/internet-header/internet-header-cdn-lazy-loaded.sample.html b/packages/documentation/src/stories/components/internet-header/internet-header-cdn-lazy-loaded.sample.html
similarity index 100%
rename from packages/documentation/src/stories/internet-header/internet-header-cdn-lazy-loaded.sample.html
rename to packages/documentation/src/stories/components/internet-header/internet-header-cdn-lazy-loaded.sample.html
diff --git a/packages/documentation/src/stories/internet-header/internet-header-fix-app-styles.sample.html b/packages/documentation/src/stories/components/internet-header/internet-header-fix-app-styles.sample.html
similarity index 100%
rename from packages/documentation/src/stories/internet-header/internet-header-fix-app-styles.sample.html
rename to packages/documentation/src/stories/components/internet-header/internet-header-fix-app-styles.sample.html
diff --git a/packages/documentation/src/stories/internet-header/internet-header-frameworks.sample.html b/packages/documentation/src/stories/components/internet-header/internet-header-frameworks.sample.html
similarity index 100%
rename from packages/documentation/src/stories/internet-header/internet-header-frameworks.sample.html
rename to packages/documentation/src/stories/components/internet-header/internet-header-frameworks.sample.html
diff --git a/packages/documentation/src/stories/internet-header/internet-header-install.sample.html b/packages/documentation/src/stories/components/internet-header/internet-header-install.sample.html
similarity index 100%
rename from packages/documentation/src/stories/internet-header/internet-header-install.sample.html
rename to packages/documentation/src/stories/components/internet-header/internet-header-install.sample.html
diff --git a/packages/documentation/src/stories/internet-header/internet-header-lazy-loaded.sample.js b/packages/documentation/src/stories/components/internet-header/internet-header-lazy-loaded.sample.js
similarity index 100%
rename from packages/documentation/src/stories/internet-header/internet-header-lazy-loaded.sample.js
rename to packages/documentation/src/stories/components/internet-header/internet-header-lazy-loaded.sample.js
diff --git a/packages/documentation/src/stories/internet-header/internet-header-old.sample.html b/packages/documentation/src/stories/components/internet-header/internet-header-old.sample.html
similarity index 100%
rename from packages/documentation/src/stories/internet-header/internet-header-old.sample.html
rename to packages/documentation/src/stories/components/internet-header/internet-header-old.sample.html
diff --git a/packages/documentation/src/stories/internet-header/internet-header-reference.sample.ts b/packages/documentation/src/stories/components/internet-header/internet-header-reference.sample.ts
similarity index 100%
rename from packages/documentation/src/stories/internet-header/internet-header-reference.sample.ts
rename to packages/documentation/src/stories/components/internet-header/internet-header-reference.sample.ts
diff --git a/packages/documentation/src/stories/internet-header/migration-guide.docs.mdx b/packages/documentation/src/stories/components/internet-header/migration-guide.docs.mdx
similarity index 97%
rename from packages/documentation/src/stories/internet-header/migration-guide.docs.mdx
rename to packages/documentation/src/stories/components/internet-header/migration-guide.docs.mdx
index c3c94091c4..be4062ff6c 100644
--- a/packages/documentation/src/stories/internet-header/migration-guide.docs.mdx
+++ b/packages/documentation/src/stories/components/internet-header/migration-guide.docs.mdx
@@ -1,10 +1,9 @@
 import { Meta, Source } from '@storybook/blocks';
-import { BADGE } from '../../../.storybook/constants';
 import SampleReference from './internet-header-reference.sample.ts?raw';
 import SampleInstall from './internet-header-install.sample.html?raw';
 import SampleFixAppStyles from './internet-header-fix-app-styles.sample.html?raw';
 import SampleOld from './internet-header-old.sample.html?raw';
-import { SourceDarkMode } from '../../../.storybook/preview';
+import { SourceDarkMode } from '../../../../.storybook/preview';
 import * as MigrationGuideStories from './migration-guide.stories';
 
 <Meta of={MigrationGuideStories} />
diff --git a/packages/documentation/src/stories/internet-header/migration-guide.stories.ts b/packages/documentation/src/stories/components/internet-header/migration-guide.stories.ts
similarity index 65%
rename from packages/documentation/src/stories/internet-header/migration-guide.stories.ts
rename to packages/documentation/src/stories/components/internet-header/migration-guide.stories.ts
index 732fc5ea9c..e6095c031a 100644
--- a/packages/documentation/src/stories/internet-header/migration-guide.stories.ts
+++ b/packages/documentation/src/stories/components/internet-header/migration-guide.stories.ts
@@ -1,8 +1,8 @@
 import { Meta, StoryObj } from '@storybook/web-components';
-import { BADGE } from '../../../.storybook/constants';
+import { BADGE } from '../../../../.storybook/constants';
 
 const meta: Meta = {
-  title: 'Internet Header/Migration Guide',
+  title: 'Components/Internet Header/Migration Guide',
   parameters: {
     badges: [BADGE.STABLE],
   },
diff --git a/packages/documentation/src/stories/intranet-header/intranet-header-navigation-bar.sample.html b/packages/documentation/src/stories/components/intranet-header/intranet-header-navigation-bar.sample.html
similarity index 100%
rename from packages/documentation/src/stories/intranet-header/intranet-header-navigation-bar.sample.html
rename to packages/documentation/src/stories/components/intranet-header/intranet-header-navigation-bar.sample.html
diff --git a/packages/documentation/src/stories/intranet-header/intranet-header-postweb.sample.html b/packages/documentation/src/stories/components/intranet-header/intranet-header-postweb.sample.html
similarity index 100%
rename from packages/documentation/src/stories/intranet-header/intranet-header-postweb.sample.html
rename to packages/documentation/src/stories/components/intranet-header/intranet-header-postweb.sample.html
diff --git a/packages/documentation/src/stories/intranet-header/intranet-header-side-navigation.sample.html b/packages/documentation/src/stories/components/intranet-header/intranet-header-side-navigation.sample.html
similarity index 100%
rename from packages/documentation/src/stories/intranet-header/intranet-header-side-navigation.sample.html
rename to packages/documentation/src/stories/components/intranet-header/intranet-header-side-navigation.sample.html
diff --git a/packages/documentation/src/stories/intranet-header/intranet-header-use.sample.js b/packages/documentation/src/stories/components/intranet-header/intranet-header-use.sample.js
similarity index 100%
rename from packages/documentation/src/stories/intranet-header/intranet-header-use.sample.js
rename to packages/documentation/src/stories/components/intranet-header/intranet-header-use.sample.js
diff --git a/packages/documentation/src/stories/intranet-header/intranet-header.docs.mdx b/packages/documentation/src/stories/components/intranet-header/intranet-header.docs.mdx
similarity index 100%
rename from packages/documentation/src/stories/intranet-header/intranet-header.docs.mdx
rename to packages/documentation/src/stories/components/intranet-header/intranet-header.docs.mdx
diff --git a/packages/documentation/src/stories/intranet-header/intranet-header.stories.ts b/packages/documentation/src/stories/components/intranet-header/intranet-header.stories.ts
similarity index 97%
rename from packages/documentation/src/stories/intranet-header/intranet-header.stories.ts
rename to packages/documentation/src/stories/components/intranet-header/intranet-header.stories.ts
index 9f62d3a69c..d3f7934510 100644
--- a/packages/documentation/src/stories/intranet-header/intranet-header.stories.ts
+++ b/packages/documentation/src/stories/components/intranet-header/intranet-header.stories.ts
@@ -1,8 +1,8 @@
 import { Meta } from '@storybook/web-components';
-import { BADGE } from '../../../.storybook/constants';
+import { BADGE } from '../../../../.storybook/constants';
 
 const meta: Meta = {
-  title: 'Intranet Header/Getting Started',
+  title: 'Components/Intranet Header/Getting Started',
   parameters: {
     badges: [BADGE.NEEDS_REVISION],
   },
diff --git a/packages/documentation/src/stories/components/select/select.snapshot.stories.ts b/packages/documentation/src/stories/components/select/select.snapshot.stories.ts
deleted file mode 100644
index 2c7fe6ca30..0000000000
--- a/packages/documentation/src/stories/components/select/select.snapshot.stories.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import type { Args, StoryContext, StoryObj } from '@storybook/web-components';
-import meta, { Default, FloatingLabel } from './select.stories';
-import { html } from 'lit';
-import { getCombinations, COMBINATIONS } from '../../../utils/inputComponentsGetCombinations';
-
-export default {
-  ...meta,
-  title: 'Snapshots',
-  render: renderSelectSnapshot,
-};
-
-function renderSelectSnapshot(_args: Args, context: StoryContext) {
-  const combinations = [
-    ...COMBINATIONS,
-    {
-      label: `Label - small multipleSize`,
-      multipleSize: 2,
-    },
-    {
-      label: `Label - large multipleSize`,
-      multipleSize: 6,
-    },
-    {
-      label: `Label - With option selected`,
-      selectedOption: 2,
-    },
-    {
-      label: `Label - Floating Label with placeholder`,
-      floatingLabelPlaceholder: true,
-    },
-  ];
-  return html`
-    <div class="d-flex flex-wrap align-items-start gap-regular">
-      ${['bg-white', 'bg-dark'].map(
-        bg => html`
-          <div class="${bg} d-flex gap-3 flex-column p-3">
-            <h3>Sizes</h3>
-            ${getCombinations('size', context.argTypes.size.options, combinations)
-              .filter(
-                (args: Args) =>
-                  (!args.multipleSize || (args.multipleSize && context.args.multiple === true)) &&
-                  !args.floatingLabelPlaceholder,
-              )
-              .map(
-                (args: Args) =>
-                  html`
-                    <div>
-                      ${args.title !== undefined && args.title
-                        ? html`
-                            <h4>
-                              ${Object.entries(context.argTypes.size.control.labels)
-                                .filter(([key, value]) => key === args.size)
-                                .map(s => s[1])}
-                            </h4>
-                          `
-                        : ''}
-                      <div>${Default.render?.({ ...context.args, ...args }, context)}</div>
-                    </div>
-                  `,
-              )}
-            <h3>Floating Label</h3>
-            ${getCombinations('floatingLabel', [true], combinations)
-              .filter(
-                (args: Args) =>
-                  !args.multipleSize || (args.multipleSize && context.args.multiple === true),
-              )
-              .map(
-                (args: Args) =>
-                  html`
-                    <div>${FloatingLabel.render?.({ ...context.args, ...args }, context)}</div>
-                  `,
-              )}
-          </div>
-        `,
-      )}
-    </div>
-  `;
-}
-
-type Story = StoryObj;
-
-export const Selectdefault: Story = {
-  args: {
-    multiple: false,
-  },
-};
-export const Selectmultiple: Story = {
-  args: {
-    multiple: true,
-  },
-};
diff --git a/packages/documentation/src/stories/home.docs.mdx b/packages/documentation/src/stories/home.docs.mdx
index 37a26b1fe1..608c212a52 100644
--- a/packages/documentation/src/stories/home.docs.mdx
+++ b/packages/documentation/src/stories/home.docs.mdx
@@ -14,21 +14,21 @@ import './home.styles.scss';
       title="Styles"
       href="https://github.com/swisspost/design-system/tree/main/packages/styles"
     >
-      <img src="/images/packages/styles.svg" alt="design-system-styles package logo" />
+      <img src="/assets/images/packages/styles.svg" alt="design-system-styles package logo" />
       <span>v{getVersion('styles')}</span>
     </Tile>
     <Tile
       title="Components"
       href="https://github.com/swisspost/design-system/tree/main/packages/components"
     >
-      <img src="/images/packages/components.svg" alt="design-system-components package Logo" />
+      <img src="/assets/images/packages/components.svg" alt="design-system-components package Logo" />
       <span>v{getVersion('components')}</span>
     </Tile>
     <Tile
       title="Internet-Header"
       href="https://github.com/swisspost/design-system/tree/main/packages/internet-header"
     >
-      <img src="/images/packages/internet-header.svg" alt="internet-header package Logo" />
+      <img src="/assets/images/packages/internet-header.svg" alt="internet-header package Logo" />
       <span>v{getVersion('internetheader')}</span>
     </Tile>
     <Tile
@@ -36,13 +36,13 @@ import './home.styles.scss';
       href="https://github.com/swisspost/design-system/tree/main/packages/intranet-header-workspace/projects/intranet-header"
     >
       <img
-        src="/images/packages/intranet-header.svg"
+        src="/assets/images/packages/intranet-header.svg"
         alt="design-system-intranet-header package Logo"
       />
       <span>v{getVersion('intranetheader')}</span>
     </Tile>
     <Tile title="Icons" href="https://github.com/swisspost/design-system/tree/main/packages/icons">
-      <img src="/images/packages/icons.svg" alt="design-system-icons package Logo" />
+      <img src="/assets/images/packages/icons.svg" alt="design-system-icons package Logo" />
       <span>v{getVersion('icons')}</span>
     </Tile>
   </div>
@@ -129,71 +129,71 @@ import './home.styles.scss';
 
   <div className="tile-wrapper">
     <Tile href="https://www.figma.com/">
-        <img src="/images/technologies/logo-figma.svg" alt="Figma Logo" />
+        <img src="/assets/images/technologies/logo-figma.svg" alt="Figma Logo" />
         <span>Figma</span>
     </Tile>
     <Tile href="https://pnpm.io/">
-        <img src="/images/technologies/logo-pnpm.svg" alt="Pnpm Logo" />
+        <img src="/assets/images/technologies/logo-pnpm.svg" alt="Pnpm Logo" />
         <span>pnpm</span>
     </Tile>
     <Tile href="https://github.com/changesets/changesets">
-        <img src="/images/technologies/logo-changesets.png" alt="Changesets Logo" />
+        <img src="/assets/images/technologies/logo-changesets.png" alt="Changesets Logo" />
         <span>Changesets</span>
     </Tile>
     <Tile href="https://webpack.js.org/">
-        <img src="/images/technologies/logo-webpack.svg" alt="Webpack Logo" />
+        <img src="/assets/images/technologies/logo-webpack.svg" alt="Webpack Logo" />
         <span>Webpack</span>
     </Tile>
     <Tile href="https://gulpjs.com/">
-        <img src="/images/technologies/logo-gulp.svg" alt="Gulp Logo" />
+        <img src="/assets/images/technologies/logo-gulp.svg" alt="Gulp Logo" />
         <span>Gulp</span>
     </Tile>
     <Tile href={ `https://getbootstrap.com/docs/${getVersion('bootstrap', 'Mm')}` }>
-        <img src="/images/technologies/logo-bootstrap.svg" alt="Bootstrap Logo" />
+        <img src="/assets/images/technologies/logo-bootstrap.svg" alt="Bootstrap Logo" />
         <span>Bootstrap</span>
     </Tile>
     <Tile href="https://sass-lang.com/">
-        <img src="/images/technologies/logo-sass.svg" alt="Sass Logo" />
+        <img src="/assets/images/technologies/logo-sass.svg" alt="Sass Logo" />
         <span>Sass</span>
     </Tile>
     <Tile href="https://stenciljs.com/">
-        <img src="/images/technologies/logo-stencil.png" alt="Stencil JS Logo" />
+        <img src="/assets/images/technologies/logo-stencil.png" alt="Stencil JS Logo" />
         <span>Stencil JS</span>
     </Tile>
     <Tile href="https://angular.io/">
-        <img src="/images/technologies/logo-angular.svg" alt="Angular Logo" />
+        <img src="/assets/images/technologies/logo-angular.svg" alt="Angular Logo" />
         <span>Angular</span>
     </Tile>
     <Tile href="https://reactjs.org/">
-        <img src="/images/technologies/logo-react.svg" alt="React JS Logo" />
+        <img src="/assets/images/technologies/logo-react.svg" alt="React JS Logo" />
         <span>React JS</span>
     </Tile>
     <Tile href="https://vuejs.org/">
-        <img src="/images/technologies/logo-vue.svg" alt="Vue JS Logo" />
+        <img src="/assets/images/technologies/logo-vue.svg" alt="Vue JS Logo" />
         <span>Vue JS</span>
     </Tile>
     <Tile href="https://github.com/svg/svgo">
-        <img src="/images/technologies/logo-svgo.svg" alt="SVGO Logo" />
+        <img src="/assets/images/technologies/logo-svgo.svg" alt="SVGO Logo" />
         <span>SVGO</span>
     </Tile>
     <Tile href="https://jestjs.io/">
-        <img src="/images/technologies/logo-jest.svg" alt="Jest Logo" />
+        <img src="/assets/images/technologies/logo-jest.svg" alt="Jest Logo" />
         <span>Jest</span>
     </Tile>
     <Tile href="https://www.cypress.io/">
-        <img src="/images/technologies/logo-cypress.svg" alt="Cypress Logo" />
+        <img src="/assets/images/technologies/logo-cypress.svg" alt="Cypress Logo" />
         <span>Cypress</span>
     </Tile>
     <Tile href="https://percy.io/">
-        <img src="/images/technologies/logo-percy.svg" alt="Percy Logo" />
+        <img src="/assets/images/technologies/logo-percy.svg" alt="Percy Logo" />
         <span>Percy</span>
     </Tile>
     <Tile href="https://storybook.js.org/">
-        <img src="/images/technologies/logo-storybook.svg" alt="Storybook Logo" />
+        <img src="/assets/images/technologies/logo-storybook.svg" alt="Storybook Logo" />
         <span>Storybook</span>
     </Tile>
     <Tile href="https://github.com/">
-        <img src="/images/technologies/logo-github.svg" alt="github Logo" />
+        <img src="/assets/images/technologies/logo-github.svg" alt="github Logo" />
         <span>github</span>
     </Tile>
   </div>
diff --git a/packages/documentation/src/stories/internet-header/components/footer/custom-config/footer-config.stories.ts b/packages/documentation/src/stories/internet-header/components/footer/custom-config/footer-config.stories.ts
deleted file mode 100644
index 8dfd91db51..0000000000
--- a/packages/documentation/src/stories/internet-header/components/footer/custom-config/footer-config.stories.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import * as FooterStories from '../footer.stories';
-
-export default { ...FooterStories.default, title: 'Internet Header/Footer/Custom Config' };
-
-export const Default = FooterStories.CustomConfig;
diff --git a/packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-custom-config.stories.ts b/packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-custom-config.stories.ts
deleted file mode 100644
index 54095bded0..0000000000
--- a/packages/documentation/src/stories/internet-header/components/header/overrides-stories/header-custom-config.stories.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import * as HeaderStories from '../header.stories';
-
-export default { ...HeaderStories.default, title: 'Internet Header/Header/Custom Config' };
-
-export const Default = HeaderStories.CustomConfig;
diff --git a/packages/documentation/src/stories/templates/forms/forms.stories.ts b/packages/documentation/src/stories/templates/forms/forms.stories.ts
index 86b4cff338..0a2c16f6c7 100644
--- a/packages/documentation/src/stories/templates/forms/forms.stories.ts
+++ b/packages/documentation/src/stories/templates/forms/forms.stories.ts
@@ -2,7 +2,7 @@ import { Meta, StoryObj } from '@storybook/web-components';
 import { BADGE } from '../../../../.storybook/constants';
 
 const meta: Meta = {
-  title: 'Templates/Forms',
+  title: 'Patterns/Forms',
   parameters: {
     badges: [BADGE.TODO],
   },
diff --git a/packages/documentation/src/utils/inputComponentsGetCombinations.ts b/packages/documentation/src/utils/inputComponentsGetCombinations.ts
index b0df64df46..0086a91b2e 100644
--- a/packages/documentation/src/utils/inputComponentsGetCombinations.ts
+++ b/packages/documentation/src/utils/inputComponentsGetCombinations.ts
@@ -24,10 +24,19 @@ export const COMBINATIONS = [
     label: `${SHORT_LABEL} - Disabled`,
     disabled: true,
   },
+  {
+    label: `${SHORT_LABEL} - Success`,
+    success: true,
+  },
   {
     label: `${SHORT_LABEL} - Valid`,
     validation: 'is-valid',
   },
+  {
+    label: `${SHORT_LABEL} - Valid with success`,
+    validation: 'is-valid',
+    success: true,
+  },
   {
     label: `${SHORT_LABEL} - Invalid`,
     validation: 'is-invalid',
@@ -37,7 +46,10 @@ export const COMBINATIONS = [
 export function getCombinations(
   argumentName: string,
   argumentValues: Array<unknown>,
-  combinations: Array<{ label: string; [propName: string]: any }>,
+  combinations: Array<{
+    label: string;
+    [propName: string]: any;
+  }>,
 ) {
   let result: Array<Object> = [];
   for (const argumentValue of argumentValues) {
diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md
index 3475838b9d..e417c417b7 100644
--- a/packages/icons/CHANGELOG.md
+++ b/packages/icons/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @swisspost/design-system-icons
 
+## 1.0.16
+
+### Patch Changes
+
+- Added icons number 2493, 2557, 2558, 2559, 2560, 2561, 2562, 2563, 2564 and 2565.Updated icons number 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1029, 1030, 1031, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 2000, 2001, 2002, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021, 2022, 2023, 2024, 2025, 2026, 2027, 2028, 2029, 2030, 2032, 2034, 2036, 2053, 2054, 2057, 2059, 2060, 2062, 2069, 2071, 2072, 2073, 2074, 2075, 2076, 2077, 2078, 2079, 2080, 2081, 2082, 2083, 2084, 2085, 2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2099, 2100, 2102, 2103, 2104, 2106, 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117, 2118, 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129, 2130, 2131, 2132, 2133, 2134, 2135, 2136, 2137, 2138, 2139, 2140, 2141, 2142, 2143, 2144, 2145, 2146, 2147, 2148, 2149, 2150, 2151, 2152, 2153, 2154, 2155, 2156, 2157, 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2166, 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2174, 2175, 2176, 2177, 2178, 2179, 2180, 2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189, 2190, 2191, 2192, 2193, 2194, 2195, 2196, 2197, 2198, 2199, 2200, 2201, 2202, 2203, 2205, 2206, 2207, 2208, 2209, 2210, 2211, 2212, 2213, 2214, 2215, 2216, 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2225, 2226, 2227, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237, 2238, 2239, 2240, 2241, 2242, 2243, 2244, 2245, 2246, 2247, 2248, 2249, 2250, 2251, 2252, 2253, 2254, 2255, 2256, 2257, 2258, 2259, 2260, 2261, 2262, 2263, 2264, 2265, 2266, 2267, 2268, 2269, 2270, 2271, 2272, 2273, 2274, 2275, 2276, 2277, 2278, 2279, 2280, 2281, 2282, 2283, 2284, 2285, 2286, 2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2296, 2297, 2298, 2299, 2300, 2301, 2302, 2303, 2304, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 2312, 2313, 2314, 2315, 2316, 2317, 2318, 2319, 2320, 2321, 2322, 2323, 2324, 2325, 2326, 2327, 2328, 2329, 2330, 2331, 2332, 2333, 2334, 2335, 2336, 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2344, 2345, 2346, 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2354, 2355, 2356, 2357, 2358, 2359, 2360, 2361, 2362, 2363, 2364, 2365, 2366, 2367, 2368, 2369, 2370, 2371, 2372, 2373, 2374, 2375, 2376, 2377, 2378, 2379, 2380, 2381, 2382, 2383, 2384, 2385, 2386, 2387, 2388, 2389, 2390, 2391, 2392, 2393, 2394, 2395, 2396, 2397, 2398, 2399, 2400, 2401, 2402, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 2410, 2411, 2412, 2413, 2414, 2415, 2416, 2417, 2418, 2419, 2420, 2421, 2422, 2423, 2424, 2425, 2426, 2427, 2428, 2429, 2430, 2431, 2432, 2433, 2434, 2435, 2436, 2437, 2438, 2439, 2440, 2441, 2442, 2443, 2444, 2445, 2446, 2447, 2448, 2449, 2450, 2451, 2452, 2453, 2454, 2455, 2456, 2457, 2458, 2459, 2460, 2461, 2462, 2463, 2464, 2465, 2466, 2467, 2468, 2469, 2470, 2471, 2472, 2473, 2474, 2475, 2476, 2477, 2478, 2479, 2480, 2481, 2482, 2483, 2484, 2485, 2486, 2487, 2488, 2489, 2490, 2491, 2492, 2494, 2495, 2496, 2497, 2498, 2499, 2500, 2501, 2502, 2503, 2504, 2505, 2506, 2507, 2508, 2509, 2510, 2511, 2512, 2513, 2514, 2515, 2516, 2517, 2518, 2519, 2520, 2521, 2522, 2523, 2524, 2525, 2526, 2527, 2528, 2529, 2530, 2531, 2532, 2533, 2534, 2535, 2536, 2537, 2538, 2539, 2540, 2541, 2542, 2543, 2544, 2545, 2546, 2547, 2548, 2549, 2550, 2551, 2552, 2553, 2554, 2555, 2556, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015, 3016, 3017, 3018, 3019, 3026, 3033, 3034, 3036, 3037, 3038, 3039, 3040, 3041, 3042, 3043, 3044, 3045, 3046, 3047, 3048, 3049, 3050, 3051, 3052, 3053, 3054, 3055, 3056, 3057, 3058, 3059, 3060, 3061, 3062, 3063, 3064, 3065, 3066, 3067, 3068, 3069, 3070, 3071, 3072, 3073, 3074, 3075, 3076, 3077, 3078, 3079, 3080, 3081, 3082, 3083, 3084, 3085, 3086, 3087, 3088, 3089, 3090, 3091, 3092, 3093, 3094, 3095, 3096, 3097, 3098, 3099, 3100, 3101, 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3110, 3111, 3112, 3113, 3114, 3115, 3116, 3117, 3118, 3119, 3120, 3121, 3122, 3123, 3124, 3125, 3126, 3127, 3128, 3129, 3130, 3131, 3132, 3133, 3134, 3135, 3137, 3138, 3139, 3140, 3141, 3142, 3143, 3146, 3147, 3148, 3149, 3150, 3151, 3152, 3153, 3154, 3155, 3156, 3157, 3158, 3159, 3160, 3161, 3163, 3164, 3165, 3168, 3170, 3171, 3172, 3173, 3174, 3175, 3176, 3177, 3178, 3179, 3180, 3181, 3182, 3183, 3184, 3185, 3186, 3187, 3188, 3189, 3190, 3191, 3193, 3194, 3195, 3196, 3197, 3198, 3199, 3200, 3203, 3204, 3205, 3206, 3208, 3209, 3210, 3211, 3212, 3213, 3214, 3215, 3216, 3217, 3218, 3219, 3220, 3221, 3222, 3223, 3224, 3225, 3226, 3227, 3228, 3229, 3230, 3231, 3232, 3233, 3234, 3235, 3236, 3237, 3238, 3239, 3240, 3241, 3242, 3243, 3244, 3245, 3246, 3247, 3248, 3249, 3250, 3251, 3252, 3253, 3254, 3255, 3256, 3257, 3258, 3259, 3260, 8000, 8001, 8002, 8004, 8005, 8006, 8007, 8008, 8009, 8010, 8011, 8012, 8013, 8014, 8015, 8016, 8017, 8018 and 8019. (by [@swisspost-bot](https://github.com/swisspost-bot) with [#2346](https://github.com/swisspost/design-system/pull/2346))
+
 ## 1.0.15
 
 ### Patch Changes
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 5f69f81e37..e14aa01728 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swisspost/design-system-icons",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "A collection of Swiss Post icons intended for use with the Design System.",
   "author": "Swiss Post <oss@post.ch>",
   "license": "Apache-2.0",
diff --git a/packages/internet-header/CHANGELOG.md b/packages/internet-header/CHANGELOG.md
index a3a1274f0a..4825c0c31c 100644
--- a/packages/internet-header/CHANGELOG.md
+++ b/packages/internet-header/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @swisspost/internet-header
 
+## 1.13.1
+
+### Patch Changes
+
+- Defined @stencil/core and @stencil/store as a devDependency to avoid compatibilities issues. (by [@imagoiq](https://github.com/imagoiq) with [#2313](https://github.com/swisspost/design-system/pull/2313))
+
+- Fixed position of close button on click or on focus in the help overlay. (by [@imagoiq](https://github.com/imagoiq) with [#2365](https://github.com/swisspost/design-system/pull/2365))
+
+- Fixed display of active navigation in High Contrast Mode. (by [@imagoiq](https://github.com/imagoiq) with [#2314](https://github.com/swisspost/design-system/pull/2314))
+- Updated dependencies:
+  - @swisspost/design-system-styles@6.5.0
+
 ## 1.13.0
 
 ### Minor Changes
diff --git a/packages/internet-header/cypress/e2e/breadcrumbs.cy.ts b/packages/internet-header/cypress/e2e/breadcrumbs.cy.ts
index c5c46cfbde..f689d7cea1 100644
--- a/packages/internet-header/cypress/e2e/breadcrumbs.cy.ts
+++ b/packages/internet-header/cypress/e2e/breadcrumbs.cy.ts
@@ -33,13 +33,13 @@ describe('breadcrumb', () => {
       modifiedConfig.fr.breadcrumb = undefined;
       modifiedConfig.it.breadcrumb = undefined;
 
-      prepare('Internet Header/Breadcrumbs', 'Default', { config: modifiedConfig });
+      prepare('Components/Internet Header/Breadcrumbs', 'Default', { config: modifiedConfig });
       cy.get('swisspost-internet-breadcrumbs').should('exist');
       cy.get('div.breadcrumbs').should('not.exist');
     });
 
     it(`should add custom elements`, () => {
-      prepare('Internet Header/Breadcrumbs/Custom Items', 'Default');
+      prepare('Components/Internet Header/Breadcrumbs/Custom Items', 'Default');
 
       cy.changeArg('custom-items', [
         { text: 'Test1', url: '/x/y/z' },
@@ -63,7 +63,7 @@ describe('breadcrumb', () => {
 
   describe('Toggle overlay buttons', () => {
     beforeEach(() => {
-      prepare('Internet Header/Breadcrumbs', 'Default');
+      prepare('Components/Internet Header/Breadcrumbs', 'Default');
       cy.get('div.breadcrumbs').as('breadcrumbs');
       cy.intercept(
         'https://post.ch/de/kundencenter/onlinedienste/standorte-und-oeffnungszeiten/**',
@@ -111,7 +111,7 @@ describe('breadcrumb', () => {
   describe('mobile', () => {
     beforeEach(() => {
       cy.viewport('iphone-6+');
-      prepare('Internet Header/Breadcrumbs', 'Default');
+      prepare('Components/Internet Header/Breadcrumbs', 'Default');
       cy.get('div.breadcrumbs').as('breadcrumbs');
     });
 
diff --git a/packages/internet-header/cypress/e2e/footer.cy.ts b/packages/internet-header/cypress/e2e/footer.cy.ts
index fdd972c771..32227b890c 100644
--- a/packages/internet-header/cypress/e2e/footer.cy.ts
+++ b/packages/internet-header/cypress/e2e/footer.cy.ts
@@ -4,7 +4,7 @@ describe('footer', () => {
   describe('config', () => {
     describe('custom footer config set', () => {
       it(`shows custom footer links`, async () => {
-        prepare('Internet Header/Footer', 'Default');
+        prepare('Components/Internet Header/Footer', 'Default');
 
         const customFooterConfig = {
           de: {
@@ -41,12 +41,12 @@ describe('footer', () => {
 
     describe('external functions test', () => {
       it('should not show cookie settings link when UC_UI is not defined', () => {
-        prepare('Internet Header/Footer', 'Default');
+        prepare('Components/Internet Header/Footer', 'Default');
         cy.get('.footer-meta-links').should('exist').get('.cookie-settings').should('not.exist');
       });
 
       it('should show cookie settings when UC_UI is defined', () => {
-        prepare('Internet Header/Footer', 'Default');
+        prepare('Components/Internet Header/Footer', 'Default');
         cy.window().then(win => {
           win['UC_UI'] = { showSecondLayer: () => 'second layer mock' };
           cy.get('.footer-meta-links').should('exist').get('.cookie-settings').should('exist');
diff --git a/packages/internet-header/cypress/e2e/header.cy.ts b/packages/internet-header/cypress/e2e/header.cy.ts
index 23b53103ff..670050b2dc 100644
--- a/packages/internet-header/cypress/e2e/header.cy.ts
+++ b/packages/internet-header/cypress/e2e/header.cy.ts
@@ -2,7 +2,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('header', () => {
   beforeEach(() => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.changeArg('language', 'de');
   });
 
diff --git a/packages/internet-header/cypress/e2e/language-detection.cy.ts b/packages/internet-header/cypress/e2e/language-detection.cy.ts
index 5b5865ed2d..6eea364a86 100644
--- a/packages/internet-header/cypress/e2e/language-detection.cy.ts
+++ b/packages/internet-header/cypress/e2e/language-detection.cy.ts
@@ -3,7 +3,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('language detection from storybook', () => {
   it('should not render the header without languages in the config', () => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.get('swisspost-internet-header').should('exist');
     cy.get('.post-internet-header').should('not.exist');
   });
@@ -15,7 +15,7 @@ describe('language detection from storybook', () => {
     delete customConfig.fr;
     delete customConfig.en;
 
-    prepare('Internet Header/Header', 'Default', { config: customConfig });
+    prepare('Components/Internet Header/Header', 'Default', { config: customConfig });
 
     cy.get('swisspost-internet-header')
       .shadow()
diff --git a/packages/internet-header/cypress/e2e/language-switch.cy.ts b/packages/internet-header/cypress/e2e/language-switch.cy.ts
index b4b9481fca..554d5435c1 100644
--- a/packages/internet-header/cypress/e2e/language-switch.cy.ts
+++ b/packages/internet-header/cypress/e2e/language-switch.cy.ts
@@ -9,7 +9,7 @@ describe('language-switch', () => {
 
   beforeEach(() => {
     cy.viewport(1024, 800);
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.changeArg('language', 'de');
   });
 
@@ -140,7 +140,7 @@ describe('language-switch', () => {
         url: '',
       };
       config.en!.header.navLang = [navLangEntry];
-      prepare('Internet Header/Header', 'Default', { config });
+      prepare('Components/Internet Header/Header', 'Default', { config });
       cy.get('#post-language-switch-desktop').should('not.exist');
     });
 
diff --git a/packages/internet-header/cypress/e2e/login.cy.ts b/packages/internet-header/cypress/e2e/login.cy.ts
index 1187c78354..2d73ae040e 100644
--- a/packages/internet-header/cypress/e2e/login.cy.ts
+++ b/packages/internet-header/cypress/e2e/login.cy.ts
@@ -6,7 +6,7 @@ describe('login', () => {
   describe('args', () => {
     describe('login: true', () => {
       it(`adds login control`, () => {
-        prepare('Internet Header/Header', 'Default');
+        prepare('Components/Internet Header/Header', 'Default');
         cy.changeArg('login', true);
         cy.get('post-klp-login-widget').should('exist').and('be.visible');
       });
@@ -14,7 +14,7 @@ describe('login', () => {
 
     describe('login: false', () => {
       it(`removes login control`, () => {
-        prepare('Internet Header/Header', 'Default');
+        prepare('Components/Internet Header/Header', 'Default');
         cy.changeArg('login', false);
         cy.get('post-klp-login-widget').should('not.exist');
       });
@@ -31,7 +31,7 @@ describe('login', () => {
         config.de!.header.loginWidgetOptions = undefined;
 
         // Intercept the request to the config API and return a static response
-        prepare('Internet Header/Header', 'Default', { config });
+        prepare('Components/Internet Header/Header', 'Default', { config });
         cy.changeArg('language', 'de');
 
         // Assert the header is hydrated
@@ -49,7 +49,7 @@ describe('login', () => {
         let config: IPortalConfig = JSON.parse(JSON.stringify(testConfiguration));
         config.de!.header.showJobsLoginWidget = true;
         config.de!.header.isLoginWidgetHidden = false;
-        prepare('Internet Header/Header', 'Default', { config });
+        prepare('Components/Internet Header/Header', 'Default', { config });
         cy.changeArg('language', 'de');
         console.warn(config.de?.header.loginWidgetOptions);
         cy.get('swisspost-internet-header').should('have.class', 'hydrated');
@@ -63,7 +63,7 @@ describe('login', () => {
         let config: IPortalConfig = JSON.parse(JSON.stringify(testConfiguration));
         config.de!.header.showJobsLoginWidget = false;
         config.de!.header.isLoginWidgetHidden = false;
-        prepare('Internet Header/Header', 'Default', { config });
+        prepare('Components/Internet Header/Header', 'Default', { config });
         cy.changeArg('language', 'de');
         cy.get('swisspost-internet-header').should('have.class', 'hydrated');
         cy.get('.klp-widget-anonymous').should('exist');
diff --git a/packages/internet-header/cypress/e2e/logout.cy.ts b/packages/internet-header/cypress/e2e/logout.cy.ts
index 2e6d324903..15c36524a2 100644
--- a/packages/internet-header/cypress/e2e/logout.cy.ts
+++ b/packages/internet-header/cypress/e2e/logout.cy.ts
@@ -4,7 +4,7 @@ describe('logout', () => {
   describe('args', () => {
     describe('logoutUrl', () => {
       it('logout with url from config', () => {
-        prepare('Internet Header/Header', 'Default', { loggedIn: true });
+        prepare('Components/Internet Header/Header', 'Default', { loggedIn: true });
         logoutFromMenu();
 
         const origin = 'https://www.post.ch';
@@ -15,7 +15,7 @@ describe('logout', () => {
       });
 
       it(`overrides logout url from config`, () => {
-        prepare('Internet Header/Header', 'Default', { loggedIn: true });
+        prepare('Components/Internet Header/Header', 'Default', { loggedIn: true });
         cy.changeArg('logoutUrl', 'about:blank');
         logoutFromMenu();
         cy.location('pathname').should('eq', 'blank');
diff --git a/packages/internet-header/cypress/e2e/main-navigation.cy.ts b/packages/internet-header/cypress/e2e/main-navigation.cy.ts
index 15f31e0ff3..38e35d076b 100644
--- a/packages/internet-header/cypress/e2e/main-navigation.cy.ts
+++ b/packages/internet-header/cypress/e2e/main-navigation.cy.ts
@@ -3,7 +3,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('main-navigation', () => {
   beforeEach(() => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.changeArg('language', 'de');
   });
 
@@ -28,7 +28,7 @@ describe('main-navigation', () => {
   it('should have an active route when config defines an active route', () => {
     const activeConfig = JSON.parse(JSON.stringify(testConfiguration));
     activeConfig.de.header.navMain[0].isActive = true;
-    prepare('Internet Header/Header', 'Default', { config: activeConfig });
+    prepare('Components/Internet Header/Header', 'Default', { config: activeConfig });
     cy.changeArg('language', 'de');
     cy.get('swisspost-internet-header')
       .shadow()
@@ -48,7 +48,7 @@ describe('main-navigation', () => {
   });
 
   it('Changes active link also in custom config nav links', () => {
-    prepare('Internet Header/Header/Custom Config', 'Default');
+    prepare('Components/Internet Header/Header/Custom Config', 'Default');
     cy.changeArg('language', 'en');
     cy.changeArg('active-route', 'https://maps.google.com');
     cy.get('swisspost-internet-header')
diff --git a/packages/internet-header/cypress/e2e/meta-navigation.cy.ts b/packages/internet-header/cypress/e2e/meta-navigation.cy.ts
index 8eef0aa451..d02dbc408e 100644
--- a/packages/internet-header/cypress/e2e/meta-navigation.cy.ts
+++ b/packages/internet-header/cypress/e2e/meta-navigation.cy.ts
@@ -4,7 +4,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('meta-navigation', () => {
   beforeEach(() => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.changeArg('language', 'de');
     cy.viewport(1024, Cypress.config('viewportHeight'));
   });
@@ -96,7 +96,7 @@ describe('meta-navigation', () => {
         // Clear meta navigation config
         config.de!.header.navMeta = undefined;
 
-        prepare('Internet Header/Header', 'Default', { config });
+        prepare('Components/Internet Header/Header', 'Default', { config });
         cy.changeArg('language', 'de');
 
         // Assert the header is hydrated
@@ -122,7 +122,7 @@ describe('meta-navigation', () => {
           },
         ];
 
-        prepare('Internet Header/Header', 'Default', { config });
+        prepare('Components/Internet Header/Header', 'Default', { config });
         cy.changeArg('language', 'de');
 
         // Assert the header is hydrated
diff --git a/packages/internet-header/cypress/e2e/os-flyout.cy.ts b/packages/internet-header/cypress/e2e/os-flyout.cy.ts
index 097d30ada6..e9c0a3c326 100644
--- a/packages/internet-header/cypress/e2e/os-flyout.cy.ts
+++ b/packages/internet-header/cypress/e2e/os-flyout.cy.ts
@@ -2,7 +2,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('os-flyout', () => {
   beforeEach(() => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
   });
   it('should customize the os flyout title', () => {
     const title = 'Test OS Flyout';
diff --git a/packages/internet-header/cypress/e2e/search.cy.ts b/packages/internet-header/cypress/e2e/search.cy.ts
index d345f0575a..3dc0e8355e 100644
--- a/packages/internet-header/cypress/e2e/search.cy.ts
+++ b/packages/internet-header/cypress/e2e/search.cy.ts
@@ -18,7 +18,7 @@ describe('search', () => {
       'StaoCacheTypes',
     );
 
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.changeArg('language', 'de');
   });
 
@@ -75,7 +75,7 @@ describe('search', () => {
       it('Coveo suggestions should be turned off with isCustomSuggestionHidden', () => {
         const config = copyConfig();
         config.de!.header.search.isCustomSuggestionHidden = true;
-        prepare('Internet Header/Header', 'Default', { config });
+        prepare('Components/Internet Header/Header', 'Default', { config });
         cy.changeArg('language', 'de');
         cy.get(searchButton).click();
         cy.get('#searchBox').type('s', { force: true });
diff --git a/packages/internet-header/cypress/e2e/skiplinks.cy.ts b/packages/internet-header/cypress/e2e/skiplinks.cy.ts
index b9292e67d9..891d2aa76f 100644
--- a/packages/internet-header/cypress/e2e/skiplinks.cy.ts
+++ b/packages/internet-header/cypress/e2e/skiplinks.cy.ts
@@ -2,7 +2,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('skiplinks', () => {
   beforeEach(() => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
     cy.changeArg('language', 'de');
   });
 
diff --git a/packages/internet-header/cypress/e2e/stickyness.cy.ts b/packages/internet-header/cypress/e2e/stickyness.cy.ts
index 37187ce37b..3801015178 100644
--- a/packages/internet-header/cypress/e2e/stickyness.cy.ts
+++ b/packages/internet-header/cypress/e2e/stickyness.cy.ts
@@ -2,7 +2,7 @@ import { prepare } from '../support/prepare-story';
 
 describe('stickyness', () => {
   beforeEach(() => {
-    prepare('Internet Header/Header', 'Default');
+    prepare('Components/Internet Header/Header', 'Default');
   });
 
   it('should not show header when scrolling when stickyness is none', () => {
diff --git a/packages/internet-header/package.json b/packages/internet-header/package.json
index 877d28836f..3d9695120f 100644
--- a/packages/internet-header/package.json
+++ b/packages/internet-header/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swisspost/internet-header",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "The header for client facing applications.",
   "author": "Swiss Post <oss@post.ch>",
   "license": "Apache-2.0",
@@ -41,7 +41,7 @@
     "generate": "stencil generate"
   },
   "dependencies": {
-    "@swisspost/design-system-styles": "workspace:6.4.4",
+    "@swisspost/design-system-styles": "workspace:6.5.0",
     "body-scroll-lock": "4.0.0-beta.0",
     "iframe-resizer": "4.3.9",
     "jquery": "3.7.1",
diff --git a/packages/internet-header/src/components/post-internet-breadcrumbs/post-internet-breadcrumbs.scss b/packages/internet-header/src/components/post-internet-breadcrumbs/post-internet-breadcrumbs.scss
index 3c1cb2cbaa..21b1d9a6cb 100644
--- a/packages/internet-header/src/components/post-internet-breadcrumbs/post-internet-breadcrumbs.scss
+++ b/packages/internet-header/src/components/post-internet-breadcrumbs/post-internet-breadcrumbs.scss
@@ -184,7 +184,7 @@ iframe {
 }
 
 .overlay-close {
-  position: absolute;
+  position: absolute !important;
   top: 1rem;
   right: 1rem; // ca. Scrollbar width
   cursor: pointer;
diff --git a/packages/intranet-header-workspace/CHANGELOG.md b/packages/intranet-header-workspace/CHANGELOG.md
index 66e4f1d2df..eb1cb4b932 100644
--- a/packages/intranet-header-workspace/CHANGELOG.md
+++ b/packages/intranet-header-workspace/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @swisspost/design-system-intranet-header-workspace
 
+## 3.0.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - @swisspost/design-system-styles@6.5.0
+
 ## 3.0.4
 
 ### Patch Changes
diff --git a/packages/intranet-header-workspace/package.json b/packages/intranet-header-workspace/package.json
index 4018208c12..2a374b10f8 100644
--- a/packages/intranet-header-workspace/package.json
+++ b/packages/intranet-header-workspace/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swisspost/design-system-intranet-header-workspace",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "license": "Apache-2.0",
   "private": true,
   "scripts": {
@@ -21,7 +21,7 @@
     "@angular/router": "16.2.12",
     "@ng-bootstrap/ng-bootstrap": "15.1.2",
     "@popperjs/core": "2.11.8",
-    "@swisspost/design-system-styles": "workspace:6.4.4",
+    "@swisspost/design-system-styles": "workspace:6.5.0",
     "rxjs": "7.8.1",
     "tslib": "2.6.2",
     "watch": "1.0.2",
diff --git a/packages/intranet-header-workspace/projects/intranet-header/CHANGELOG.md b/packages/intranet-header-workspace/projects/intranet-header/CHANGELOG.md
index 0538db0cf8..647d108fb6 100644
--- a/packages/intranet-header-workspace/projects/intranet-header/CHANGELOG.md
+++ b/packages/intranet-header-workspace/projects/intranet-header/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @swisspost/design-system-intranet-header
 
+## 5.0.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - @swisspost/design-system-styles@6.5.0
+
 ## 5.0.4
 
 ### Patch Changes
diff --git a/packages/intranet-header-workspace/projects/intranet-header/package.json b/packages/intranet-header-workspace/projects/intranet-header/package.json
index 9cce6af275..4ce079e696 100644
--- a/packages/intranet-header-workspace/projects/intranet-header/package.json
+++ b/packages/intranet-header-workspace/projects/intranet-header/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swisspost/design-system-intranet-header",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "Intranet header for internal Swiss Post applications as an Angular component.",
   "author": "Swiss Post <oss@post.ch>",
   "license": "Apache-2.0",
@@ -18,10 +18,10 @@
     "linkDirectory": true
   },
   "dependencies": {
-    "@swisspost/design-system-styles": "workspace:6.4.4",
+    "@swisspost/design-system-styles": "workspace:6.5.0",
     "tslib": "2.6.2"
   },
   "devDependencies": {
-    "@swisspost/design-system-intranet-header-workspace": "workspace:3.0.4"
+    "@swisspost/design-system-intranet-header-workspace": "workspace:3.0.5"
   }
 }
diff --git a/packages/migrations/CHANGELOG.md b/packages/migrations/CHANGELOG.md
new file mode 100644
index 0000000000..0998306596
--- /dev/null
+++ b/packages/migrations/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @swisspost/design-system-migrations
+
+## 1.0.0
+
+### Major Changes
+
+- Separated the migration schematics from the styles to their own package `@swisspost/design-system-migrations`. (by [@alizedebray](https://github.com/alizedebray) with [#2270](https://github.com/swisspost/design-system/pull/2270))
diff --git a/packages/migrations/package.json b/packages/migrations/package.json
index 4a33771050..a22de87854 100644
--- a/packages/migrations/package.json
+++ b/packages/migrations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swisspost/design-system-migrations",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "description": "Scripts to migrate an Angular application from one Design System version to another.",
   "author": "Swiss Post <oss@post.ch>",
   "license": "Apache-2.0",
diff --git a/packages/styles/CHANGELOG.md b/packages/styles/CHANGELOG.md
index f8f4c66708..cde55a0479 100644
--- a/packages/styles/CHANGELOG.md
+++ b/packages/styles/CHANGELOG.md
@@ -1,5 +1,29 @@
 # @swisspost/design-system-styles
 
+## 6.5.0
+
+### Minor Changes
+
+- Separated the migration schematics from the styles to their own package `@swisspost/design-system-migrations`. (by [@alizedebray](https://github.com/alizedebray) with [#2270](https://github.com/swisspost/design-system/pull/2270))
+
+### Patch Changes
+
+- Updated the accordion styles. (by [@alizedebray](https://github.com/alizedebray) with [#2310](https://github.com/swisspost/design-system/pull/2310))
+
+- Fixed overflow on datepicker select variant. (by [@imagoiq](https://github.com/imagoiq) with [#2319](https://github.com/swisspost/design-system/pull/2319))
+
+- Added small variant to floating label select. (by [@gfellerph](https://github.com/gfellerph) with [#2368](https://github.com/swisspost/design-system/pull/2368))
+
+- Updated select styles to match design. (by [@imagoiq](https://github.com/imagoiq) with [#2312](https://github.com/swisspost/design-system/pull/2312))
+
+- Fixed intranet-header sticky navigation on mobile which prevent interactivity on the page within a certain viewport width. (by [@imagoiq](https://github.com/imagoiq) with [#2320](https://github.com/swisspost/design-system/pull/2320))
+
+- Fixed spacing regression on form switch label. (by [@imagoiq](https://github.com/imagoiq) with [#2356](https://github.com/swisspost/design-system/pull/2356))
+
+- Fixed active color and chevron display of the ngb-pagination component in High Contrast Mode. (by [@imagoiq](https://github.com/imagoiq) with [#2366](https://github.com/swisspost/design-system/pull/2366))
+
+- Transformed the gap between the label and the radio/checkbox/switch into a clickable area. (by [@imagoiq](https://github.com/imagoiq) with [#2333](https://github.com/swisspost/design-system/pull/2333))
+
 ## 6.4.4
 
 ### Patch Changes
diff --git a/packages/styles/package.json b/packages/styles/package.json
index a6b3cc3d8f..5ef4067629 100644
--- a/packages/styles/package.json
+++ b/packages/styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swisspost/design-system-styles",
-  "version": "6.4.4",
+  "version": "6.5.0",
   "description": "Design System Styles for the Swiss Post web platform.",
   "author": "Swiss Post <oss@post.ch>",
   "license": "Apache-2.0",
@@ -43,7 +43,7 @@
     "bootstrap": "5.3.2"
   },
   "devDependencies": {
-    "@swisspost/design-system-icons": "workspace:1.0.15",
+    "@swisspost/design-system-icons": "workspace:1.0.16",
     "@types/node": "18.19.2",
     "autoprefixer": "10.4.16",
     "copyfiles": "2.4.1",
diff --git a/packages/styles/src/components/floating-label.scss b/packages/styles/src/components/floating-label.scss
index 2ac28130f8..5fee5a2cc9 100644
--- a/packages/styles/src/components/floating-label.scss
+++ b/packages/styles/src/components/floating-label.scss
@@ -75,9 +75,9 @@
 
     padding-top: forms.$form-floating-input-padding-t;
     padding-bottom: forms.$form-floating-input-padding-b;
-    background-size: forms.$form-floating-select-bg-size;
 
     ~ label {
+      color: forms.$form-floating-label-color;
       padding-top: 0.7rem;
       max-width: calc(
         (100% * #{forms.$form-floating-label-upscale}) - #{forms.$form-floating-label-translate-x *
@@ -87,6 +87,12 @@
       transition: forms.$form-floating-transition-in;
     }
 
+    &:disabled {
+      ~ label {
+        color: forms.$input-disabled-color;
+      }
+    }
+
     // TODO: replace with :has
     &:empty,
     &.form-select-empty {
@@ -94,7 +100,6 @@
       padding-bottom: forms.$form-floating-input-padding-b;
 
       ~ label {
-        color: forms.$form-floating-label-color;
         padding-top: forms.$form-floating-label-padding-t;
         max-width: calc(100% - (#{forms.$input-border-width * 2}));
         transform: none;
@@ -129,6 +134,29 @@
         }
       }
     }
+
+    &.form-select-sm {
+      padding-inline: forms.$form-floating-padding-x-sm;
+      padding-top: forms.$form-floating-padding-y-sm * 2;
+      font-size: forms.$form-floating-label-font-size-placeholder-sm;
+      height: forms.$form-floating-label-height-sm;
+      min-height: forms.$form-floating-label-height-sm;
+
+      ~ label {
+        padding-top: forms.$form-floating-padding-y-sm;
+        font-size: forms.$form-floating-label-font-size-sm;
+        padding-inline: calc(#{forms.$form-floating-padding-x-sm} - #{forms.$input-border-width});
+      }
+
+      // TODO: replace with :has
+      &:empty,
+      &.form-select-empty {
+        ~ label {
+          padding-top: forms.$form-floating-label-padding-t-sm;
+          font-size: forms.$form-floating-label-font-size-placeholder-sm;
+        }
+      }
+    }
   }
 
   > textarea.form-control {
diff --git a/packages/styles/src/components/form-check.scss b/packages/styles/src/components/form-check.scss
index 5e6f494260..1c0c4a16cd 100644
--- a/packages/styles/src/components/form-check.scss
+++ b/packages/styles/src/components/form-check.scss
@@ -109,7 +109,10 @@
 
   &-label {
     flex: 1;
-    padding-inline-start: form-check.$form-check-column-gap;
+
+    :not(.form-switch, .radio-button-card, .checkbox-button-card) > & {
+      padding-inline-start: form-check.$form-check-column-gap;
+    }
 
     .form-check-sm & {
       font-size: type.$font-size-12;
diff --git a/packages/styles/src/components/form-select.scss b/packages/styles/src/components/form-select.scss
index e1546a1cc7..551f74845e 100644
--- a/packages/styles/src/components/form-select.scss
+++ b/packages/styles/src/components/form-select.scss
@@ -1,20 +1,64 @@
 @forward './../variables/options';
 
 @use './../lic/bootstrap-license';
-@use './../themes/bootstrap/core' as *;
+@use './../themes/bootstrap/core' as b;
 @use './../themes/bootstrap/forms/form-select' as bffs;
 @use './../mixins/forms' as forms-mixins;
 @use './../mixins/utilities';
 
 @use './../variables/components/forms';
+@use './../variables/components/form-select' as form-select;
 
 .form-select-rg {
   @include forms-mixins.form-control-rg;
 }
 
+.form-select-lg {
+  background-size: form-select.$form-select-bg-size;
+}
+
+.form-select-sm {
+  background-size: form-select.$form-select-bg-size-sm;
+}
+
 .form-select {
+  &:not(:disabled) {
+    &:hover {
+      border-color: var(--post-contrast-color);
+    }
+  }
+
+  &.success,
+  &.is-invalid {
+    background-position:
+      right b.$form-select-padding-x * 2.5 center,
+      b.$form-select-bg-position;
+
+    &.form-select-lg {
+      background-position:
+        right b.$form-select-padding-x * 3 center,
+        b.$form-select-bg-position;
+    }
+  }
+
+  &:disabled {
+    background-image: b.escape-svg(form-select.$form-select-indicator-disabled),
+      var(--bs-form-select-bg-img), var(--bs-form-select-bg-icon, none);
+  }
+
+  &.success {
+    border-color: var(--post-success-green);
+    background-image: b.escape-svg(form-select.$form-select-indicator-success),
+      var(--bs-form-select-bg-img), var(--bs-form-select-bg-icon, none);
+  }
+
+  &.is-invalid {
+    background-image: b.escape-svg(form-select.$form-select-indicator-error),
+      var(--bs-form-select-bg-img), var(--bs-form-select-bg-icon, none);
+  }
+
   @include utilities.high-contrast-mode() {
-    background-image: escape-svg($form-select-indicator-hcm);
+    background-image: b.escape-svg(form-select.$form-select-indicator-hcm);
     background-color: Field;
     border-color: FieldText;
     color: FieldText;
diff --git a/packages/styles/src/components/pagination.scss b/packages/styles/src/components/pagination.scss
index f09d0bbe27..0b46ff9908 100644
--- a/packages/styles/src/components/pagination.scss
+++ b/packages/styles/src/components/pagination.scss
@@ -78,5 +78,20 @@
     &.active {
       color: pagination.$pagination-active-color;
     }
+
+    @include utilities.high-contrast-mode() {
+      &.active > .page-link {
+        background-color: Highlight;
+      }
+
+      &:first-child,
+      &:last-child {
+        .page-link > span {
+          background-color: LinkText;
+          color: transparent;
+          forced-color-adjust: none;
+        }
+      }
+    }
   }
 }
diff --git a/packages/styles/src/variables/components/_form-select.scss b/packages/styles/src/variables/components/_form-select.scss
index c24ab9629a..c800e62c32 100644
--- a/packages/styles/src/variables/components/_form-select.scss
+++ b/packages/styles/src/variables/components/_form-select.scss
@@ -7,7 +7,17 @@ $form-select-disabled-color: forms.$input-disabled-color;
 $form-select-disabled-bg: forms.$input-disabled-bg;
 $form-select-disabled-border-color: forms.$input-disabled-border-color;
 $form-select-indicator-color: color.$black;
-$form-select-bg-size: 24px 24px !default;
+$form-select-bg-size: 32px 32px !default;
+$form-select-bg-size-sm: 24px 24px !default;
 $_form-select-indicator-icon: icons.get-colored-svg-url('2113', $form-select-indicator-color);
 $form-select-indicator: url($_form-select-indicator-icon) !default;
+$form-select-indicator-disabled: url(icons.get-colored-svg-url(
+  '2113',
+  $form-select-disabled-color
+)) !default;
+$form-select-indicator-success: url(icons.get-colored-svg-url(
+  '2105',
+  color.$success-green
+)) !default;
+$form-select-indicator-error: url(icons.get-colored-svg-url('2104', color.$error-red)) !default;
 $form-select-indicator-hcm: url(icons.get-colored-svg-url('2113', color.$white)) !default;
diff --git a/packages/styles/src/variables/components/_forms.scss b/packages/styles/src/variables/components/_forms.scss
index 9218bfb071..aad60eb05c 100644
--- a/packages/styles/src/variables/components/_forms.scss
+++ b/packages/styles/src/variables/components/_forms.scss
@@ -13,7 +13,7 @@
 // Forms
 
 $form-label-margin-bottom: 0.5rem !default;
-$form-label-color: rgba(var(--post-contrast-color-rgb), 0.8) !default;
+$form-label-color: var(--post-contrast-color) !default;
 
 $input-padding-y: button.$input-btn-padding-y !default;
 $input-padding-x: button.$input-btn-padding-x !default;
@@ -33,8 +33,8 @@ $input-line-height-lg: type.$line-height-copy !default;
 
 $input-bg: color.$white !default;
 $input-disabled-bg: rgba(var(--post-contrast-color-inverted-rgb), 0.6) !default;
-$input-disabled-color: color.$gray-60; // Design System only
-$input-disabled-border-color: color.$gray-20; // Design System only
+$input-disabled-color: color.$gray-40; // Design System only
+$input-disabled-border-color: color.$gray-40; // Design System only
 
 $input-color: color.$black !default;
 $input-border-color: color.$gray-60 !default;
@@ -66,6 +66,13 @@ $input-height-content-sm: type.$font-size-tiny * $input-line-height-sm !default;
 $input-height-inner-sm: $input-height-content-sm + ($input-padding-y-sm * 2) !default;
 $input-height-sm: calc(#{$input-height-inner-sm} + #{$input-height-border}) !default;
 
+$form-floating-input-height-content-sm: type.$font-size-12 * $input-line-height-sm * 2 !default;
+$form-floating-input-height-inner-sm: $form-floating-input-height-content-sm +
+  ($input-padding-y-sm * 2) !default;
+$form-floating-input-height-sm: calc(
+  #{$form-floating-input-height-inner-sm} + #{$input-height-border}
+) !default;
+
 $input-height-content-rg: type.$font-size-regular * $input-line-height-rg !default;
 $input-height-inner-rg: $input-height-content-rg + ($input-padding-y-rg * 2) !default;
 $input-height-rg: calc(#{$input-height-inner-rg} + #{$input-height-border}) !default;
@@ -74,7 +81,9 @@ $input-height-content-lg: type.$font-size-medium * $input-line-height-lg !defaul
 $input-height-inner-lg: $input-height-content-lg + ($input-padding-y-lg * 2) !default; // Design System
 $input-height-lg: calc(#{$input-height-inner-lg} + #{$input-height-border}) !default;
 
-$input-transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out !default;
+$input-transition:
+  border-color 0.15s ease-in-out,
+  box-shadow 0.15s ease-in-out !default;
 
 $form-text-color: var(--post-contrast-color);
 $form-text-font-size: type.$font-size-tiny;
@@ -94,7 +103,9 @@ $form-range-thumb-width: 2rem !default;
 $form-range-thumb-height: $form-range-thumb-width !default;
 $form-range-thumb-bg: color.$white !default;
 $form-range-thumb-border: 2px solid color.$black !default;
-$form-range-thumb-focus-box-shadow: 0 0 0 1px color.$black, 0 0 0 0.2rem rgba(color.$gray-80, 0.25) !default;
+$form-range-thumb-focus-box-shadow:
+  0 0 0 1px color.$black,
+  0 0 0 0.2rem rgba(color.$gray-80, 0.25) !default;
 $form-range-thumb-focus-box-shadow-width: 0.2rem; // For focus box shadow issue in Edge
 $form-range-thumb-active-bg: color.$white !default;
 $form-range-thumb-disabled-bg: $form-range-thumb-bg !default;
@@ -128,7 +139,19 @@ $form-floating-label-padding-t: calc(
 $form-floating-label-translate-x: $form-floating-padding-x * (1 - $form-floating-label-scale);
 $form-floating-label-transform: scale($form-floating-label-scale);
 $form-floating-transition: animation.$transition-base;
-$form-floating-transition-in: $form-floating-transition,
+$form-floating-transition-in:
+  $form-floating-transition,
   width 0ms list.nth(animation.$transition-base, 2);
-$form-floating-transition-out: $form-floating-transition, width 0ms linear;
+$form-floating-transition-out:
+  $form-floating-transition,
+  width 0ms linear;
 $form-floating-select-bg-size: 32px 32px;
+
+$form-floating-label-font-size-sm: type.$font-size-12;
+$form-floating-label-font-size-placeholder-sm: type.$font-size-14; // TODO: replace with input font-size after adjustment
+$form-floating-padding-x-sm: $input-padding-x-sm;
+$form-floating-padding-y-sm: $input-padding-y-sm;
+$form-floating-label-height-sm: $form-floating-input-height-inner-sm;
+$form-floating-label-padding-t-sm: calc(
+  #{$input-border-width} + #{$form-floating-label-height-sm * 0.5} - #{$form-floating-label-font-size-sm}
+);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 52e1071217..4f4f2f95b1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -64,7 +64,7 @@ importers:
         specifier: 0.2.3
         version: 0.2.3
       '@swisspost/design-system-styles':
-        specifier: workspace:6.4.4
+        specifier: workspace:6.5.0
         version: link:../styles/dist
       ally.js:
         specifier: 1.4.1
@@ -137,7 +137,7 @@ importers:
   packages/components-react:
     dependencies:
       '@swisspost/design-system-components':
-        specifier: workspace:1.6.2
+        specifier: workspace:1.6.3
         version: link:../components
     devDependencies:
       '@types/node':
@@ -228,10 +228,10 @@ importers:
         specifier: 20.1.0
         version: 20.1.0(@angular/common@16.2.12)(@angular/core@16.2.12)(@angular/platform-browser@16.2.12)(rxjs@7.8.1)
       '@swisspost/design-system-intranet-header':
-        specifier: workspace:5.0.4
+        specifier: workspace:5.0.5
         version: link:../intranet-header-workspace/dist/intranet-header
       '@swisspost/design-system-styles':
-        specifier: workspace:6.4.4
+        specifier: workspace:6.5.0
         version: link:../styles/dist
       bootstrap:
         specifier: 5.3.2
@@ -361,19 +361,19 @@ importers:
   packages/documentation:
     dependencies:
       '@swisspost/design-system-components':
-        specifier: workspace:1.6.2
+        specifier: workspace:1.6.3
         version: link:../components
       '@swisspost/design-system-components-react':
-        specifier: workspace:1.0.22
+        specifier: workspace:1.0.23
         version: link:../components-react
       '@swisspost/design-system-icons':
-        specifier: workspace:1.0.15
+        specifier: workspace:1.0.16
         version: link:../icons
       '@swisspost/design-system-styles':
-        specifier: workspace:6.4.4
+        specifier: workspace:6.5.0
         version: link:../styles/dist
       '@swisspost/internet-header':
-        specifier: workspace:1.13.0
+        specifier: workspace:1.13.1
         version: link:../internet-header
       bootstrap:
         specifier: 5.3.2
@@ -530,7 +530,7 @@ importers:
   packages/internet-header:
     dependencies:
       '@swisspost/design-system-styles':
-        specifier: workspace:6.4.4
+        specifier: workspace:6.5.0
         version: link:../styles/dist
       body-scroll-lock:
         specifier: 4.0.0-beta.0
@@ -675,7 +675,7 @@ importers:
         specifier: 2.11.8
         version: 2.11.8
       '@swisspost/design-system-styles':
-        specifier: workspace:6.4.4
+        specifier: workspace:6.5.0
         version: link:../styles/dist
       rxjs:
         specifier: 7.8.1
@@ -760,14 +760,14 @@ importers:
   packages/intranet-header-workspace/projects/intranet-header:
     dependencies:
       '@swisspost/design-system-styles':
-        specifier: workspace:6.4.4
+        specifier: workspace:6.5.0
         version: link:../../../styles/dist
       tslib:
         specifier: 2.6.2
         version: 2.6.2
     devDependencies:
       '@swisspost/design-system-intranet-header-workspace':
-        specifier: workspace:3.0.4
+        specifier: workspace:3.0.5
         version: link:../..
     publishDirectory: ../../dist/intranet-header
 
@@ -810,7 +810,7 @@ importers:
         version: 5.3.2(@popperjs/core@2.11.8)
     devDependencies:
       '@swisspost/design-system-icons':
-        specifier: workspace:1.0.15
+        specifier: workspace:1.0.16
         version: link:../icons
       '@types/node':
         specifier: 18.19.2