diff --git a/src/components/OptionsPanel.tsx b/src/components/OptionsPanel.tsx
index 7876545..793a230 100644
--- a/src/components/OptionsPanel.tsx
+++ b/src/components/OptionsPanel.tsx
@@ -107,13 +107,13 @@ export function OptionsPanel({
       <div className="space-y-5">
         <section className="space-y-3">
           <h4 className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">선가중치</h4>
-          <label className="flex items-center justify-between text-sm">
+          <Label className="w-full justify-between text-sm">
             표시 사용
             <Switch
               checked={options.lineweightOn ?? false}
               onCheckedChange={(on) => onSetLineweightOn(on)}
             />
-          </label>
+          </Label>
           <SliderNumberRow
             label="표시 배율 (px/mm)"
             value={lwScale}
@@ -128,10 +128,10 @@ export function OptionsPanel({
 
         <section className="space-y-3 border-t pt-4">
           <h4 className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">표시</h4>
-          <label className="flex items-center justify-between text-sm">
+          <Label className="w-full justify-between text-sm">
             그리드
             <Switch checked={options.grid} onCheckedChange={onSetGrid} />
-          </label>
+          </Label>
           <SliderNumberRow
             label="줌 속도"
             value={options.zoomSpeed}
@@ -144,10 +144,10 @@ export function OptionsPanel({
 
         <section className="space-y-3 border-t pt-4">
           <h4 className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">2.5D</h4>
-          <label className="flex items-center justify-between text-sm">
+          <Label className="w-full justify-between text-sm">
             2.5D 보기
             <Switch checked={is25D} onCheckedChange={onSet25D} />
-          </label>
+          </Label>
           <div className={is25D ? '' : 'pointer-events-none opacity-50'}>
             <SliderNumberRow
               label="Z 높이 배율"
diff --git a/src/components/Toolbar.tsx b/src/components/Toolbar.tsx
index f5adc38..c4d5f80 100644
--- a/src/components/Toolbar.tsx
+++ b/src/components/Toolbar.tsx
@@ -1,5 +1,5 @@
 import { useRef } from 'react';
-import { Button, Switch, Tabs, TabsList, TabsTrigger, Badge, Toggle } from '@hm-design/ui';
+import { Button, Label, Switch, Tabs, TabsList, TabsTrigger, Badge, Toggle } from '@hm-design/ui';
 import { FolderOpen, Scan, Layers, SlidersHorizontal, Info as InfoIcon } from 'lucide-react';
 import type { CadSpace } from '../viewer2d/cadSpaces';
 import { LicenseNotice } from './LicenseNotice';
@@ -91,15 +91,15 @@ export function Toolbar({
         <Scan /> Fit
       </Button>
 
-      <label className="flex items-center gap-1.5 text-xs text-muted-foreground">
+      <Label className="gap-1.5 text-xs text-muted-foreground">
         <Switch checked={is25D} onCheckedChange={onToggle25D} />
         2.5D
-      </label>
+      </Label>
 
-      <label className="flex items-center gap-1.5 text-xs text-muted-foreground">
+      <Label className="gap-1.5 text-xs text-muted-foreground">
         <Switch checked={canvasDark} onCheckedChange={onToggleTheme} />
         캔버스 테마
-      </label>
+      </Label>
 
       <div className="ml-auto flex items-center gap-1">
         <Toggle pressed={layersOpen} onPressedChange={onToggleLayers} size="sm" aria-label="레이어 패널" title="Layers">