diff --git a/app/routes/alerting.py b/app/routes/alerting.py
index afa4d41..2f60800 100644
--- a/app/routes/alerting.py
+++ b/app/routes/alerting.py
@@ -230,7 +230,7 @@ def render_event_rows(events: list[dict], empty_colspan: int = 9, include_rule:
             <td>{render_status(event.get("status"))}</td>
             <td>{job_link}</td>
             <td>{html.escape(event.get("created_at", "") or "")}</td>
-            <td><a class="btn" href="/portal/alerting/events/{event_id}"><i class="fa-solid fa-eye" aria-hidden="true"></i> Detail</a></td>
+            <td><a class="icon-action" href="/portal/alerting/events/{event_id}" title="Detail" aria-label="Detail"><i class="fa-solid fa-eye" aria-hidden="true"></i></a></td>
         </tr>
         """
 
@@ -307,13 +307,13 @@ def alert_rules_page(request: Request, user=Depends(require_user)):
             <td>{last_event}</td>
             <td>{html.escape(rule.get("updated_at", "") or "")}</td>
             <td class="actions-cell service-actions">
-                <a class="btn" href="/portal/alerting/rules/{rule_id}"><i class="fa-solid fa-eye" aria-hidden="true"></i> Detail</a>
-                <a class="btn btn-secondary" href="/portal/alerting/rules/{rule_id}/edit"><i class="fa-solid fa-pen-to-square" aria-hidden="true"></i> Upravit</a>
+                <a class="icon-action" href="/portal/alerting/rules/{rule_id}" title="Detail" aria-label="Detail"><i class="fa-solid fa-eye" aria-hidden="true"></i></a>
+                <a class="icon-action" href="/portal/alerting/rules/{rule_id}/edit" title="Upravit" aria-label="Upravit"><i class="fa-solid fa-pen-to-square" aria-hidden="true"></i></a>
                 <form method="post" action="/portal/alerting/rules/{rule_id}/toggle" class="inline-form">
-                    <button type="submit" class="btn btn-secondary"><i class="fa-solid fa-power-off" aria-hidden="true"></i> {toggle_label}</button>
+                    <button type="submit" class="icon-action" title="{toggle_label}" aria-label="{toggle_label}"><i class="fa-solid fa-power-off" aria-hidden="true"></i></button>
                 </form>
                 <form method="post" action="/portal/alerting/rules/{rule_id}/delete" class="inline-form" onsubmit="return confirm('Smazat alert pravidlo?');">
-                    <button type="submit" class="danger"><i class="fa-solid fa-trash" aria-hidden="true"></i> Smazat</button>
+                    <button type="submit" class="icon-action icon-action-danger" title="Smazat" aria-label="Smazat"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
                 </form>
             </td>
         </tr>
diff --git a/app/routes/apps.py b/app/routes/apps.py
index 06af123..e47017d 100644
--- a/app/routes/apps.py
+++ b/app/routes/apps.py
@@ -709,10 +709,10 @@ def app_detail(app_id: str, request: Request, message: str = "", error: str = ""
                     <input name="key" value="{variable_key}" required>
                     <input name="value" value="{value_input}"{secret_hint}>
                     <label class="checkbox-label"><input type="checkbox" name="is_secret" value="1"{secret_checked}> Secret</label>
-                    <button type="submit" class="btn btn-compact"><i class="fa-solid fa-floppy-disk" aria-hidden="true"></i> Uložit</button>
+                    <button type="submit" class="icon-action" title="Uložit" aria-label="Uložit"><i class="fa-solid fa-floppy-disk" aria-hidden="true"></i></button>
                 </form>
                 <form method="post" action="/portal/apps/{app_url_id}/variables/{variable_id}/delete" class="inline-form" onsubmit="return confirm('Smazat promennou {variable_key}?');">
-                    <button type="submit" class="btn btn-secondary btn-compact"><i class="fa-solid fa-trash" aria-hidden="true"></i> Smazat</button>
+                    <button type="submit" class="icon-action icon-action-danger" title="Smazat" aria-label="Smazat"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
                 </form>
             </td>
         </tr>
diff --git a/app/routes/backups.py b/app/routes/backups.py
index b45d065..1e82253 100644
--- a/app/routes/backups.py
+++ b/app/routes/backups.py
@@ -30,8 +30,8 @@ def backups_page(request: Request, user=Depends(require_user)):
         backup_path = html.escape(str(path), quote=True)
         backup_url_name = quote(path.name, safe="")
         download_action = (
-            f'<a class="btn btn-secondary" href="/portal/backups/download/{backup_url_name}">'
-            f'<i class="fa-solid fa-download" aria-hidden="true"></i> Stáhnout</a>'
+            f'<a class="icon-action" href="/portal/backups/download/{backup_url_name}" title="Stáhnout" aria-label="Stáhnout">'
+            f'<i class="fa-solid fa-download" aria-hidden="true"></i></a>'
             if can_download
             else ""
         )
@@ -41,8 +41,8 @@ def backups_page(request: Request, user=Depends(require_user)):
                 <form method="post" action="/portal/backups/restore"
                       onsubmit="return confirm('Obnovit zálohu {backup_name}?\\n\\nTato akce přepíše aktuální data AppFactory a může restartovat běžící služby. Akce je nevratná.');">
                     <input type="hidden" name="backup_path" value="{backup_path}">
-                    <button type="submit" class="btn btn-secondary">
-                        <i class="fa-solid fa-clock-rotate-left" aria-hidden="true"></i> Obnovit
+                    <button type="submit" class="icon-action" title="Obnovit" aria-label="Obnovit">
+                        <i class="fa-solid fa-clock-rotate-left" aria-hidden="true"></i>
                     </button>
                 </form>
             """
@@ -64,13 +64,13 @@ def backups_page(request: Request, user=Depends(require_user)):
                     </button>
                 </div>
             </td>
-            <td class="actions-cell">
+            <td class="actions-cell service-actions">
                 {download_action}
                 {restore_action}
                 <form method="post" action="/portal/backups/delete" onsubmit="return confirm('Smazat zálohu {backup_name}?');">
                     <input type="hidden" name="backup_path" value="{backup_path}">
-                    <button type="submit" class="danger">
-                        <i class="fa-solid fa-trash" aria-hidden="true"></i> Smazat
+                    <button type="submit" class="icon-action icon-action-danger" title="Smazat" aria-label="Smazat">
+                        <i class="fa-solid fa-trash" aria-hidden="true"></i>
                     </button>
                 </form>
             </td>
diff --git a/app/routes/deployments.py b/app/routes/deployments.py
index 454c3f7..6c7f068 100644
--- a/app/routes/deployments.py
+++ b/app/routes/deployments.py
@@ -211,7 +211,7 @@ async def deployments_page(
             <td>{returncode_label}</td>
             <td>{finished_at}</td>
             <td class="actions-cell">
-                <a class="btn" href="/portal/deployments/{deployment_id}"><i class="fa-solid fa-eye" aria-hidden="true"></i> Detail</a>
+                <a class="icon-action" href="/portal/deployments/{deployment_id}" title="Detail" aria-label="Detail"><i class="fa-solid fa-eye" aria-hidden="true"></i></a>
             </td>
         </tr>
         """
diff --git a/app/routes/jobs.py b/app/routes/jobs.py
index 58bf45b..480f67e 100644
--- a/app/routes/jobs.py
+++ b/app/routes/jobs.py
@@ -198,7 +198,7 @@ def jobs_page(
             <td>{created_at}</td>
             <td>{started_at}</td>
             <td>{finished_at}</td>
-            <td class="actions-cell"><a class="btn" href="/portal/jobs/{job_id}"><i class="fa-solid fa-eye" aria-hidden="true"></i> Detail</a></td>
+            <td class="actions-cell"><a class="icon-action" href="/portal/jobs/{job_id}" title="Detail" aria-label="Detail"><i class="fa-solid fa-eye" aria-hidden="true"></i></a></td>
         </tr>
         """
 
diff --git a/app/routes/scheduled_scripts.py b/app/routes/scheduled_scripts.py
index 3ac3de9..aed7819 100644
--- a/app/routes/scheduled_scripts.py
+++ b/app/routes/scheduled_scripts.py
@@ -307,7 +307,7 @@ def scheduled_scripts_page(request: Request, user=Depends(require_user)):
         if not script.get("is_running"):
             delete_button = f"""
                 <form method="post" action="/portal/scheduled-scripts/{script_id}/delete" class="inline-form" onsubmit="return confirm('Smazat plánovaný skript {name}?');">
-                    <button type="submit" class="danger"><i class="fa-solid fa-trash" aria-hidden="true"></i> Smazat</button>
+                    <button type="submit" class="icon-action icon-action-danger" title="Smazat" aria-label="Smazat"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
                 </form>
             """
 
@@ -323,12 +323,12 @@ def scheduled_scripts_page(request: Request, user=Depends(require_user)):
             <td>{last_run_at}</td>
             <td>{next_run_at}</td>
             <td class="actions-cell service-actions">
-                <a class="btn" href="/portal/scheduled-scripts/{script_id}"><i class="fa-solid fa-eye" aria-hidden="true"></i> Detail</a>
+                <a class="icon-action" href="/portal/scheduled-scripts/{script_id}" title="Detail" aria-label="Detail"><i class="fa-solid fa-eye" aria-hidden="true"></i></a>
                 <form method="post" action="/portal/scheduled-scripts/{script_id}/run-now" class="inline-form">
-                    <button type="submit" class="btn btn-secondary"><i class="fa-solid fa-play" aria-hidden="true"></i> Spustit nyní</button>
+                    <button type="submit" class="icon-action" title="Spustit nyní" aria-label="Spustit nyní"><i class="fa-solid fa-play" aria-hidden="true"></i></button>
                 </form>
                 <form method="post" action="/portal/scheduled-scripts/{script_id}/toggle" class="inline-form">
-                    <button type="submit" class="btn btn-secondary"><i class="fa-solid fa-power-off" aria-hidden="true"></i> {toggle_label}</button>
+                    <button type="submit" class="icon-action" title="{toggle_label}" aria-label="{toggle_label}"><i class="fa-solid fa-power-off" aria-hidden="true"></i></button>
                 </form>
                 {delete_button}
             </td>
diff --git a/app/routes/users.py b/app/routes/users.py
index 26371d5..92e5323 100644
--- a/app/routes/users.py
+++ b/app/routes/users.py
@@ -119,22 +119,22 @@ def users_page(request: Request, message: str = "", error: str = "", user=Depend
             <td>
                 <form method="post" action="/portal/admin/users/{user_id_html}/role" class="inline-form">
                     <select name="role">{render_role_options(role)}</select>
-                    <button type="submit" class="btn-secondary"><i class="fa-solid fa-floppy-disk" aria-hidden="true"></i> Save</button>
+                    <button type="submit" class="icon-action" title="Save" aria-label="Save"><i class="fa-solid fa-floppy-disk" aria-hidden="true"></i></button>
                 </form>
             </td>
             <td>{render_enabled_pill(enabled)}</td>
             <td>{render_sync_pill(gitea_sync_status)}<br><small>{gitea_details}</small></td>
             <td>{created_at}</td>
             <td>{last_login_at}</td>
-            <td class="actions-cell">
+            <td class="actions-cell service-actions">
                 <form method="post" action="/portal/admin/users/{user_id_html}/{toggle_action}" class="inline-form">
-                    <button type="submit" class="btn-secondary"><i class="fa-solid fa-power-off" aria-hidden="true"></i> {toggle_label}</button>
+                    <button type="submit" class="icon-action" title="{toggle_label}" aria-label="{toggle_label}"><i class="fa-solid fa-power-off" aria-hidden="true"></i></button>
                 </form>
                 <form method="post" action="/portal/admin/users/{user_id_html}/sync-gitea" class="inline-form">
-                    <button type="submit" class="btn-secondary"><i class="fa-solid fa-rotate" aria-hidden="true"></i> Sync Gitea</button>
+                    <button type="submit" class="icon-action" title="Sync Gitea" aria-label="Sync Gitea"><i class="fa-solid fa-rotate" aria-hidden="true"></i></button>
                 </form>
                 <form method="post" action="/portal/admin/users/{user_id_html}/delete" class="inline-form" onsubmit="return confirm('Delete this user? This removes the portal account.');">
-                    <button type="submit" class="btn-secondary"><i class="fa-solid fa-trash" aria-hidden="true"></i> Delete</button>
+                    <button type="submit" class="icon-action icon-action-danger" title="Delete" aria-label="Delete"><i class="fa-solid fa-trash" aria-hidden="true"></i></button>
                 </form>
             </td>
         </tr>
diff --git a/app/static/styles.css b/app/static/styles.css
index 903e6e7..285c727 100644
--- a/app/static/styles.css
+++ b/app/static/styles.css
@@ -716,7 +716,7 @@ input[readonly] {
 }
 
 .copy-button,
-.actions-cell button {
+.actions-cell button:not(.icon-action) {
     width: 82px;
     text-align: center;
 }
@@ -1191,7 +1191,7 @@ pre {
     }
 
     .copy-button,
-    .actions-cell button {
+    .actions-cell button:not(.icon-action) {
         width: 100%;
     }