diff --git a/DESIGN_SYSTEM.md b/DESIGN_SYSTEM.md
index f1c37b8..cb0f8e2 100644
--- a/DESIGN_SYSTEM.md
+++ b/DESIGN_SYSTEM.md
@@ -78,6 +78,7 @@ Règles :
 - `data-border="joined"` masque les bordures de jonction déduites depuis `data-edge` ;
 - `data-border="none"` masque toutes les bordures sans changer la taille, le fond, le hover ou l'état actif ;
 - `data-axis="horizontal|vertical"` reste réservé aux composants dont l'axe est métier, comme `nds-scrollbox` ;
+- les boutons icônes de réorganisation utilisent `nds-icon-button` avec `data-variant="secondary"` et une classe métier contenant `drag-handle` ; le curseur `grab/grabbing` est alors géré par le NDS ;
 - les états fonctionnels restent portés par le HTML et l'application : `disabled`, `aria-pressed="true"`, `.active`, `.is-active`.
 
 Exemples :
diff --git a/website/public/data/site.json b/website/public/data/site.json
index ff66601..d5b030c 100644
--- a/website/public/data/site.json
+++ b/website/public/data/site.json
@@ -1683,8 +1683,8 @@
     "importOne": "Importer une toolbox",
     "preferencesLabel": "Préférences d'interface",
     "toastPositionLabel": "Positionnement des alertes",
