diff --git a/src/admin/pages/WarehouseIssueDetail.tsx b/src/admin/pages/WarehouseIssueDetail.tsx
index 8f8cfef..d08b697 100644
--- a/src/admin/pages/WarehouseIssueDetail.tsx
+++ b/src/admin/pages/WarehouseIssueDetail.tsx
@@ -1,24 +1,39 @@
 import { useState } from "react";
-import { useParams, useNavigate, Link } from "react-router-dom";
+import { useParams, useNavigate, Link as RouterLink } from "react-router-dom";
 import { useQuery } from "@tanstack/react-query";
+import { motion } from "framer-motion";
+import Box from "@mui/material/Box";
+import Typography from "@mui/material/Typography";
 import { useAlert } from "../context/AlertContext";
 import { useAuth } from "../context/AuthContext";
 import Forbidden from "../components/Forbidden";
-import { motion } from "framer-motion";
-import ConfirmModal from "../components/ConfirmModal";
-import FormField from "../components/FormField";
 
 import { formatCurrency, formatDate } from "../utils/formatters";
 import {
   warehouseIssueDetailOptions,
   type WarehouseIssue,
+  type WarehouseIssueItem,
 } from "../lib/queries/warehouse";
 import { useApiMutation } from "../lib/queries/mutations";
+import {
+  Button,
+  Card,
+  DataTable,
+  StatusChip,
+  EmptyState,
+  LoadingState,
+  PageHeader,
+  ConfirmDialog,
+  type DataColumn,
+} from "../ui";
 
