diff --git a/data/Indicator.css b/data/Indicator.css
index 4ca5a81..17d3184 100644
--- a/data/Indicator.css
+++ b/data/Indicator.css
@@ -9,7 +9,7 @@ quicksettings .togglebox {
 }
 
 quicksettings scalebox scale {
-    margin: 0.666rem 0.666rem 0; /* 6px */
+    margin: 0 0.333rem 0 0.666rem; /* 0 3px 0 6px */
 }
 
 quicksettings separator.horizontal {
diff --git a/data/icons/text-large.svg b/data/icons/text-large.svg
new file mode 100644
index 0000000..4846240
--- /dev/null
+++ b/data/icons/text-large.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg228"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs232" /><path
+     id="text1"
+     style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:13.782px;font-family:Inter;-inkscape-font-specification:'Inter Ultra-Bold';opacity:1;vector-effect:none;fill:#555761;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none"
+     d="M 8.8550489,3.0080826 5.5105441,13.035025 h 2.6393734 l 0.6088921,-2.005389 h 3.4139564 l 0.646213,2.005389 h 2.664695 L 12.039828,3.0080826 Z m 1.5680411,1.891802 c 0.323015,1.345897 0.653223,2.6102156 1.003157,3.7542281 l 0.119479,0.3701352 H 9.3878602 L 9.4959005,8.6541127 C 9.8256453,7.5168297 10.120263,6.2525111 10.42309,4.8998846 Z"
+     transform="scale(1.0026942,0.99731303)" /><path
+     id="text1-7"
+     style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:11.0256px;font-family:Inter;-inkscape-font-specification:'Inter Ultra-Bold';opacity:0.5;vector-effect:none;fill:#555761;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none"
+     d="M 3.1594565 5.013471 L 0.48502138 13.035025 L 2.5945722 13.035025 L 3.2256844 11.029636 L 5.1287602 11.029636 L 6.43189 7.122654 L 5.7072797 5.013471 L 3.1594565 5.013471 z M 4.4138893 6.5253459 C 4.6723014 7.6020625 4.9364684 8.6143027 5.2164147 9.5295118 L 5.3722448 10.026942 L 3.5256574 10.026942 L 3.6717482 9.5295118 C 3.9355437 8.6196862 4.1716281 7.6074461 4.4138893 6.5253459 z "
+     transform="scale(1.0026942,0.99731303)" /></svg>
diff --git a/data/icons/text-small.svg b/data/icons/text-small.svg
new file mode 100644
index 0000000..7f986c5
--- /dev/null
+++ b/data/icons/text-small.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg228"
+   xml:space="preserve"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs232"><linearGradient
+       gradientTransform="matrix(0.73913043,0,0,0.73913043,0.80112621,0.26087012)"
+       gradientUnits="userSpaceOnUse"
+       y2="44.5"
+       x2="44"
+       y1="0"
+       x1="44"
+       id="linearGradient1071"
+       xlink:href="#linearGradient1069" /><linearGradient
+       id="linearGradient1069"><stop
+         id="stop1065"
+         offset="0"
+         style="stop-color:#ed5353;stop-opacity:1" /><stop
+         id="stop1067"
+         offset="1"
+         style="stop-color:#c6262e;stop-opacity:1" /></linearGradient><linearGradient
+       gradientTransform="matrix(0.73913045,0,0,0.74477236,34.279982,4.8839498)"
+       gradientUnits="userSpaceOnUse"
+       y2="37.724575"
+       x2="-17.375"
+       y1="-6.125"
+       x1="-17.375"
+       id="linearGradient1063"
+       xlink:href="#linearGradient1061" /><linearGradient
+       id="linearGradient1061"><stop
+         id="stop1057"
+         offset="0"
+         style="stop-color:#4d4d4d;stop-opacity:1" /><stop
+         id="stop1059"
+         offset="1"
+         style="stop-color:#333333;stop-opacity:1" /></linearGradient></defs><path
+     id="text1"
+     style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:13.782px;font-family:Inter;-inkscape-font-specification:'Inter Ultra-Bold';opacity:0.5;vector-effect:none;fill:#555761;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none"
+     d="M 8.855049 3.0080826 L 7.4856914 7.1148204 L 8.7557072 10.812255 C 8.7720913 10.885184 8.7918817 10.957172 8.8141436 11.029636 L 12.172284 11.029636 L 12.818979 13.035025 L 15.483675 13.035025 L 12.039828 3.0080826 L 8.855049 3.0080826 z M 10.42309 4.8998846 C 10.746105 6.2457802 11.076313 7.5101014 11.426247 8.6541127 L 11.545067 9.0242479 L 9.3887673 9.0242479 L 9.4959005 8.6541127 C 9.825645 7.5168309 10.120263 6.2525097 10.42309 4.8998846 z "
+     transform="scale(1.0026942,0.99731303)" /><path
+     id="text1-7"
+     style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:11.0256px;font-family:Inter;-inkscape-font-specification:'Inter Ultra-Bold';opacity:1;vector-effect:none;fill:#555761;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none"
+     d="M 3.1594565,5.013471 0.48502138,13.035025 H 2.5945722 l 0.6314206,-2.005389 h 2.4129199 l 0.6916876,2.005389 H 8.4635257 L 5.7072797,5.013471 Z m 1.2544328,1.5118749 c 0.2584123,1.0767177 0.5225788,2.0889558 0.8025254,3.0041658 l 0.155526,0.4974303 H 3.525228 L 3.6717482,9.5295117 C 3.935544,8.6196852 4.1716278,7.6074472 4.4138893,6.5253459 Z"
+     transform="scale(1.0026942,0.99731303)" /></svg>
diff --git a/data/quick-settings.gresource.xml b/data/quick-settings.gresource.xml
index 8ed165f..9cbf059 100644
--- a/data/quick-settings.gresource.xml
+++ b/data/quick-settings.gresource.xml
@@ -8,6 +8,8 @@
   <gresource prefix="org/elementary/wingpanel/icons">
     <file alias="scalable/status/dark-mode-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/dark-mode.svg</file>
     <file alias="scalable/status/system-suspend-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/system-suspend.svg</file>
+    <file alias="scalable/status/quick-settings-text-large-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/text-large.svg</file>
+    <file alias="scalable/status/quick-settings-text-small-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/text-small.svg</file>
     <file alias="scalable/status/quick-settings-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/quick-settings.svg</file>
     <file alias="scalable/status/quick-settings-rotation-allowed-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/rotation-allowed.svg</file>
     <file alias="scalable/status/quick-settings-rotation-locked-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/rotation-locked.svg</file>
diff --git a/src/Widgets/TextScale.vala b/src/Widgets/TextScale.vala
index cffcd2a..7ff9e98 100644
--- a/src/Widgets/TextScale.vala
+++ b/src/Widgets/TextScale.vala
@@ -4,8 +4,7 @@
  */
 
 public class QuickSettings.TextScale : Gtk.Box {
-    private Gtk.Button zoom_in_button;
-    private Gtk.Button zoom_out_button;
+    private Gtk.Button zoom_button;
     private Settings interface_settings;
 
     class construct {
@@ -13,10 +12,8 @@ public class QuickSettings.TextScale : Gtk.Box {
     }
 
     construct {
-        zoom_out_button = new Gtk.Button.from_icon_name ("format-text-smaller-symbolic") {
-            tooltip_text = _("Decrease text size")
-        };
-        zoom_out_button.get_style_context ().add_class ("circular");
+        zoom_button = new Gtk.Button.from_icon_name ("quick-settings-text-small-symbolic");
+        zoom_button.get_style_context ().add_class ("toggle");
 
         var zoom_adjustment = new Gtk.Adjustment (-1, 0.75, 1.75, 0.05, 0, 0);
 
@@ -24,36 +21,32 @@ public class QuickSettings.TextScale : Gtk.Box {
             draw_value = false,
             hexpand = true
         };
-        zoom_scale.add_mark (1, BOTTOM, null);
-        zoom_scale.add_mark (1.5, BOTTOM, null);
-
-        zoom_in_button = new Gtk.Button.from_icon_name ("format-text-larger-symbolic") {
-            tooltip_text = _("Increase text size")
-        };
-        zoom_in_button.get_style_context ().add_class ("circular");
 
-        get_style_context ().add_class ("font-size");
-        add (zoom_out_button);
+        add (zoom_button);
         add (zoom_scale);
-        add (zoom_in_button);
 
         interface_settings = new Settings ("org.gnome.desktop.interface");
         interface_settings.bind ("text-scaling-factor", zoom_adjustment, "value", DEFAULT);
         interface_settings.changed["text-scaling-factor"].connect (update_zoom_buttons);
         update_zoom_buttons ();
 
-        zoom_in_button.clicked.connect (() => {
-            zoom_adjustment.value += 0.05;
-        });
-
-        zoom_out_button.clicked.connect (() => {
-            zoom_adjustment.value += -0.05;
+        zoom_button.clicked.connect (() => {
+            if (zoom_adjustment.value > 1) {
+                zoom_adjustment.value = 1;
+            } else {
+                zoom_adjustment.value = 1.25;
+            }
         });
     }
 
     private void update_zoom_buttons () {
         var scaling_factor = interface_settings.get_double ("text-scaling-factor");
-        zoom_in_button.sensitive = scaling_factor < 1.75;
-        zoom_out_button.sensitive = scaling_factor > 0.75;
+        if (scaling_factor > 1) {
+            ((Gtk.Image) zoom_button.image).icon_name = "quick-settings-text-large-symbolic";
+            zoom_button.tooltip_text = _("Decrease text size");
+        } else {
+            ((Gtk.Image) zoom_button.image).icon_name = "quick-settings-text-small-symbolic";
+            zoom_button.tooltip_text = _("Increase text size");
+        }
     }
 }