-    "toastPositionLeft": "Afficher les alertes en bas à gauche",
-    "toastPositionRight": "Afficher les alertes en bas à droite",
+    "toastPositionLeft": "Positionner les alertes en bas à gauche",
+    "toastPositionRight": "Positionner les alertes en bas à droite",
     "summary": "Créez des espaces modulaires pour regrouper vos outils de session : notes, suivis, références, captures et futurs outils restent accessibles rapidement, en local, par jeu ou par usage.",
     "creationTemplate": {
       "memos": {
diff --git a/website/src/components/ToastPositionSwitch.jsx b/website/src/components/ToastPositionSwitch.jsx
index 43b2dfd..3ad13c5 100644
--- a/website/src/components/ToastPositionSwitch.jsx
+++ b/website/src/components/ToastPositionSwitch.jsx
@@ -1,16 +1,15 @@
-// Rôle : affiche le switch global de position des notifications internes.
+// Rôle : expose le choix gauche/droite des notifications via un Radio Button Group NDS.
 import { Icon } from "./Icon.jsx";
 
 export function ToastPositionSwitch({ position, labels, onChange }) {
   const normalizedPosition = position === "left" ? "left" : "right";
   return (
     <div
-      className="toast-position-switch nds-radio-button-group"
-      data-size="xs"
+      className="nds-radio-button-group"
+      data-size="md"
       role="radiogroup"
       data-position={normalizedPosition}
-      aria-label={normalizedPosition === "left" ? labels.left : labels.right}
-      title={labels.title}
+      aria-label={labels.title}
     >
       <button
         className={normalizedPosition === "left" ? "active" : ""}
@@ -18,6 +17,7 @@ export function ToastPositionSwitch({ position, labels, onChange }) {
         role="radio"
         aria-checked={normalizedPosition === "left"}
         aria-label={labels.left}
+        title={labels.left}
         onClick={() => onChange("left")}
       >
         <Icon name="toast-left" />
@@ -28,6 +28,7 @@ export function ToastPositionSwitch({ position, labels, onChange }) {
         role="radio"
         aria-checked={normalizedPosition === "right"}
         aria-label={labels.right}
+        title={labels.right}
         onClick={() => onChange("right")}
       >
         <Icon name="toast-right" />
diff --git a/website/src/features/toolboxes/ToolboxCard.jsx b/website/src/features/toolboxes/ToolboxCard.jsx
index dfe0350..80cf1a1 100644
--- a/website/src/features/toolboxes/ToolboxCard.jsx
+++ b/website/src/features/toolboxes/ToolboxCard.jsx
@@ -36,7 +36,7 @@ export function ToolboxCard({ toolbox, game, actions, reorder }) {
       <button
         className="toolbox-card-drag-handle nds-icon-button"
         data-size="md"
-        data-variant="ghost"
+        data-variant="secondary"
         type="button"
         onPointerDown={(event) => reorder.itemReorder.startDrag(event, toolbox.id)}
         aria-label={`Déplacer ${toolbox.name}`}
diff --git a/website/src/features/toolboxes/modules/CalculatorEntries.jsx b/website/src/features/toolboxes/modules/CalculatorEntries.jsx
index f124e2a..3fb23f5 100644
--- a/website/src/features/toolboxes/modules/CalculatorEntries.jsx
+++ b/website/src/features/toolboxes/modules/CalculatorEntries.jsx
@@ -43,7 +43,7 @@ export function CalculatorEntries({ entries, parentId, getScopedParentId, active
               <button
                 className="calculator-drag-handle nds-icon-button"
                 data-size="xs"
-                data-variant="ghost"
+                data-variant="secondary"
                 type="button"
                 onPointerDown={(event) => reorder.itemReorder.startDrag(event, entry.id)}
                 aria-label={`${textContent.reorderTitle || "Déplacer"} ${entry.label || formatResult(entry.value)}`}
diff --git a/website/src/features/toolboxes/modules/CalendarEventControls.jsx b/website/src/features/toolboxes/modules/CalendarEventControls.jsx
index 4449018..15e1ae4 100644
--- a/website/src/features/toolboxes/modules/CalendarEventControls.jsx
+++ b/website/src/features/toolboxes/modules/CalendarEventControls.jsx
@@ -118,7 +118,7 @@ export function CalendarAlertModeSwitch({ mode, textContent, onChange }) {
   };
 
   return (
-    <div className="timer-alert-mode-switch calendar-alert-mode-switch nds-radio-button-group" data-size="xs" role="group" aria-label={textContent.alertModeTitle || "Mode d'alerte"}>
+    <div className="timer-alert-mode-switch calendar-alert-mode-switch nds-radio-button-group" data-size="md" role="group" aria-label={textContent.alertModeTitle || "Mode d'alerte"}>
       {ALERT_MODES.map((option) => (
         <button
           key={option.mode}
diff --git a/website/src/features/toolboxes/modules/ChecklistModule.jsx b/website/src/features/toolboxes/modules/ChecklistModule.jsx
index d253f19..f4dcd3a 100644
--- a/website/src/features/toolboxes/modules/ChecklistModule.jsx
+++ b/website/src/features/toolboxes/modules/ChecklistModule.jsx
@@ -127,7 +127,7 @@ export function ChecklistModule({ toolboxId, moduleId, context, editing, textExc
       )}
       {namedSections.length > 0 && (
         <div className="checklist-toolbar">
-          <div className="checklist-complete-mode-group nds-radio-button-group" data-size="xs" role="radiogroup" aria-label={textContent.completedSectionsModeTitle || "Affichage des catégories terminées"}>
+          <div className="checklist-complete-mode-group nds-radio-button-group" data-size="md" role="radiogroup" aria-label={textContent.completedSectionsModeTitle || "Affichage des catégories terminées"}>
             {[
               { mode: "visible", label: textContent.completedSectionsVisibleLabel || "Visible", icon: "eye-open" },
               { mode: "reduced", label: textContent.completedSectionsReducedLabel || "Réduit", icon: "hide" },
diff --git a/website/src/features/toolboxes/modules/ChecklistParts.jsx b/website/src/features/toolboxes/modules/ChecklistParts.jsx
index bfc3dd0..29bbdde 100644
--- a/website/src/features/toolboxes/modules/ChecklistParts.jsx
+++ b/website/src/features/toolboxes/modules/ChecklistParts.jsx
@@ -69,7 +69,7 @@ export function ChecklistSection({ section, context, data, reorder, onRenameSect
           <button
             className="checklist-drag-handle nds-icon-button"
             data-size="xs"
-            data-variant="ghost"
+            data-variant="secondary"
             type="button"
             onPointerDown={(event) => reorder.groupReorder.startDrag(event, { groupId: section.id })}
             aria-label={`${textContent.reorderSectionTitle || "Déplacer la catégorie"} ${section.title}`}
@@ -166,7 +166,7 @@ function ChecklistItem({ item, section, context, reorder, items, save, onUpdateI
         <button
           className="checklist-drag-handle nds-icon-button"
           data-size="xs"
-          data-variant="ghost"
+          data-variant="secondary"
           type="button"
           onPointerDown={(event) => reorder.itemReorder.startDrag(event, item.id)}
           aria-label={`${textContent.reorderTitle || "Déplacer"} ${item.label}`}
diff --git a/website/src/features/toolboxes/modules/CombosList.jsx b/website/src/features/toolboxes/modules/CombosList.jsx
index 58cc7a9..fdba3af 100644
--- a/website/src/features/toolboxes/modules/CombosList.jsx
+++ b/website/src/features/toolboxes/modules/CombosList.jsx
@@ -29,7 +29,7 @@ export function CombosList({
         <button
           className="task-planner-drag-handle combo-drag-handle nds-icon-button"
           data-size="xs"
-          data-variant="ghost"
+          data-variant="secondary"
           type="button"
           onPointerDown={(event) => reorder.itemReorder.startDrag(event, combo.id)}
           aria-label={`${textContent.reorderComboTitle || "Déplacer le combo"} ${combo.name}`}
@@ -92,7 +92,7 @@ export function CombosList({
             <button
               className="task-planner-category-drag-handle nds-icon-button"
               data-size="xs"
-              data-variant="ghost"
+              data-variant="secondary"
               type="button"
               onPointerDown={(event) => reorder.groupReorder.startDrag(event, { groupId: category })}
               aria-label={`${textContent.reorderCategoryTitle || "Déplacer la catégorie"} ${category}`}
diff --git a/website/src/features/toolboxes/modules/CountersModule.jsx b/website/src/features/toolboxes/modules/CountersModule.jsx
index a8cf4ee..d373d0f 100644
--- a/website/src/features/toolboxes/modules/CountersModule.jsx
+++ b/website/src/features/toolboxes/modules/CountersModule.jsx
@@ -71,7 +71,7 @@ export function CountersModule({ toolboxId, moduleId, context, editing, textExch
             <button
               className="counter-drag-handle nds-icon-button"
               data-size="sm"
-              data-variant="ghost"
+              data-variant="secondary"
               type="button"
               onPointerDown={(event) => itemReorder.startDrag(event, counter.id)}
               aria-label={`${textContent.reorderTitle || "Déplacer"} ${counter.label}`}
diff --git a/website/src/features/toolboxes/modules/EquipmentPlannerCharacteristics.jsx b/website/src/features/toolboxes/modules/EquipmentPlannerCharacteristics.jsx
index 9c1eb96..47fc762 100644
--- a/website/src/features/toolboxes/modules/EquipmentPlannerCharacteristics.jsx
+++ b/website/src/features/toolboxes/modules/EquipmentPlannerCharacteristics.jsx
@@ -145,7 +145,7 @@ function TraitCategoryList({ traits, categories, collapsedCategories, reorder, t
         return (
           <section className={className} key={category} {...reorder.getGroupProps({ groupId: category })}>
             <div className="equipment-planner-trait-category-header">
-              <button type="button" className="task-planner-category-drag-handle nds-icon-button" data-size="xs" data-variant="ghost" onPointerDown={(event) => reorder.groupReorder.startDrag(event, { groupId: category })} title={textContent.reorderCategoryTitle || "Déplacer la catégorie"}>
+              <button type="button" className="task-planner-category-drag-handle nds-icon-button" data-size="xs" data-variant="secondary" onPointerDown={(event) => reorder.groupReorder.startDrag(event, { groupId: category })} title={textContent.reorderCategoryTitle || "Déplacer la catégorie"}>
                 <Icon name="drag" />
               </button>
               <strong>{category}</strong>
@@ -182,7 +182,7 @@ function EquipmentTraitRow({ trait, className, itemProps, editing, textContent,
     <li className={className} {...itemProps}>
       {editing ? (
         <>
-          <button type="button" className="task-planner-drag-handle nds-icon-button" data-size="xs" data-variant="ghost" onPointerDown={onStartDrag} title={textContent.reorderTraitTitle || "Déplacer"}>
+          <button type="button" className="task-planner-drag-handle nds-icon-button" data-size="xs" data-variant="secondary" onPointerDown={onStartDrag} title={textContent.reorderTraitTitle || "Déplacer"}>
             <Icon name="drag" />
           </button>
           <IconChoiceDropdown
diff --git a/website/src/features/toolboxes/modules/EquipmentPlannerItem.jsx b/website/src/features/toolboxes/modules/EquipmentPlannerItem.jsx
index e3136b0..7e89080 100644
--- a/website/src/features/toolboxes/modules/EquipmentPlannerItem.jsx
+++ b/website/src/features/toolboxes/modules/EquipmentPlannerItem.jsx
@@ -32,7 +32,7 @@ export function EquipmentItem({ equipment, reorder, textContent, onUpdate, onDel
         <button
           className="task-planner-drag-handle nds-icon-button"
           data-size="sm"
-          data-variant="ghost"
+          data-variant="secondary"
           type="button"
           onPointerDown={(event) => reorder.itemReorder.startDrag(event, equipment.id)}
           aria-label={`${textContent.reorderEquipmentTitle || "Déplacer"} ${equipment.name}`}
diff --git a/website/src/features/toolboxes/modules/GoalTreeBranch.jsx b/website/src/features/toolboxes/modules/GoalTreeBranch.jsx
index 409eddb..ee0fa7a 100644
--- a/website/src/features/toolboxes/modules/GoalTreeBranch.jsx
+++ b/website/src/features/toolboxes/modules/GoalTreeBranch.jsx
@@ -61,7 +61,7 @@ export function GoalTreeBranch({ nodes, parentId, selectedNodeId, editing, reord
                 <button
                   className="goal-tree-drag-handle nds-icon-button"
                   data-size="micro"
-                  data-variant="ghost"
+                  data-variant="secondary"
                   type="button"
                   onPointerDown={(event) => reorder.itemReorder.startDrag(event, node.id)}
                   aria-label={`${textContent.reorderTitle || "Déplacer"} ${node.title}`}
diff --git a/website/src/features/toolboxes/modules/GoalTreeEditor.jsx b/website/src/features/toolboxes/modules/GoalTreeEditor.jsx
index 89d254a..db4aebd 100644
--- a/website/src/features/toolboxes/modules/GoalTreeEditor.jsx
+++ b/website/src/features/toolboxes/modules/GoalTreeEditor.jsx
@@ -200,7 +200,7 @@ function GoalTreeAdvancedPanel({ selectedNode, selectedNodeIsStep, selectedProgr
           <div className="goal-tree-form-section-title">{textContent.progressSectionTitle || "Progression"}</div>
           <button
             className={`tool-split-scroll-toggle goal-tree-progress-mode-toggle nds-switch ${selectedProgressMode === "auto" ? "active" : ""}`}
-            data-size="lg"
+            data-size="md"
             type="button"
             onClick={() => onUpdateNode(selectedNode.id, (node) => ({ ...node, progressMode: selectedProgressMode === "auto" ? "manual" : "auto" }))}
             aria-pressed={selectedProgressMode === "auto"}
diff --git a/website/src/features/toolboxes/modules/ImagesModule.jsx b/website/src/features/toolboxes/modules/ImagesModule.jsx
index 3faff5b..887b27c 100644
--- a/website/src/features/toolboxes/modules/ImagesModule.jsx
+++ b/website/src/features/toolboxes/modules/ImagesModule.jsx
@@ -106,7 +106,7 @@ export function ImagesModule({ toolboxId, moduleId, context, editing, textExchan
               <button
                 className="image-drag-handle nds-icon-button"
                 data-size="sm"
-                data-variant="ghost"
+                data-variant="secondary"
                 type="button"
                 onPointerDown={(event) => itemReorder.startDrag(event, image.id)}
                 aria-label={textContent.reorderAriaLabel || "Déplacer l'image"}
diff --git a/website/src/features/toolboxes/modules/LinksModule.jsx b/website/src/features/toolboxes/modules/LinksModule.jsx
index 2469d93..b3aad26 100644
--- a/website/src/features/toolboxes/modules/LinksModule.jsx
+++ b/website/src/features/toolboxes/modules/LinksModule.jsx
@@ -84,7 +84,7 @@ export function LinksModule({ toolboxId, moduleId, context, editing, textExchang
             <button
               className="link-drag-handle nds-icon-button"
               data-size="sm"
-              data-variant="ghost"
+              data-variant="secondary"
               type="button"
               onPointerDown={(event) => itemReorder.startDrag(event, link.id)}
               aria-label={`${textContent.reorderTitle || "Déplacer"} ${link.title || link.url}`}
diff --git a/website/src/features/toolboxes/modules/MemosModule.jsx b/website/src/features/toolboxes/modules/MemosModule.jsx
index a7650e9..e47111a 100644
--- a/website/src/features/toolboxes/modules/MemosModule.jsx
+++ b/website/src/features/toolboxes/modules/MemosModule.jsx
@@ -138,7 +138,7 @@ export function MemosModule({ toolboxId, moduleId, context, editing, textExchang
               <button
                 className="memo-drag-handle nds-icon-button"
                 data-size="sm"
-                data-variant="ghost"
+                data-variant="secondary"
                 type="button"
                 onPointerDown={(event) => itemReorder.startDrag(event, memo.id)}
                 aria-label={`${textContent.reorderTitle || "Déplacer"} ${memo.text}`}
diff --git a/website/src/features/toolboxes/modules/NotepadModule.jsx b/website/src/features/toolboxes/modules/NotepadModule.jsx
index 98cf701..96be374 100644
--- a/website/src/features/toolboxes/modules/NotepadModule.jsx
+++ b/website/src/features/toolboxes/modules/NotepadModule.jsx
@@ -296,7 +296,7 @@ export function NotepadModule({ toolboxId, moduleId, context, textExchangeOpen }
         renderTrigger={({ open, toggle }) => (
           <button
             className={`notepad-pages-toggle nds-icon-button ${open ? "active" : ""}`}
-            data-size="sm"
+            data-size="md"
             data-variant="panel-toggle"
             data-edge="right"
             data-border="joined"
diff --git a/website/src/features/toolboxes/modules/TaskPlannerBranch.jsx b/website/src/features/toolboxes/modules/TaskPlannerBranch.jsx
index 2b71205..f49a87c 100644
--- a/website/src/features/toolboxes/modules/TaskPlannerBranch.jsx
+++ b/website/src/features/toolboxes/modules/TaskPlannerBranch.jsx
@@ -162,7 +162,7 @@ export function TaskPlannerBranch({
             <button
               className="task-planner-category-drag-handle nds-icon-button"
               data-size="xs"
-              data-variant="ghost"
+              data-variant="secondary"
               type="button"
               onPointerDown={(event) => reorder.groupReorder.startDrag(event, { groupId: group.category, parentId })}
               aria-label={`${textContent.categoryReorderTitle || "Déplacer la catégorie"} ${group.category}`}
diff --git a/website/src/features/toolboxes/modules/TaskPlannerItem.jsx b/website/src/features/toolboxes/modules/TaskPlannerItem.jsx
index 6c6171a..f8cfcfc 100644
--- a/website/src/features/toolboxes/modules/TaskPlannerItem.jsx
+++ b/website/src/features/toolboxes/modules/TaskPlannerItem.jsx
@@ -67,7 +67,7 @@ export function TaskPlannerItem({
         <button
           className="task-planner-drag-handle nds-icon-button"
           data-size="xs"
-          data-variant="ghost"
+          data-variant="secondary"
           type="button"
           onPointerDown={(event) => reorder.itemReorder.startDrag(event, task.id)}
           aria-label={`${textContent.reorderTitle || "Déplacer"} ${task.title}`}
diff --git a/website/src/features/toolboxes/modules/TimerCountdown.jsx b/website/src/features/toolboxes/modules/TimerCountdown.jsx
index 29ab74e..c6f20c0 100644
--- a/website/src/features/toolboxes/modules/TimerCountdown.jsx
+++ b/website/src/features/toolboxes/modules/TimerCountdown.jsx
@@ -104,6 +104,7 @@ export function CountdownList({ countdowns, nowMs, textContent, reorder, reorder
                 <button
                   className="timer-drag-handle nds-icon-button"
                   data-size="xs"
+                  data-variant="secondary"
                   type="button"
                   onPointerDown={(event) => reorder.itemReorder.startDrag(event, countdown.id)}
                   aria-label={`${textContent.reorderTitle || "Déplacer"} ${countdown.label}`}
diff --git a/website/src/features/toolboxes/modules/TimerSharedControls.jsx b/website/src/features/toolboxes/modules/TimerSharedControls.jsx
index 9ef9497..34049c0 100644
--- a/website/src/features/toolboxes/modules/TimerSharedControls.jsx
+++ b/website/src/features/toolboxes/modules/TimerSharedControls.jsx
@@ -16,7 +16,7 @@ export function TimerValue({ ms, compact = false, showCentiseconds = true }) {
   );
 }
 
-export function TimerAlertModeSwitch({ mode, blocked, textContent, onChange }) {
+export function TimerAlertModeSwitch({ mode, blocked, textContent, size = "xs", onChange }) {
   const labels = {
     off: textContent.alertOffTitle || "Pas d'alerte",
     visible: textContent.alertVisibleTitle || "Alerte quand la toolbox est affichée",
@@ -27,7 +27,7 @@ export function TimerAlertModeSwitch({ mode, blocked, textContent, onChange }) {
   return (
     <div
       className={`timer-alert-mode-switch nds-radio-button-group ${blocked ? "is-blocked" : ""}`}
-      data-size="xs"
+      data-size={size}
       role="group"
       aria-label={textContent.alertModeTitle || "Mode d'alerte"}
       title={blocked ? blockedTitle : undefined}
diff --git a/website/src/features/toolboxes/modules/ToolboxModules.jsx b/website/src/features/toolboxes/modules/ToolboxModules.jsx
index f1fd22d..dc2349c 100644
--- a/website/src/features/toolboxes/modules/ToolboxModules.jsx
+++ b/website/src/features/toolboxes/modules/ToolboxModules.jsx
@@ -190,7 +190,7 @@ function ModuleShell({ toolbox, module, context, reorder, itemGroup = "", onRena
           <button
             className="module-drag-handle nds-icon-button"
             data-size="md"
-            data-variant="ghost"
+            data-variant="secondary"
             type="button"
             onPointerDown={(event) => reorder.itemReorder.startDrag(event, module.id)}
             aria-label={`Déplacer ${module.title || label}`}
diff --git a/website/src/pages/DesignSystemPage.jsx b/website/src/pages/DesignSystemPage.jsx
index 58d03cd..c21bf81 100644
--- a/website/src/pages/DesignSystemPage.jsx
+++ b/website/src/pages/DesignSystemPage.jsx
@@ -2,7 +2,6 @@
 import { useState } from "react";
 import { Icon } from "../components/Icon.jsx";
 import { MixTagsInput } from "../components/MixTagsInput.jsx";
-import { ToastPositionSwitch } from "../components/ToastPositionSwitch.jsx";
 
 const SIZE_VALUES = {
   field: ["xs", "sm", "md"],
@@ -566,20 +565,18 @@ function DatePickerButtonsSection() {
 function SpecializedComponentsSection() {
   const [mixValue, setMixValue] = useState("base + bonus");
   const [smallMixValue, setSmallMixValue] = useState("base * 2");
-  const [toastPosition, setToastPosition] = useState("right");
 
   return (
     <ComponentSection id="specialized-components" title="Specialized Components" meta="not NDS public classes">
       <VariantMatrix
         title="Composants spécialisés conservés"
         note="Ces éléments restent spécialisés : ils ne créent pas de classe de famille NDS publique."
-        columns={["MixTagsInput", "MixTagsInput small", "Toast switch"]}
+        columns={["MixTagsInput", "MixTagsInput small"]}
         rows={[{
           label: "interactive",
           cells: [
             <ControlSample label="MixTagsInput"><MixTagsInput value={mixValue} onChange={setMixValue} tokens={MIX_TAG_TOKENS} insertToken={{ value: "base", icon: "add", title: "Insérer base" }} aria-label="MixTagsInput standard" /></ControlSample>,
-            <ControlSample label="MixTagsInput size=small"><MixTagsInput size="small" value={smallMixValue} onChange={setSmallMixValue} tokens={MIX_TAG_TOKENS} insertToken={{ value: "bonus", icon: "add", title: "Insérer bonus" }} aria-label="MixTagsInput compact" /></ControlSample>,
-            <ControlSample label="ToastPositionSwitch"><ToastPositionSwitch position={toastPosition} labels={{ left: "Notifications à gauche", right: "Notifications à droite", title: "Position des notifications" }} onChange={setToastPosition} /></ControlSample>
+            <ControlSample label="MixTagsInput size=small"><MixTagsInput size="small" value={smallMixValue} onChange={setSmallMixValue} tokens={MIX_TAG_TOKENS} insertToken={{ value: "bonus", icon: "add", title: "Insérer bonus" }} aria-label="MixTagsInput compact" /></ControlSample>
           ]
         }]}
       />
diff --git a/website/src/styles/design-system/_attributes.scss b/website/src/styles/design-system/_attributes.scss
index 68d2d0e..857edd0 100644
--- a/website/src/styles/design-system/_attributes.scss
+++ b/website/src/styles/design-system/_attributes.scss
@@ -262,6 +262,20 @@
   @include controls.icon-button-icon;
 }
 
+.nds-icon-button[class*="drag-handle"] {
+  cursor: grab;
+  touch-action: none;
+  user-select: none;
+}
+
+.nds-icon-button[class*="drag-handle"]:active {
+  cursor: grabbing;
+}
+
+.nds-icon-button[class*="drag-handle"]:disabled {
+  cursor: not-allowed;
+}
+
 .nds-icon-button:hover:not([data-variant="primary"], [data-variant="danger"], [data-variant="ghost"], .active, .is-active, [aria-pressed="true"]) {
   @include controls.icon-button-hover;
 }
@@ -349,6 +363,15 @@
   @include controls.icon-button-danger-hover-icon;
 }
 
+.nds-icon-button[class*="drag-handle"]:hover {
+  cursor: grab;
+}
+
+.nds-icon-button[class*="drag-handle"]:active,
+.nds-icon-button[class*="drag-handle"]:hover:active {
+  cursor: grabbing;
+}
+
 .nds-icon-button[data-edge="left"] {
   @include controls.button-edge(left);
 }
diff --git a/website/src/styles/toolboxes/_checklist.scss b/website/src/styles/toolboxes/_checklist.scss
index 8c8ec1a..fb60a14 100644
--- a/website/src/styles/toolboxes/_checklist.scss
+++ b/website/src/styles/toolboxes/_checklist.scss
@@ -16,7 +16,7 @@
 }
 
 .checklist-complete-mode-group {
-  @include controls.radio-button-group(xs);
+  @include controls.radio-button-group;
   width: fit-content;
   align-items: center;
 }
@@ -93,30 +93,30 @@
 }
 
 .timer-alert-mode-switch {
-  @include controls.radio-button-group(xs);
+  @include controls.radio-button-group;
   width: fit-content;
   align-items: center;
   opacity: 0.78;
 }
 
-.checklist-complete-mode-button,
-.timer-alert-mode-button {
-  @include controls.radio-button-group-option(xs);
+.checklist-complete-mode-button {
+  @include controls.radio-button-group-option;
   display: inline-grid;
-  width: 36px;
-  min-width: 36px;
   place-items: center;
-  font-size: var(--font-size-xs);
 }
 
-.checklist-complete-mode-button .ui-icon,
-.timer-alert-mode-button .ui-icon {
-  @include controls.radio-button-group-option-icon(xs);
+.checklist-complete-mode-button .ui-icon {
+  @include controls.radio-button-group-option-icon;
 }
 
 .timer-alert-mode-button {
-  width: 24px;
-  min-width: 24px;
+  @include controls.radio-button-group-option;
+  display: inline-grid;
+  place-items: center;
+}
+
+.timer-alert-mode-button .ui-icon {
+  @include controls.radio-button-group-option-icon;
 }
 
 .checklist-section-items {
diff --git a/website/src/styles/toolboxes/_module-shell.scss b/website/src/styles/toolboxes/_module-shell.scss
index 1653acf..486b89e 100644
--- a/website/src/styles/toolboxes/_module-shell.scss
+++ b/website/src/styles/toolboxes/_module-shell.scss
@@ -49,7 +49,8 @@
   padding: 0;
 }
 
-.module-drag-handle {
+.module-drag-handle,
+.module-drag-handle.nds-icon-button {
   flex: 0 0 40px;
   cursor: grab;
   opacity: 0.62;
@@ -62,7 +63,8 @@
   opacity: 1;
 }
 
-.module-drag-handle:active {
+.module-drag-handle:active,
+.module-drag-handle.nds-icon-button:active {
   cursor: grabbing;
 }
 
diff --git a/website/src/styles/toolboxes/_timer.scss b/website/src/styles/toolboxes/_timer.scss
index 06a461a..8d5a0f1 100644
--- a/website/src/styles/toolboxes/_timer.scss
+++ b/website/src/styles/toolboxes/_timer.scss
@@ -253,7 +253,7 @@
 }
 
 .timer-entry.has-drag-handle {
-  grid-template-columns: 30px minmax(0, 1fr) 34px;
+  grid-template-columns: 30px minmax(0, 1fr) 30px;
 }
 
 .tool-split-entry-list li.is-editing > .timer-entry.has-single-action {
@@ -261,7 +261,7 @@
 }
 
 .tool-split-entry-list li.is-editing > .timer-entry.has-drag-handle {
-  grid-template-columns: 30px auto minmax(0, 1fr) 34px;
+  grid-template-columns: 30px auto minmax(0, 1fr) 30px;
 }
 
 .timer-drag-handle {
diff --git a/website/src/styles/toolboxes/layout/_preferences.scss b/website/src/styles/toolboxes/layout/_preferences.scss
index e2b16e2..56d5e50 100644
--- a/website/src/styles/toolboxes/layout/_preferences.scss
+++ b/website/src/styles/toolboxes/layout/_preferences.scss
@@ -76,7 +76,3 @@
 .toolbox-preferences-row + .cards {
   margin-top: 0;
 }
-
-.toast-position-switch {
-  grid-template-columns: repeat(2, 30px);
-}
diff --git a/website/src/styles/toolboxes/shared-controls/_entries.scss b/website/src/styles/toolboxes/shared-controls/_entries.scss
index 3be836d..3de9e2e 100644
--- a/website/src/styles/toolboxes/shared-controls/_entries.scss
+++ b/website/src/styles/toolboxes/shared-controls/_entries.scss
@@ -29,7 +29,7 @@
   position: relative;
 }
 
-.tool-split-entry-list .tool-split-entry-list > li::before {
+.tool-split-entry-list .tool-split-entry-list > li::after {
   content: "";
   position: absolute;
   top: 18px;
diff --git a/website/src/styles/toolboxes/task-planner/_items.scss b/website/src/styles/toolboxes/task-planner/_items.scss
index 9d8e61f..570f637 100644
--- a/website/src/styles/toolboxes/task-planner/_items.scss
+++ b/website/src/styles/toolboxes/task-planner/_items.scss
@@ -5,7 +5,7 @@
   position: relative;
   display: grid;
   gap: 10px;
-  padding: 10px;
+  padding: 6px;
   border: 1px solid rgba(165, 180, 252, 0.12);
   border-radius: var(--radius-md);
   background: rgba(5, 7, 17, 0.36);