-const STATUS_BADGE: Record<string, string> = {
-  DRAFT: "admin-badge-warning",
-  CONFIRMED: "admin-badge-active",
-  CANCELLED: "admin-badge-danger",
+const STATUS_COLOR: Record<
+  string,
+  "default" | "success" | "error" | "warning" | "info"
+> = {
+  DRAFT: "warning",
+  CONFIRMED: "success",
+  CANCELLED: "error",
 };
 
 const STATUS_LABEL: Record<string, string> = {
@@ -27,6 +42,19 @@ const STATUS_LABEL: Record<string, string> = {
   CANCELLED: "Zrušeno",
 };
 
+const BackIcon = (
+  <svg
+    width="20"
+    height="20"
+    viewBox="0 0 24 24"
+    fill="none"
+    stroke="currentColor"
+    strokeWidth="2"
+  >
+    <path d="M19 12H5M12 19l-7-7 7-7" />
+  </svg>
+);
+
 export default function WarehouseIssueDetail() {
   const { id } = useParams();
   const alert = useAlert();
@@ -92,257 +120,290 @@ export default function WarehouseIssueDetail() {
   const cancelling = cancelMutation.isPending;
 
   if (isPending) {
-    return (
-      <div className="admin-loading">
-        <div className="admin-spinner" />
-      </div>
-    );
+    return <LoadingState />;
   }
 
   if (error || !issue) {
     return (
-      <div>
-        <div className="admin-page-header">
-          <div>
-            <Link
+      <Box>
+        <PageHeader
+          title="Výdejka"
+          actions={
+            <Button
+              component={RouterLink}
               to="/warehouse/issues"
-              className="admin-btn-icon"
-              title="Zpět na seznam"
+              variant="outlined"
+              color="inherit"
+              startIcon={BackIcon}
             >
-              <svg
-                width="20"
-                height="20"
-                viewBox="0 0 24 24"
-                fill="none"
-                stroke="currentColor"
-                strokeWidth="2"
-              >
-                <path d="M19 12H5M12 19l-7-7 7-7" />
-              </svg>
-            </Link>
-          </div>
-        </div>
-        <div className="admin-card">
-          <div className="admin-card-body">
-            <div className="admin-empty-state">
-              <p>Výdejka nebyla nalezena.</p>
-            </div>
-          </div>
-        </div>
-      </div>
+              Zpět
+            </Button>
+          }
+        />
+        <Card>
+          <EmptyState title="Výdejka nebyla nalezena." />
+        </Card>
+      </Box>
     );
   }
 
   const iss = issue as WarehouseIssue;
   const items = iss.items ?? [];
 
+  const itemColumns: DataColumn<WarehouseIssueItem>[] = [
+    {
+      key: "item",
+      header: "Položka",
+      width: "20%",
+      bold: true,
+      render: (row) => row.item?.name || `ID: ${row.item_id}`,
+    },
+    {
+      key: "batch",
+      header: "Šarže",
+      width: "18%",
+      mono: true,
+      render: (row) =>
+        row.batch
+          ? `${formatDate(row.batch.received_at)} – ${formatCurrency(Number(row.batch.unit_price), "CZK")}`
+          : "—",
+    },
+    {
+      key: "quantity",
+      header: "Množství",
+      width: "10%",
+      mono: true,
+      render: (row) => String(Number(row.quantity)),
+    },
+    {
+      key: "unit_price",
+      header: "Cena/ks",
+      width: "13%",
+      mono: true,
+      render: (row) =>
+        row.batch ? formatCurrency(Number(row.batch.unit_price), "CZK") : "—",
+    },
+    {
+      key: "total",
+      header: "Celkem",
+      width: "13%",
+      mono: true,
+      bold: true,
+      render: (row) =>
+        row.batch
+          ? formatCurrency(
+              Number(row.quantity) * Number(row.batch.unit_price),
+              "CZK",
+            )
+          : "—",
+    },
+    {
+      key: "location",
+      header: "Lokace",
+      width: "10%",
+      mono: true,
+      render: (row) => row.location?.code || "—",
+    },
+    {
+      key: "reservation",
+      header: "Rezervace",
+      width: "10%",
+      mono: true,
+      render: (row) =>
+        row.reservation
+          ? `ID: ${row.reservation.id} (${Number(row.reservation.remaining_qty)} ks)`
+          : "—",
+    },
+    {
+      key: "notes",
+      header: "Poznámka",
+      width: "6%",
+      render: (row) => row.notes || "—",
+    },
+  ];
+
   return (
-    <div>
+    <Box>
       {/* Header */}
       <motion.div
-        className="admin-page-header"
         initial={{ opacity: 0, y: 12 }}
         animate={{ opacity: 1, y: 0 }}
         transition={{ duration: 0.25 }}
       >
-        <div style={{ display: "flex", alignItems: "center", gap: "1rem" }}>
-          <Link
-            to="/warehouse/issues"
-            className="admin-btn-icon"
-            title="Zpět na seznam"
-            aria-label="Zpět na seznam"
-          >
-            <svg
-              width="20"
-              height="20"
-              viewBox="0 0 24 24"
-              fill="none"
-              stroke="currentColor"
-              strokeWidth="2"
-            >
-              <path d="M19 12H5M12 19l-7-7 7-7" />
-            </svg>
-          </Link>
-          <div>
-            <h1 className="admin-page-title">
-              {iss.issue_number || "Nová výdejka"}
-            </h1>
-            {iss.project && (
-              <p className="admin-page-subtitle">
-                {iss.project.project_number} – {iss.project.name}
-              </p>
-            )}
-          </div>
-          <span
-            className={`admin-badge ${STATUS_BADGE[iss.status] ?? ""}`}
-            style={{ marginLeft: "0.5rem" }}
-          >
-            {STATUS_LABEL[iss.status] ?? iss.status}
-          </span>
-        </div>
-        {canOperate && (
-          <div className="admin-page-actions">
-            {iss.status === "DRAFT" && (
-              <>
-                <button
-                  onClick={() => navigate(`/warehouse/issues/${iss.id}/edit`)}
-                  className="admin-btn admin-btn-secondary"
-                >
-                  Upravit
-                </button>
-                <button
-                  onClick={handleConfirm}
-                  className="admin-btn admin-btn-primary"
-                  disabled={confirming}
-                >
-                  {confirming ? "Potvrzování..." : "Potvrdit"}
-                </button>
-                <button
+        <PageHeader
+          title={iss.issue_number || "Nová výdejka"}
+          subtitle={
+            iss.project
+              ? `${iss.project.project_number} – ${iss.project.name}`
+              : undefined
+          }
+          actions={
+            <Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
+              <Button
+                component={RouterLink}
+                to="/warehouse/issues"
+                variant="outlined"
+                color="inherit"
+                startIcon={BackIcon}
+              >
+                Zpět
+              </Button>
+              <StatusChip
+                label={STATUS_LABEL[iss.status] ?? iss.status}
+                color={STATUS_COLOR[iss.status] ?? "default"}
+              />
+              {canOperate && iss.status === "DRAFT" && (
+                <>
+                  <Button
+                    variant="outlined"
+                    color="inherit"
+                    onClick={() => navigate(`/warehouse/issues/${iss.id}/edit`)}
+                  >
+                    Upravit
+                  </Button>
+                  <Button onClick={handleConfirm} disabled={confirming}>
+                    {confirming ? "Potvrzování..." : "Potvrdit"}
+                  </Button>
+                  <Button
+                    variant="outlined"
+                    color="error"
+                    onClick={() => setCancelConfirm(true)}
+                  >
+                    Zrušit
+                  </Button>
+                </>
+              )}
+              {canOperate && iss.status === "CONFIRMED" && (
+                <Button
+                  variant="outlined"
+                  color="error"
                   onClick={() => setCancelConfirm(true)}
-                  className="admin-btn admin-btn-secondary"
-                  style={{ color: "var(--danger)" }}
                 >
                   Zrušit
-                </button>
-              </>
-            )}
-            {iss.status === "CONFIRMED" && (
-              <button
-                onClick={() => setCancelConfirm(true)}
-                className="admin-btn admin-btn-secondary"
-                style={{ color: "var(--danger)" }}
-              >
-                Zrušit
-              </button>
-            )}
-          </div>
-        )}
+                </Button>
+              )}
+            </Box>
+          }
+        />
       </motion.div>
 
-      {/* Header info */}
+      {/* Basic info */}
       <motion.div
-        className="admin-card"
         initial={{ opacity: 0, y: 12 }}
         animate={{ opacity: 1, y: 0 }}
         transition={{ duration: 0.25, delay: 0.06 }}
       >
-        <div className="admin-card-body">
-          <h3 className="admin-card-title">Základní údaje</h3>
-          <div className="admin-form">
-            <div className="admin-form-row admin-form-row-3">
-              <FormField label="Číslo dokladu">
-                <div className="admin-mono fw-500">
-                  {iss.issue_number || "—"}
-                </div>
-              </FormField>
-              <FormField label="Projekt">
-                <div>
-                  {iss.project ? (
-                    <a
-                      className="link-accent admin-mono fw-500"
-                      href={`/projects/${iss.project.id}`}
-                    >
-                      {iss.project.project_number} – {iss.project.name}
-                    </a>
-                  ) : (
-                    "—"
-                  )}
-                </div>
-              </FormField>
-              <FormField label="Vydal">
-                <div className="admin-mono fw-500">
-                  {iss.issued_by_user
-                    ? `${iss.issued_by_user.first_name} ${iss.issued_by_user.last_name}`
-                    : "—"}
-                </div>
-              </FormField>
-            </div>
-            <div className="admin-form-row">
-              <FormField label="Vytvořeno">
-                <div className="admin-mono">{formatDate(iss.created_at)}</div>
-              </FormField>
-            </div>
+        <Card sx={{ mb: 3 }}>
+          <Typography variant="subtitle2" sx={{ mb: 2, fontWeight: 600 }}>
+            Základní údaje
+          </Typography>
+          <Box
+            sx={{
+              display: "grid",
+              gridTemplateColumns: { xs: "1fr", sm: "1fr 1fr 1fr" },
+              gap: 2,
+            }}
+          >
+            <Box>
+              <Typography variant="caption" color="text.secondary">
+                Číslo dokladu
+              </Typography>
+              <Typography
+                variant="body2"
+                sx={{
+                  fontFamily: "'DM Mono', Menlo, monospace",
+                  fontWeight: 500,
+                }}
+              >
+                {iss.issue_number || "—"}
+              </Typography>
+            </Box>
+            <Box>
+              <Typography variant="caption" color="text.secondary">
+                Projekt
+              </Typography>
+              {iss.project ? (
+                <Typography
+                  variant="body2"
+                  component="a"
+                  href={`/projects/${iss.project.id}`}
+                  sx={{
+                    fontFamily: "'DM Mono', Menlo, monospace",
+                    fontWeight: 500,
+                    color: "primary.main",
+                    textDecoration: "none",
+                    "&:hover": { textDecoration: "underline" },
+                    display: "block",
+                  }}
+                >
+                  {iss.project.project_number} – {iss.project.name}
+                </Typography>
+              ) : (
+                <Typography variant="body2">—</Typography>
+              )}
+            </Box>
+            <Box>
+              <Typography variant="caption" color="text.secondary">
+                Vydal
+              </Typography>
+              <Typography
+                variant="body2"
+                sx={{
+                  fontFamily: "'DM Mono', Menlo, monospace",
+                  fontWeight: 500,
+                }}
+              >
+                {iss.issued_by_user
+                  ? `${iss.issued_by_user.first_name} ${iss.issued_by_user.last_name}`
+                  : "—"}
+              </Typography>
+            </Box>
+            <Box>
+              <Typography variant="caption" color="text.secondary">
+                Vytvořeno
+              </Typography>
+              <Typography
+                variant="body2"
+                sx={{ fontFamily: "'DM Mono', Menlo, monospace" }}
+              >
+                {formatDate(iss.created_at)}
+              </Typography>
+            </Box>
             {iss.notes && (
-              <FormField label="Poznámky">
-                <div style={{ whiteSpace: "pre-wrap" }}>{iss.notes}</div>
-              </FormField>
+              <Box sx={{ gridColumn: { sm: "1 / -1" } }}>
+                <Typography variant="caption" color="text.secondary">
+                  Poznámky
+                </Typography>
+                <Typography variant="body2" sx={{ whiteSpace: "pre-wrap" }}>
+                  {iss.notes}
+                </Typography>
+              </Box>
             )}
-          </div>
-        </div>
+          </Box>
+        </Card>
       </motion.div>
 
       {/* Lines table */}
       <motion.div
-        className="admin-card"
         initial={{ opacity: 0, y: 12 }}
         animate={{ opacity: 1, y: 0 }}
         transition={{ duration: 0.25, delay: 0.08 }}
       >
-        <div className="admin-card-body">
-          <h3 className="admin-card-title">Položky</h3>
-          {items.length === 0 ? (
-            <div className="admin-empty-state">Žádné řádky</div>
-          ) : (
-            <div className="admin-table-responsive">
-              <table className="admin-table">
-                <thead>
-                  <tr>
-                    <th>Položka</th>
-                    <th>Šarže</th>
-                    <th>Množství</th>
-                    <th>Cena/ks</th>
-                    <th>Celkem</th>
-                    <th>Lokace</th>
-                    <th>Rezervace</th>
-                    <th>Poznámka</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  {items.map((item) => (
-                    <tr key={item.id}>
-                      <td className="fw-500">
-                        {item.item?.name || `ID: ${item.item_id}`}
-                      </td>
-                      <td className="admin-mono">
-                        {item.batch
-                          ? `${formatDate(item.batch.received_at)} – ${formatCurrency(Number(item.batch.unit_price), "CZK")}`
-                          : "—"}
-                      </td>
-                      <td className="admin-mono">{Number(item.quantity)}</td>
-                      <td className="admin-mono">
-                        {item.batch
-                          ? formatCurrency(Number(item.batch.unit_price), "CZK")
-                          : "—"}
-                      </td>
-                      <td className="admin-mono fw-500">
-                        {item.batch
-                          ? formatCurrency(
-                              Number(item.quantity) *
-                                Number(item.batch.unit_price),
-                              "CZK",
-                            )
-                          : "—"}
-                      </td>
-                      <td className="admin-mono">
-                        {item.location?.code || "—"}
-                      </td>
-                      <td className="admin-mono">
-                        {item.reservation
-                          ? `ID: ${item.reservation.id} (${Number(item.reservation.remaining_qty)} ks)`
-                          : "—"}
-                      </td>
-                      <td>{item.notes || "—"}</td>
-                    </tr>
-                  ))}
-                </tbody>
-              </table>
-            </div>
-          )}
-        </div>
+        <Card sx={{ mb: 3 }}>
+          <Typography variant="subtitle2" sx={{ mb: 2, fontWeight: 600 }}>
+            Položky
+          </Typography>
+          <DataTable<WarehouseIssueItem>
+            columns={itemColumns}
+            rows={items}
+            rowKey={(row) => row.id}
+            empty={<EmptyState title="Žádné řádky" />}
+          />
+        </Card>
       </motion.div>
 
-      {/* Cancel confirmation modal */}
-      <ConfirmModal
+      {/* Cancel confirmation dialog */}
+      <ConfirmDialog
         isOpen={cancelConfirm}
         onClose={() => setCancelConfirm(false)}
         onConfirm={handleCancel}
@@ -352,6 +413,6 @@ export default function WarehouseIssueDetail() {
         confirmVariant="danger"
         loading={cancelling}
       />
-    </div>
+    </Box>
   );
 }