diff --git a/src/admin/admin.css b/src/admin/admin.css
index f4f36f0..2e88fef 100644
--- a/src/admin/admin.css
+++ b/src/admin/admin.css
@@ -1484,6 +1484,11 @@ img {
   color: var(--info);
 }
 
+.admin-badge-danger {
+  background: var(--danger-soft);
+  color: var(--danger);
+}
+
 /* ============================================================================
    Modals
    ============================================================================ */
@@ -2342,7 +2347,9 @@ img {
   align-items: center;
   justify-content: center;
   gap: 0.75rem;
-  padding: 0.75rem 0;
+  padding: 0.75rem 1rem;
+  margin-top: 0.5rem;
+  border-top: 1px solid var(--border-color);
   font-size: 13px;
 }
 
diff --git a/src/admin/pages/AuditLog.jsx b/src/admin/pages/AuditLog.jsx
index 980563c..5c377d9 100644
--- a/src/admin/pages/AuditLog.jsx
+++ b/src/admin/pages/AuditLog.jsx
@@ -4,6 +4,9 @@ import { useAuth } from '../context/AuthContext'
 import { useAlert } from '../context/AlertContext'
 import Forbidden from '../components/Forbidden'
 import Pagination from '../components/Pagination'
+import FormField from '../components/FormField'
+import AdminDatePicker from '../components/AdminDatePicker'
+import { czechPlural } from '../utils/formatters'
 import apiFetch from '../utils/api'
 
 const API_BASE = '/api/admin'
