diff --git a/ZorinBlue-Dark/gnome-shell/gnome-shell-theme.gresource b/ZorinBlue-Dark/gnome-shell/gnome-shell-theme.gresource
index 7fd8c7c3..5f7a16a2 100644
Binary files a/ZorinBlue-Dark/gnome-shell/gnome-shell-theme.gresource and b/ZorinBlue-Dark/gnome-shell/gnome-shell-theme.gresource differ
diff --git a/ZorinBlue-Dark/gnome-shell/gnome-shell.css b/ZorinBlue-Dark/gnome-shell/gnome-shell.css
index 3be74c40..62358ffc 100644
--- a/ZorinBlue-Dark/gnome-shell/gnome-shell.css
+++ b/ZorinBlue-Dark/gnome-shell/gnome-shell.css
@@ -111,7 +111,7 @@ stage { font-size: 10pt; color: #bde6fb; }
 
 .calendar .calendar-day-base.calendar-day-heading, .calendar .calendar-day-base { font-weight: 400; font-size: 8pt; }
 
-.unlock-dialog-clock-time, #panel, .weather-button .weather-forecast-time, .world-clocks-button .world-clocks-timezone, .world-clocks-button .world-clocks-time, .events-button .event-time, .calendar .calendar-day-base { font-feature-settings: "tnum"; }
+.world-clocks-button .world-clocks-timezone, .events-button .event-time { font-feature-settings: "tnum"; }
 
 /* WIDGETS */
 .shell-link { color: #edf8fe; }
diff --git a/ZorinBlue-Light/gnome-shell/gnome-shell-theme.gresource b/ZorinBlue-Light/gnome-shell/gnome-shell-theme.gresource
index 97101711..b87d74d8 100644
Binary files a/ZorinBlue-Light/gnome-shell/gnome-shell-theme.gresource and b/ZorinBlue-Light/gnome-shell/gnome-shell-theme.gresource differ
diff --git a/ZorinBlue-Light/gnome-shell/gnome-shell.css b/ZorinBlue-Light/gnome-shell/gnome-shell.css
index 125d84db..86c6ec11 100644
--- a/ZorinBlue-Light/gnome-shell/gnome-shell.css
+++ b/ZorinBlue-Light/gnome-shell/gnome-shell.css
@@ -111,7 +111,7 @@ stage { font-size: 10pt; color: #123354; }
 
 .calendar .calendar-day-base.calendar-day-heading, .calendar .calendar-day-base { font-weight: 400; font-size: 8pt; }
 
-.unlock-dialog-clock-time, #panel, .weather-button .weather-forecast-time, .world-clocks-button .world-clocks-timezone, .world-clocks-button .world-clocks-time, .events-button .event-time, .calendar .calendar-day-base { font-feature-settings: "tnum"; }
+.world-clocks-button .world-clocks-timezone, .events-button .event-time { font-feature-settings: "tnum"; }
 
 /* WIDGETS */
 .shell-link { color: #0d87c5; }
diff --git a/ZorinGreen-Dark/gnome-shell/gnome-shell-theme.gresource b/ZorinGreen-Dark/gnome-shell/gnome-shell-theme.gresource
index 7693c26e..0d0061c9 100644
Binary files a/ZorinGreen-Dark/gnome-shell/gnome-shell-theme.gresource and b/ZorinGreen-Dark/gnome-shell/gnome-shell-theme.gresource differ
diff --git a/ZorinGreen-Dark/gnome-shell/gnome-shell.css b/ZorinGreen-Dark/gnome-shell/gnome-shell.css
index 6a5fba21..6bb61663 100644
--- a/ZorinGreen-Dark/gnome-shell/gnome-shell.css
+++ b/ZorinGreen-Dark/gnome-shell/gnome-shell.css
@@ -111,7 +111,7 @@ stage { font-size: 10pt; color: #bbf1dd; }
 
 .calendar .calendar-day-base.calendar-day-heading, .calendar .calendar-day-base { font-weight: 400; font-size: 8pt; }
 
-.unlock-dialog-clock-time, #panel, .weather-button .weather-forecast-time, .world-clocks-button .world-clocks-timezone, .world-clocks-button .world-clocks-time, .events-button .event-time, .calendar .calendar-day-base { font-feature-settings: "tnum"; }
+.world-clocks-button .world-clocks-timezone, .events-button .event-time { font-feature-settings: "tnum"; }
 
 /* WIDGETS */
 .shell-link { color: #e6faf2; }
diff --git a/ZorinGreen-Light/gnome-shell/gnome-shell-theme.gresource b/ZorinGreen-Light/gnome-shell/gnome-shell-theme.gresource
index bf1b6bee..402b13b2 100644
Binary files a/ZorinGreen-Light/gnome-shell/gnome-shell-theme.gresource and b/ZorinGreen-Light/gnome-shell/gnome-shell-theme.gresource differ
diff --git a/ZorinGreen-Light/gnome-shell/gnome-shell.css b/ZorinGreen-Light/gnome-shell/gnome-shell.css
index 27e0dd00..fbbdad95 100644
--- a/ZorinGreen-Light/gnome-shell/gnome-shell.css
+++ b/ZorinGreen-Light/gnome-shell/gnome-shell.css
@@ -111,7 +111,7 @@ stage { font-size: 10pt; color: #19483e; }
 
 .calendar .calendar-day-base.calendar-day-heading, .calendar .calendar-day-base { font-weight: 400; font-size: 8pt; }
 
-.unlock-dialog-clock-time, #panel, .weather-button .weather-forecast-time, .world-clocks-button .world-clocks-timezone, .world-clocks-button .world-clocks-time, .events-button .event-time, .calendar .calendar-day-base { font-feature-settings: "tnum"; }
+.world-clocks-button .world-clocks-timezone, .events-button .event-time { font-feature-settings: "tnum"; }
 
 /* WIDGETS */
 .shell-link { color: #219e6f; }
diff --git a/ZorinGrey-Dark/gnome-shell/gnome-shell-theme.gresource b/ZorinGrey-Dark/gnome-shell/gnome-shell-theme.gresource
index 055289a9..617fbc58 100644
Binary files a/ZorinGrey-Dark/gnome-shell/gnome-shell-theme.gresource and b/ZorinGrey-Dark/gnome-shell/gnome-shell-theme.gresource differ
diff --git a/ZorinGrey-Dark/gnome-shell/gnome-shell.css b/ZorinGrey-Dark/gnome-shell/gnome-shell.css
index a6faefcc..c90e619c 100644
--- a/ZorinGrey-Dark/gnome-shell/gnome-shell.css
+++ b/ZorinGrey-Dark/gnome-shell/gnome-shell.css
@@ -111,7 +111,7 @@ stage { font-size: 10pt; color: #ffffff; }
 
 .calendar .calendar-day-base.calendar-day-heading, .calendar .calendar-day-base { font-weight: 400; font-size: 8pt; }
 
-.unlock-dialog-clock-time, #panel, .weather-button .weather-forecast-time, .world-clocks-button .world-clocks-timezone, .world-clocks-button .world-clocks-time, .events-button .event-time, .calendar .calendar-day-base { font-feature-settings: "tnum"; }
+.world-clocks-button .world-clocks-timezone, .events-button .event-time { font-feature-settings: "tnum"; }
 
 /* WIDGETS */
 .shell-link { color: white; }
diff --git a/ZorinGrey-Light/gnome-shell/gnome-shell-theme.gresource b/ZorinGrey-Light/gnome-shell/gnome-shell-theme.gresource
index 503e991f..e83473c7 100644
Binary files a/ZorinGrey-Light/gnome-shell/gnome-shell-theme.gresource and b/ZorinGrey-Light/gnome-shell/gnome-shell-theme.gresource differ
diff --git a/ZorinGrey-Light/gnome-shell/gnome-shell.css b/ZorinGrey-Light/gnome-shell/gnome-shell.css
index 51e24c90..82b18f5a 100644
--- a/ZorinGrey-Light/gnome-shell/gnome-shell.css
+++ b/ZorinGrey-Light/gnome-shell/gnome-shell.css
@@ -111,7 +111,7 @@ stage { font-size: 10pt; color: #29292a; }
 
 .calendar .calendar-day-base.calendar-day-heading, .calendar .calendar-day-base { font-weight: 400; font-size: 8pt; }
 
-.unlock-dialog-clock-time, #panel, .weather-button .weather-forecast-time, .world-clocks-button .world-clocks-timezone, .world-clocks-button .world-clocks-time, .events-button .event-time, .calendar .calendar-day-base { font-feature-settings: "tnum"; }
+.world-clocks-button .world-clocks-timezone, .events-button .event-time { font-feature-settings: "tnum"; }
 
 /* WIDGETS */
 .shell-link { color: #47494a; }
diff --git a/ZorinOrange-Dark/gnome-shell/gnome-shell-theme.gresource b/ZorinOrange-Dark/gnome-shell/gnome-shell-theme.gresource
index 616ddc86..3ef8af1e 100644
Binary files a/ZorinOrange-Dark/gnome-shell/gnome-shell-theme.gresource and b/ZorinOrange-Dark/gnome-shell/gnome-shell-theme.gresource differ
diff --git a/ZorinOrange-Dark/gnome-shell/gnome-shell.css b/ZorinOrange-Dark/gnome-shell/gnome-shell.css
index c79511ab..9551b309 100644
--- a/ZorinOrange-Dark/gnome-shell/gnome-shell.css
+++ b/ZorinOrange-Dark/gnome-shell/gnome-shell.css
@@ -111,7 +111,7 @@ stage { font-size: 10pt; color: #fcc8b4; }
 
 .calendar .calendar-day-base.calendar-day-heading, .calendar .calendar-day-base { font-weight: 400; font-size: 8pt; }
 
-.unlock-dialog-clock-time, #panel, .weather-button .weather-forecast-time, .world-clocks-button .world-clocks-timezone, .world-clocks-button .world-clocks-time, .events-button .event-time, .calendar .calendar-day-base { font-feature-settings: "tnum"; }
+.world-clocks-button .world-clocks-timezone, .events-button .event-time { font-feature-settings: "tnum"; }
 
 /* WIDGETS */
 .shell-link { color: #feece5; }
diff --git a/ZorinOrange-Light/gnome-shell/gnome-shell-theme.gresource b/ZorinOrange-Light/gnome-shell/gnome-shell-theme.gresource
index ed5d7758..56c28278 100644
Binary files a/ZorinOrange-Light/gnome-shell/gnome-shell-theme.gresource and b/ZorinOrange-Light/gnome-shell/gnome-shell-theme.gresource differ
diff --git a/ZorinOrange-Light/gnome-shell/gnome-shell.css b/ZorinOrange-Light/gnome-shell/gnome-shell.css
index d89f8801..0c704a8c 100644
--- a/ZorinOrange-Light/gnome-shell/gnome-shell.css
+++ b/ZorinOrange-Light/gnome-shell/gnome-shell.css
@@ -111,7 +111,7 @@ stage { font-size: 10pt; color: #563b25; }
 
 .calendar .calendar-day-base.calendar-day-heading, .calendar .calendar-day-base { font-weight: 400; font-size: 8pt; }
 
-.unlock-dialog-clock-time, #panel, .weather-button .weather-forecast-time, .world-clocks-button .world-clocks-timezone, .world-clocks-button .world-clocks-time, .events-button .event-time, .calendar .calendar-day-base { font-feature-settings: "tnum"; }
+.world-clocks-button .world-clocks-timezone, .events-button .event-time { font-feature-settings: "tnum"; }
 
 /* WIDGETS */
 .shell-link { color: #f65c21; }
diff --git a/ZorinPurple-Dark/gnome-shell/gnome-shell-theme.gresource b/ZorinPurple-Dark/gnome-shell/gnome-shell-theme.gresource
index 343422ae..a7b24c6f 100644
Binary files a/ZorinPurple-Dark/gnome-shell/gnome-shell-theme.gresource and b/ZorinPurple-Dark/gnome-shell/gnome-shell-theme.gresource differ
diff --git a/ZorinPurple-Dark/gnome-shell/gnome-shell.css b/ZorinPurple-Dark/gnome-shell/gnome-shell.css
index a89f9648..73319051 100644
--- a/ZorinPurple-Dark/gnome-shell/gnome-shell.css
+++ b/ZorinPurple-Dark/gnome-shell/gnome-shell.css
@@ -111,7 +111,7 @@ stage { font-size: 10pt; color: #d8c4f1; }
 
 .calendar .calendar-day-base.calendar-day-heading, .calendar .calendar-day-base { font-weight: 400; font-size: 8pt; }
 
-.unlock-dialog-clock-time, #panel, .weather-button .weather-forecast-time, .world-clocks-button .world-clocks-timezone, .world-clocks-button .world-clocks-time, .events-button .event-time, .calendar .calendar-day-base { font-feature-settings: "tnum"; }
+.world-clocks-button .world-clocks-timezone, .events-button .event-time { font-feature-settings: "tnum"; }
 
 /* WIDGETS */
 .shell-link { color: #f3edfb; }
diff --git a/ZorinPurple-Light/gnome-shell/gnome-shell-theme.gresource b/ZorinPurple-Light/gnome-shell/gnome-shell-theme.gresource
index 7dd18358..9b286f8f 100644
Binary files a/ZorinPurple-Light/gnome-shell/gnome-shell-theme.gresource and b/ZorinPurple-Light/gnome-shell/gnome-shell-theme.gresource differ
diff --git a/ZorinPurple-Light/gnome-shell/gnome-shell.css b/ZorinPurple-Light/gnome-shell/gnome-shell.css
index 2c3cada4..c685f272 100644
--- a/ZorinPurple-Light/gnome-shell/gnome-shell.css
+++ b/ZorinPurple-Light/gnome-shell/gnome-shell.css
@@ -111,7 +111,7 @@ stage { font-size: 10pt; color: #402b4d; }
 
 .calendar .calendar-day-base.calendar-day-heading, .calendar .calendar-day-base { font-weight: 400; font-size: 8pt; }
 
-.unlock-dialog-clock-time, #panel, .weather-button .weather-forecast-time, .world-clocks-button .world-clocks-timezone, .world-clocks-button .world-clocks-time, .events-button .event-time, .calendar .calendar-day-base { font-feature-settings: "tnum"; }
+.world-clocks-button .world-clocks-timezone, .events-button .event-time { font-feature-settings: "tnum"; }
 
 /* WIDGETS */
 .shell-link { color: #813fd0; }
diff --git a/ZorinRed-Dark/gnome-shell/gnome-shell-theme.gresource b/ZorinRed-Dark/gnome-shell/gnome-shell-theme.gresource
index 7dc36747..67888b07 100644
Binary files a/ZorinRed-Dark/gnome-shell/gnome-shell-theme.gresource and b/ZorinRed-Dark/gnome-shell/gnome-shell-theme.gresource differ
diff --git a/ZorinRed-Dark/gnome-shell/gnome-shell.css b/ZorinRed-Dark/gnome-shell/gnome-shell.css
index 912fefd3..047650b9 100644
--- a/ZorinRed-Dark/gnome-shell/gnome-shell.css
+++ b/ZorinRed-Dark/gnome-shell/gnome-shell.css
@@ -111,7 +111,7 @@ stage { font-size: 10pt; color: #fdb4b4; }
 
 .calendar .calendar-day-base.calendar-day-heading, .calendar .calendar-day-base { font-weight: 400; font-size: 8pt; }
 
-.unlock-dialog-clock-time, #panel, .weather-button .weather-forecast-time, .world-clocks-button .world-clocks-timezone, .world-clocks-button .world-clocks-time, .events-button .event-time, .calendar .calendar-day-base { font-feature-settings: "tnum"; }
+.world-clocks-button .world-clocks-timezone, .events-button .event-time { font-feature-settings: "tnum"; }
 
 /* WIDGETS */
 .shell-link { color: #fee5e5; }
diff --git a/ZorinRed-Light/gnome-shell/gnome-shell-theme.gresource b/ZorinRed-Light/gnome-shell/gnome-shell-theme.gresource
index 8a415068..8051540b 100644
Binary files a/ZorinRed-Light/gnome-shell/gnome-shell-theme.gresource and b/ZorinRed-Light/gnome-shell/gnome-shell-theme.gresource differ
diff --git a/ZorinRed-Light/gnome-shell/gnome-shell.css b/ZorinRed-Light/gnome-shell/gnome-shell.css
index ba32b394..ad7cd948 100644
--- a/ZorinRed-Light/gnome-shell/gnome-shell.css
+++ b/ZorinRed-Light/gnome-shell/gnome-shell.css
@@ -111,7 +111,7 @@ stage { font-size: 10pt; color: #572920; }
 
 .calendar .calendar-day-base.calendar-day-heading, .calendar .calendar-day-base { font-weight: 400; font-size: 8pt; }
 
-.unlock-dialog-clock-time, #panel, .weather-button .weather-forecast-time, .world-clocks-button .world-clocks-timezone, .world-clocks-button .world-clocks-time, .events-button .event-time, .calendar .calendar-day-base { font-feature-settings: "tnum"; }
+.world-clocks-button .world-clocks-timezone, .events-button .event-time { font-feature-settings: "tnum"; }
 
 /* WIDGETS */
 .shell-link { color: #f91212; }
diff --git a/debian/changelog b/debian/changelog
index b97747fb..60350c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+zorin-desktop-themes (4.0.9) jammy; urgency=medium
+
+  * Switched away from using tabular numbers in some places in the GNOME
+    Shell themes
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Tue, 21 Nov 2023 00:09:53 +0000
+
 zorin-desktop-themes (4.0.8) jammy; urgency=medium
 
   * Fixed regression from previous version