From c699beb6fd1dcc079f9a3ad65739dec261d92878 Mon Sep 17 00:00:00 2001
From: thanhnv <thanhnv.ip@gmail.com>
Date: Wed, 16 Sep 2026 00:23:03 +0900
Subject: [PATCH] fix: align settings navigation item

---
 presentation/shell/top_bar.py | 8 ++++----
 ui/icons.py                   | 6 ++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/presentation/shell/top_bar.py b/presentation/shell/top_bar.py
index 0fbcecc..adf83d1 100644
--- a/presentation/shell/top_bar.py
+++ b/presentation/shell/top_bar.py
@@ -59,11 +59,11 @@ class TopBarMixin:
         # that number. Adding it again here made the row taller than the button
         # (28 wanted, 20 given), which both clipped the icon and pushed the text
         # 8px below an even pitch with Dashboard / Giám sát.
-        srow.setContentsMargins(_NAV_ROW_INSET, 0, 8, 0)
-        srow.setSpacing(_NAV_ROW_GAP)
+        srow.setContentsMargins(_NAV_ROW_INSET + 2, 0, 8, 0)
+        srow.setSpacing(_NAV_ROW_GAP + 4)
         self._nav_settings_icon = QLabel()
-        self._nav_settings_icon.setPixmap(_icon("settings").pixmap(16, 16))
-        self._nav_settings_icon.setFixedSize(16, 16)
+        self._nav_settings_icon.setPixmap(_icon("gear").pixmap(16, 16))
+        self._nav_settings_icon.setFixedSize(22, 16)
         self._nav_settings_text = QLabel(tr("app.settings"))
         srow.addWidget(self._nav_settings_icon)
         srow.addWidget(self._nav_settings_text)
diff --git a/ui/icons.py b/ui/icons.py
index dca22d5..b244953 100644
--- a/ui/icons.py
+++ b/ui/icons.py
@@ -78,8 +78,7 @@ _PATHS = {
     "briefcase": '<rect x="2" y="7" width="20" height="14" rx="2"/>'
                  '<path d="M16 21V5a2 2 0 0 0-2-2h-4a2 2 0 0 0-2 2v16"/>',
     "award": '<circle cx="12" cy="8" r="7"/><polyline points="8.2 13.9 7 22 12 19 17 22 15.8 13.9"/>',
-    "gear": '<circle cx="12" cy="12" r="3"/>'
-            '<path d="M12 1v4M12 19v4M4.2 4.2l2.8 2.8M17 17l2.8 2.8M1 12h4M19 12h4M4.2 19.8L7 17M17 7l2.8-2.8"/>',
+    "gear": '<path d="M12.22 2h-.44a2 2 0 0 0-2 2v.18a2 2 0 0 1-1 1.73l-.43.25a2 2 0 0 1-2 0L6.2 6.08a2 2 0 0 0-2.73.73l-.22.38a2 2 0 0 0 .73 2.73l.15.09a2 2 0 0 1 1 1.74v.5a2 2 0 0 1-1 1.74l-.15.09a2 2 0 0 0-.73 2.73l.22.38a2 2 0 0 0 2.73.73l.15-.08a2 2 0 0 1 2 0l.43.25a2 2 0 0 1 1 1.73V20a2 2 0 0 0 2 2h.44a2 2 0 0 0 2-2v-.18a2 2 0 0 1 1-1.73l.43-.25a2 2 0 0 1 2 0l.15.08a2 2 0 0 0 2.73-.73l.22-.38a2 2 0 0 0-.73-2.73l-.15-.09a2 2 0 0 1-1-1.74v-.5a2 2 0 0 1 1-1.74l.15-.09a2 2 0 0 0 .73-2.73l-.22-.38a2 2 0 0 0-2.73-.73l-.15.08a2 2 0 0 1-2 0l-.43-.25a2 2 0 0 1-1-1.73V4a2 2 0 0 0-2-2z"/><circle cx="12" cy="12" r="3"/>',
     "globe": '<circle cx="12" cy="12" r="10"/><line x1="2" y1="12" x2="22" y2="12"/>'
              '<path d="M12 2a15.3 15.3 0 0 1 4 10 15.3 15.3 0 0 1-4 10 15.3 15.3 0 0 1-4-10 15.3 15.3 0 0 1 4-10z"/>',
     "logout": '<path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"/>'
@@ -199,8 +198,7 @@ _PATHS = {
              '<line x1="7" y1="15" x2="17" y2="15"/>',  # = beaker
     "sparkle": '<path d="M12 3l1.8 4.8L18.5 9.5 13.8 11.2 12 16l-1.8-4.8L5.5 9.5l4.7-1.7z"/>'
                '<path d="M19 15l.7 1.9L21.5 17.5l-1.8.7L19 20l-.7-1.8L16.5 17.5l1.8-.6z"/>',  # = sparkles
-    "settings": '<circle cx="12" cy="12" r="3"/>'
-                '<path d="M12 1v4M12 19v4M4.2 4.2l2.8 2.8M17 17l2.8 2.8M1 12h4M19 12h4M4.2 19.8L7 17M17 7l2.8-2.8"/>',  # = gear
+    "settings": '<path d="M12.22 2h-.44a2 2 0 0 0-2 2v.18a2 2 0 0 1-1 1.73l-.43.25a2 2 0 0 1-2 0L6.2 6.08a2 2 0 0 0-2.73.73l-.22.38a2 2 0 0 0 .73 2.73l.15.09a2 2 0 0 1 1 1.74v.5a2 2 0 0 1-1 1.74l-.15.09a2 2 0 0 0-.73 2.73l.22.38a2 2 0 0 0 2.73.73l.15-.08a2 2 0 0 1 2 0l.43.25a2 2 0 0 1 1 1.73V20a2 2 0 0 0 2 2h.44a2 2 0 0 0 2-2v-.18a2 2 0 0 1 1-1.73l.43-.25a2 2 0 0 1 2 0l.15.08a2 2 0 0 0 2.73-.73l.22-.38a2 2 0 0 0-.73-2.73l-.15-.09a2 2 0 0 1-1-1.74v-.5a2 2 0 0 1 1-1.74l.15-.09a2 2 0 0 0 .73-2.73l-.22-.38a2 2 0 0 0-2.73-.73l-.15.08a2 2 0 0 1-2 0l-.43-.25a2 2 0 0 1-1-1.73V4a2 2 0 0 0-2-2z"/><circle cx="12" cy="12" r="3"/>',  # = gear
 }