diff --git a/app/src/main/java/sh/sar/basedbank/ui/home/PayWithCardFragment.kt b/app/src/main/java/sh/sar/basedbank/ui/home/PayWithCardFragment.kt
index 78af00e..f8c12df 100644
--- a/app/src/main/java/sh/sar/basedbank/ui/home/PayWithCardFragment.kt
+++ b/app/src/main/java/sh/sar/basedbank/ui/home/PayWithCardFragment.kt
@@ -161,6 +161,7 @@ ViewCompat.setOnApplyWindowInsetsListener(binding.contentLayout) { v, insets ->
 
     private fun setManageMode(enabled: Boolean) {
         isManageMode = enabled
+        requireActivity().title = getString(if (enabled) R.string.card_manage else R.string.nav_pay_with_card)
         val gone = View.GONE
         val visible = View.VISIBLE
         binding.btnManageCard.visibility = if (enabled) gone else visible
diff --git a/app/src/main/res/drawable/ic_manage_card.xml b/app/src/main/res/drawable/ic_manage_card.xml
index 97c53d5..87e06c6 100644
--- a/app/src/main/res/drawable/ic_manage_card.xml
+++ b/app/src/main/res/drawable/ic_manage_card.xml
@@ -8,11 +8,18 @@
     <path
         android:fillColor="?attr/colorOnSurfaceVariant"
         android:pathData="M20,4H4C2.89,4 2.01,4.89 2.01,6L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V6C22,4.89 21.11,4 20,4zM20,18H4v-6h16V18zM20,8H4V6h16V8z" />
-    <!-- Background circle to separate gear from card -->
+    <!-- Background circle separating gear from card -->
     <path
         android:fillColor="?attr/colorSurface"
         android:pathData="M12.5,18 A5.5,5.5 0 1 0 23.5,18 A5.5,5.5 0 1 0 12.5,18 Z" />
-    <!-- Gear icon scaled 0.5x, centered at (18,18) in the bottom-right corner -->
+    <!--
+        Simple 6-tooth gear, scaled 0.5x and placed at (18,18) in the icon.
+        The gear path is drawn in a 24×24 space (center 12,12); the group
+        transform maps it: point(x,y) → (x·0.5+12, y·0.5+12).
+        Outer radius=10, root radius=7, hub radius=4.
+        Teeth are rectangular (straight-line) so they stay crisp at small scale.
+        Outer ring is clockwise; hub hole is counterclockwise (nonZero cutout).
+    -->
     <group
         android:scaleX="0.5"
         android:scaleY="0.5"
@@ -20,6 +27,13 @@
         android:translateY="12">
         <path
             android:fillColor="?attr/colorOnSurfaceVariant"
-            android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94l-0.36,-2.54c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41l-0.36,2.54c-0.59,0.24 -1.13,0.57 -1.62,0.94l-2.39,-0.96c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87c-0.12,0.21 -0.08,0.47 0.12,0.61l2.03,1.58c-0.05,0.3 -0.09,0.63 -0.09,0.94s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />
+            android:pathData="
+                M18.58,9.61 L21.85,10.26 L21.85,13.74 L18.58,14.39
+                L17.36,16.50 L18.43,19.66 L15.42,21.40 L13.22,18.89
+                L10.78,18.89 L8.58,21.40 L5.57,19.66 L6.64,16.50
+                L5.42,14.39 L2.15,13.74 L2.15,10.26 L5.42,9.61
+                L6.64,7.50 L5.57,4.34 L8.58,2.60 L10.78,5.11
+                L13.22,5.11 L15.42,2.60 L18.43,4.34 L17.36,7.50 Z
+                M12,8 A4,4 0 1 0 12,16 A4,4 0 1 0 12,8 Z" />
     </group>
 </vector>
diff --git a/app/src/main/res/layout/fragment_cards.xml b/app/src/main/res/layout/fragment_cards.xml
index d04ef0f..76e4139 100644
--- a/app/src/main/res/layout/fragment_cards.xml
+++ b/app/src/main/res/layout/fragment_cards.xml
@@ -25,7 +25,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnManageCard"
-                    style="@style/Widget.Material3.Button.TextButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:minWidth="0dp"