diff --git a/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/chrome.css b/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/chrome.css
index 7916182ed..7458c7109 100644
--- a/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/chrome.css
+++ b/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/chrome.css
@@ -3,10 +3,14 @@
 }
 tabs {
   counter-reset: tab-counter;
-} /* Automatically increment tab numbers for each tab which is essential or is in an active workspace */
-hbox.zen-essentials-container tab:not([zen-glance-tab="true"]),
+} /* Automatically increment tab numbers for each tab which is essential (in the active container) or is in an active workspace */
+hbox.zen-essentials-container:not([hidden="true"]) tab:not([zen-glance-tab="true"]),
 zen-workspace[active] tab:not([zen-glance-tab="true"]) {
   counter-increment: tab-counter;
+}
+/* Stop counting tabs inside collapsed folders, except the folder's active tab */
+zen-folder:has(.tab-group-label[aria-expanded="false"]) tab:not([folder-active="true"]) {
+  counter-increment: none;
 } /* Styles when the sidebar is expanded */
 @media (-moz-bool-pref: "zen.view.sidebar-expanded") {
   tab:not([zen-glance-tab="true"]) > .tab-stack > .tab-content::after {
@@ -51,6 +55,15 @@ zen-workspace[active] tab:not([zen-glance-tab="true"]) {
     margin: 0;
   }
 
+  /* Hide the second icon when tab is pinned */
+  [zen-pinned-changed='true']:not([zen-essential]) .tab-reset-pin-button image {
+    opacity: 1 !important;
+  }
+  
+  [zen-pinned-changed='true']:not([zen-essential]) .tab-icon-image {
+    opacity: 0 !important;
+  }
+
   /* Show the "X" close button on hover */
   tab:hover .tab-close-button {
     visibility: visible;
diff --git a/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/preferences.json b/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/preferences.json
index 90bbe3fcc..9c3df0065 100644
--- a/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/preferences.json
+++ b/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/preferences.json
@@ -1,120 +1,116 @@
 [
-    {
-        "property": "uc.theme.bold-text-enable.enabled",
-        "label": "Make numbers Bold",
-        "type": "checkbox",
-        "disabledOn": []
-    },
-    {
-        "property": "uc.theme.font_size",
-        "label": "Select the Size for tab numbers",
-        "type": "dropdown",
-        "defaultValue": "Medium",
-        "options": [
-            {
-                "label": "Extra Small",
-                "value": "XSmall"
-            },
-            {
-                "label": "Small",
-                "value": "Small"
-            },
-            {
-                "label": "Medium (default)",
-                "value": "Medium"
-            },
-            {
-                "label": "Large",
-                "value": "Large"
-            },
-            {
-                "label": "Extra Large",
-                "value": "XLarge"
-            }
-        ]
-    },
-    {
-        "property": "uc.theme.background_shape",
-        "label": "Select the Shape for the tab number background",
-        "type": "dropdown",
-        "defaultValue": "ModeratelyRounded",
-        "options": [
-            {
-                "label": "Square",
-                "value": "Square"
-            },
-            {
-                "label": "Slightly Rounded Square",
-                "value": "SlightlyRounded"
-            },
-            {
-                "label": "Moderately Rounded Square (default)",
-                "value": "ModeratelyRounded"
-            },
-            {
-                "label": "Fully Rounded Square",
-                "value": "FullyRounded"
-            },
-            {
-                "label": "Perfect Circle",
-                "value": "Circle"
-            }
-        ]
-    },
-    {
-        "property": "uc.theme.custom_color_enabled",
-        "label": "(!) Press to enable custom colors (!)",
-        "type": "checkbox",
-        "disabledOn": []
-    },
-    {
-        "property": "uc.theme.number_color",
-        "label": "Hex Code of Custom Text Color (first enable the above checkbox)",
-        "placeholder": "eg. #ff0000",
-        "type": "string",
-        "disabledOn": [
-            "!uc.theme.custom_color_enabled"
-        ]
-    },
-    {
-        "property": "uc.theme.number_background_color",
-        "label": "Hex Code of Custom Background Color (first enable the above checkbox)",
-        "placeholder": "eg. #ff0000",
-        "type": "string",
-        "disabledOn": [
-            "!uc.theme.custom_color_enabled"
-        ]
-    },
-    {
-        "property": "uc.theme.compact_side",
-        "label": "Side of the tab numbers when tabs are Compact",
-        "type": "dropdown",
-        "defaultValue": "Right",
-        "options": [
-            {
-                "label": "Right (default)",
-                "value": "Right"
-            },
-            {
-                "label": "Left",
-                "value": "Left"
-            }
-        ]
-    },
-    {
-        "property": "uc.theme.expanded_side",
-        "label": "Side of the tab numbers when tabs are Expanded",
-        "type": "dropdown",
-        "defaultValue": "Right",
-        "options": [
-            {
-                "label": "Right (default)",
-                "value": "Right"
-            },
-            {
-                "label": "Left",
-                "value": "Left"
-            }
-        ]
-    }
-]
\ No newline at end of file
+  {
+    "property": "uc.theme.bold-text-enable.enabled",
+    "label": "Make numbers Bold",
+    "type": "checkbox",
+    "disabledOn": []
+  },
+  {
+    "property": "uc.theme.font_size",
+    "label": "Select the Size for tab numbers",
+    "type": "dropdown",
+    "defaultValue": "Medium",
+    "options": [
+      {
+        "label": "Extra Small",
+        "value": "XSmall"
+      },
+      {
+        "label": "Small",
+        "value": "Small"
+      },
+      {
+        "label": "Medium (default)",
+        "value": "Medium"
+      },
+      {
+        "label": "Large",
+        "value": "Large"
+      },
+      {
+        "label": "Extra Large",
+        "value": "XLarge"
+      }
+    ]
+  },
+  {
+    "property": "uc.theme.background_shape",
+    "label": "Select the Shape for the tab number background",
+    "type": "dropdown",
+    "defaultValue": "ModeratelyRounded",
+    "options": [
+      {
+        "label": "Square",
+        "value": "Square"
+      },
+      {
+        "label": "Slightly Rounded Square",
+        "value": "SlightlyRounded"
+      },
+      {
+        "label": "Moderately Rounded Square (default)",
+        "value": "ModeratelyRounded"
+      },
+      {
+        "label": "Fully Rounded Square",
+        "value": "FullyRounded"
+      },
+      {
+        "label": "Perfect Circle",
+        "value": "Circle"
+      }
+    ]
+  },
+  {
+    "property": "uc.theme.custom_color_enabled",
+    "label": "(!) Press to enable custom colors (!)",
+    "type": "checkbox",
+    "disabledOn": []
+  },
+  {
+    "property": "uc.theme.number_color",
+    "label": "Hex Code of Custom Text Color (first enable the above checkbox)",
+    "placeholder": "eg. #ff0000",
+    "type": "string",
+    "disabledOn": ["!uc.theme.custom_color_enabled"]
+  },
+  {
+    "property": "uc.theme.number_background_color",
+    "label": "Hex Code of Custom Background Color (first enable the above checkbox)",
+    "placeholder": "eg. #ff0000",
+    "type": "string",
+    "disabledOn": ["!uc.theme.custom_color_enabled"]
+  },
+  {
+    "property": "uc.theme.compact_side",
+    "label": "Side of the tab numbers when tabs are Compact",
+    "type": "dropdown",
+    "defaultValue": "Right",
+    "options": [
+      {
+        "label": "Right (default)",
+        "value": "Right"
+      },
+      {
+        "label": "Left",
+        "value": "Left"
+      }
+    ]
+  },
+  {
+    "property": "uc.theme.expanded_side",
+    "label": "Side of the tab numbers when tabs are Expanded",
+    "type": "dropdown",
+    "defaultValue": "Right",
+    "options": [
+      {
+        "label": "Right (default)",
+        "value": "Right"
+      },
+      {
+        "label": "Left",
+        "value": "Left"
+      }
+    ]
+  }
+]
diff --git a/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/theme.json b/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/theme.json
index 0c22be02a..afae048bf 100644
--- a/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/theme.json
+++ b/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/theme.json
@@ -1,17 +1,17 @@
 {
-    "id": "22c9ec3b-7c62-46ae-991f-c8fff5046829",
-    "name": "Tab Numbers",
-    "description": "Shows the Number corresponding to each Tab.",
-    "homepage": "https://github.com/philmard/tab-numbers",
-    "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/chrome.css",
-    "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/readme.md",
-    "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/image.png",
-    "author": "philmard",
-    "version": "1.0.8",
-    "preferences": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/preferences.json",
-    "tags": [
-        "tabs"
-    ],
-    "createdAt": "2024-11-09",
-    "updatedAt": "2025-07-15"
-}
\ No newline at end of file
+  "id": "22c9ec3b-7c62-46ae-991f-c8fff5046829",
+  "name": "Tab Numbers",
+  "description": "Shows the Number corresponding to each Tab.",
+  "homepage": "https://github.com/philmard/tab-numbers",
+  "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/chrome.css",
+  "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/readme.md",
+  "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/image.png",
+  "author": "philmard",
+  "version": "1.0.9",
+  "preferences": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/22c9ec3b-7c62-46ae-991f-c8fff5046829/preferences.json",
+  "tags": [
+    "tabs"
+  ],
+  "createdAt": "2024-11-09",
+  "updatedAt": "2024-12-07"
+}