@@ -26,16 +29,16 @@ const ACTION_LABELS = {
 const ACTION_BADGE_CLASS = {
   create: 'admin-badge-success',
   update: 'admin-badge-info',
-  delete: 'admin-badge-warning',
+  delete: 'admin-badge-danger',
   login: 'admin-badge-secondary',
-  login_failed: 'admin-badge-warning',
+  login_failed: 'admin-badge-danger',
   logout: 'admin-badge-secondary',
   view: 'admin-badge-info',
   activate: 'admin-badge-success',
   deactivate: 'admin-badge-warning',
   password_change: 'admin-badge-info',
-  permission_change: 'admin-badge-info',
-  access_denied: 'admin-badge-warning',
+  permission_change: 'admin-badge-warning',
+  access_denied: 'admin-badge-danger',
 }
 
 const ENTITY_TYPE_LABELS = {
@@ -143,86 +146,125 @@ export default function AuditLog() {
     return new Date(dateString).toLocaleString('cs-CZ')
   }
 
-  const renderSkeletonRows = () => (
-    Array.from({ length: 10 }, (_, i) => (
-      <tr key={`skeleton-${i}`}>
-        {Array.from({ length: 6 }, (_, j) => (
-          <td key={j}><div className="admin-skeleton" style={{ height: '16px', width: `${60 + Math.random() * 40}%` }} /></td>
-        ))}
-      </tr>
-    ))
-  )
-
-  return (
-    <motion.div
-      initial={{ opacity: 0, y: 20 }}
-      animate={{ opacity: 1, y: 0 }}
-      transition={{ duration: 0.4 }}
-    >
-      <div className="admin-page-header">
-        <h1>Audit log</h1>
-      </div>
-
-      <div className="admin-card" style={{ marginBottom: '1rem' }}>
-        <div style={{ display: 'flex', gap: '0.75rem', flexWrap: 'wrap', alignItems: 'flex-end' }}>
-          <div style={{ flex: '1 1 200px', minWidth: '150px' }}>
-            <label className="admin-form-label">Hledat</label>
-            <input
-              type="text"
-              className="admin-form-input"
-              placeholder="Popis, uživatel..."
-              value={filters.search}
-              onChange={(e) => handleFilterChange('search', e.target.value)}
-            />
+  if (loading && logs.length === 0) {
+    return (
+      <div className="admin-skeleton" style={{ padding: 0, gap: '1.5rem' }}>
+        <div className="admin-skeleton-row" style={{ justifyContent: 'space-between' }}>
+          <div>
+            <div className="admin-skeleton-line h-8" style={{ width: '160px', marginBottom: '0.5rem' }} />
+            <div className="admin-skeleton-line" style={{ width: '100px' }} />
           </div>
-          <div style={{ flex: '0 1 180px', minWidth: '140px' }}>
-            <label className="admin-form-label">Akce</label>
-            <select
-              className="admin-form-input"
-              value={filters.action}
-              onChange={(e) => handleFilterChange('action', e.target.value)}
-            >
-              <option value="">Všechny akce</option>
-              {ACTION_OPTIONS.map(opt => (
-                <option key={opt.value} value={opt.value}>{opt.label}</option>
-              ))}
-            </select>
+        </div>
+        <div className="admin-card">
+          <div className="admin-skeleton" style={{ gap: '0.75rem', padding: '1rem' }}>
+            <div className="admin-skeleton-line h-10" style={{ width: '100%', borderRadius: '8px' }} />
           </div>
-          <div style={{ flex: '0 1 180px', minWidth: '140px' }}>
-            <label className="admin-form-label">Typ entity</label>
-            <select
-              className="admin-form-input"
-              value={filters.entity_type}
-              onChange={(e) => handleFilterChange('entity_type', e.target.value)}
-            >
-              <option value="">Všechny typy</option>
-              {ENTITY_OPTIONS.map(opt => (
-                <option key={opt.value} value={opt.value}>{opt.label}</option>
-              ))}
-            </select>
-          </div>
-          <div style={{ flex: '0 1 160px', minWidth: '130px' }}>
-            <label className="admin-form-label">Od</label>
-            <input
-              type="date"
-              className="admin-form-input"
-              value={filters.date_from}
-              onChange={(e) => handleFilterChange('date_from', e.target.value)}
-            />
-          </div>
-          <div style={{ flex: '0 1 160px', minWidth: '130px' }}>
-            <label className="admin-form-label">Do</label>
-            <input
-              type="date"
-              className="admin-form-input"
-              value={filters.date_to}
-              onChange={(e) => handleFilterChange('date_to', e.target.value)}
-            />
+        </div>
+        <div className="admin-card">
+          <div className="admin-skeleton" style={{ gap: '1rem' }}>
+            <div className="admin-skeleton-line h-10" style={{ width: '100%', borderRadius: '4px' }} />
+            {Array.from({ length: 8 }, (_, i) => (
+              <div key={i} className="admin-skeleton-row">
+                <div className="admin-skeleton-line" style={{ width: '120px' }} />
+                <div className="admin-skeleton-line" style={{ width: '80px' }} />
+                <div className="admin-skeleton-line" style={{ width: '70px', borderRadius: '10px' }} />
+                <div className="admin-skeleton-line" style={{ width: '80px' }} />
+                <div className="admin-skeleton-line" style={{ flex: 1 }} />
+                <div className="admin-skeleton-line" style={{ width: '90px' }} />
+              </div>
+            ))}
           </div>
         </div>
       </div>
+    )
+  }
 
-      <div className="admin-card">
+  return (
+    <div>
+      <motion.div
+        className="admin-page-header"
+        initial={{ opacity: 0, y: 20 }}
+        animate={{ opacity: 1, y: 0 }}
+        transition={{ duration: 0.4 }}
+      >
+        <div>
+          <h1 className="admin-page-title">Audit log</h1>
+          {pagination && (
+            <p className="admin-page-subtitle">
+              {pagination.total} {czechPlural(pagination.total, 'záznam', 'záznamy', 'záznamů')}
+            </p>
+          )}
+        </div>
+      </motion.div>
+
+      <motion.div
+        className="admin-card"
+        initial={{ opacity: 0, y: 20 }}
+        animate={{ opacity: 1, y: 0 }}
+        transition={{ duration: 0.4, delay: 0.05 }}
+        style={{ marginBottom: '1rem' }}
+      >
+        <div className="admin-card-body">
+          <div className="admin-form-row" style={{ gridTemplateColumns: '2fr 1fr 1fr' }}>
+            <FormField label="Hledat">
+              <input
+                type="text"
+                className="admin-form-input"
+                placeholder="Popis, uživatel..."
+                value={filters.search}
+                onChange={(e) => handleFilterChange('search', e.target.value)}
+              />
+            </FormField>
+            <FormField label="Akce">
+              <select
+                className="admin-form-select"
+                value={filters.action}
+                onChange={(e) => handleFilterChange('action', e.target.value)}
+              >
+                <option value="">Všechny</option>
+                {ACTION_OPTIONS.map(opt => (
+                  <option key={opt.value} value={opt.value}>{opt.label}</option>
+                ))}
+              </select>
+            </FormField>
+            <FormField label="Typ entity">
+              <select
+                className="admin-form-select"
+                value={filters.entity_type}
+                onChange={(e) => handleFilterChange('entity_type', e.target.value)}
+              >
+                <option value="">Všechny</option>
+                {ENTITY_OPTIONS.map(opt => (
+                  <option key={opt.value} value={opt.value}>{opt.label}</option>
+                ))}
+              </select>
+            </FormField>
+          </div>
+          <div className="admin-form-row" style={{ gridTemplateColumns: '1fr 1fr', maxWidth: '400px', marginTop: '0.75rem' }}>
+            <FormField label="Od">
+              <AdminDatePicker
+                mode="date"
+                value={filters.date_from}
+                onChange={(val) => handleFilterChange('date_from', val)}
+              />
+            </FormField>
+            <FormField label="Do">
+              <AdminDatePicker
+                mode="date"
+                value={filters.date_to}
+                onChange={(val) => handleFilterChange('date_to', val)}
+              />
+            </FormField>
+          </div>
+        </div>
+      </motion.div>
+
+      <motion.div
+        className="admin-card"
+        initial={{ opacity: 0, y: 20 }}
+        animate={{ opacity: 1, y: 0 }}
+        transition={{ duration: 0.4, delay: 0.1 }}
+      >
         <div className="admin-table-wrapper">
           <table className="admin-table">
             <thead>
@@ -236,17 +278,36 @@ export default function AuditLog() {
               </tr>
             </thead>
             <tbody>
-              {loading && renderSkeletonRows()}
+              {loading && Array.from({ length: 10 }, (_, i) => (
+                <tr key={`skeleton-${i}`}>
+                  <td><div className="admin-skeleton-line" style={{ width: '110px', height: '14px' }} /></td>
+                  <td><div className="admin-skeleton-line" style={{ width: '80px', height: '14px' }} /></td>
+                  <td><div className="admin-skeleton-line" style={{ width: '70px', height: '22px', borderRadius: '10px' }} /></td>
+                  <td><div className="admin-skeleton-line" style={{ width: '80px', height: '14px' }} /></td>
+                  <td><div className="admin-skeleton-line" style={{ width: '60%', height: '14px' }} /></td>
+                  <td><div className="admin-skeleton-line" style={{ width: '90px', height: '14px' }} /></td>
+                </tr>
+              ))}
               {!loading && logs.length === 0 && (
                 <tr>
-                  <td colSpan="6" style={{ textAlign: 'center', padding: '2rem' }}>
-                    Žádné záznamy k zobrazení
+                  <td colSpan="6">
+                    <div className="admin-empty-state">
+                      <div className="admin-empty-icon">
+                        <svg width="28" height="28" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.5">
+                          <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z" />
+                          <polyline points="14 2 14 8 20 8" />
+                          <line x1="16" y1="13" x2="8" y2="13" />
+                          <line x1="16" y1="17" x2="8" y2="17" />
+                        </svg>
+                      </div>
+                      <p>Žádné záznamy k zobrazení</p>
+                    </div>
                   </td>
                 </tr>
               )}
               {!loading && logs.map((log) => (
                 <tr key={log.id}>
-                  <td className="admin-mono">{formatDatetime(log.created_at)}</td>
+                  <td className="admin-mono" style={{ whiteSpace: 'nowrap' }}>{formatDatetime(log.created_at)}</td>
                   <td style={{ fontWeight: 500 }}>{log.username || '-'}</td>
                   <td>
                     <span className={`admin-badge ${ACTION_BADGE_CLASS[log.action] || 'admin-badge-secondary'}`}>
@@ -267,7 +328,7 @@ export default function AuditLog() {
           onPageChange={handlePageChange}
           onPerPageChange={handlePerPageChange}
         />
-      </div>
-    </motion.div>
+      </motion.div>
+    </div>
   )
 }