diff --git a/src/Widgets/Statusbar/Statusbar.vala b/src/Widgets/Statusbar/Statusbar.vala
index 24f9f0c5..3f762f3f 100644
--- a/src/Widgets/Statusbar/Statusbar.vala
+++ b/src/Widgets/Statusbar/Statusbar.vala
@@ -3,103 +3,87 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-public class Monitor.Statusbar : Gtk.ActionBar {
-    Gtk.Label cpu_usage_label;
-    Gtk.Label memory_usage_label;
-    Gtk.Label swap_usage_label;
-    Gtk.Label gpu_usage_label;
+public class Monitor.Statusbar : Gtk.Bin {
+    private Gtk.Label cpu_usage_label;
+    private Gtk.Label memory_usage_label;
+    private Gtk.Label swap_usage_label;
+    private Gtk.Label gpu_usage_label;
 
     construct {
         var cpu_icon = new Gtk.Image.from_icon_name ("cpu-symbolic", Gtk.IconSize.SMALL_TOOLBAR) {
             tooltip_text = _("CPU")
         };
 
+        cpu_usage_label = new Gtk.Label (_("Calculating…")) {
+            width_chars = 4,
+            xalign = 0
+        };
+
         var ram_icon = new Gtk.Image.from_icon_name ("ram-symbolic", Gtk.IconSize.SMALL_TOOLBAR) {
             tooltip_text = _("Memory")
         };
 
+        memory_usage_label = new Gtk.Label (_("Calculating…")) {
+            margin_start = 6,
+            width_chars = 4,
+            xalign = 0
+        };
+
         var swap_icon = new Gtk.Image.from_icon_name ("swap-symbolic", Gtk.IconSize.SMALL_TOOLBAR) {
             tooltip_text = _("Swap")
         };
 
-        var gpu_icon = new Gtk.Image.from_icon_name ("gpu-symbolic", Gtk.IconSize.SMALL_TOOLBAR) {
-            tooltip_text = _("GPU")
+        swap_usage_label = new Gtk.Label (_("Calculating…")) {
+            margin_start = 6,
+            width_chars = 4,
+            xalign = 0
         };
 
-        cpu_usage_label = new Gtk.Label (_("Calculating…"));
-        cpu_usage_label.set_width_chars (4);
-        cpu_usage_label.xalign = 0;
-        pack_start (cpu_icon);
-        pack_start (cpu_usage_label);
-
-        memory_usage_label = new Gtk.Label (_("Calculating…"));
-        memory_usage_label.set_width_chars (4);
-        memory_usage_label.xalign = 0;
-        ram_icon.margin_start = 6;
-        pack_start (ram_icon);
-        pack_start (memory_usage_label);
-
-        swap_usage_label = new Gtk.Label (_("Calculating…"));
-        swap_usage_label.set_width_chars (4);
-        swap_usage_label.xalign = 0;
-        swap_icon.margin_start = 6;
-        pack_start (swap_icon);
-        pack_start (swap_usage_label);
-
-        gpu_usage_label = new Gtk.Label (_("Calculating…"));
-        gpu_usage_label.set_width_chars (4);
-        gpu_usage_label.xalign = 0;
-        gpu_icon.margin_start = 6;
-        pack_start (gpu_icon);
-        pack_start (gpu_usage_label);
-
-        var support_ua_label = new Gtk.LinkButton.with_label ("http://stand-with-ukraine.pp.ua/", _("🇺🇦"));
-        var github_label = new Gtk.LinkButton.with_label ("https://github.com/elementary/monitor", _("Check on Github"));
-
-        var version_label = new Gtk.Label ("%s".printf (VCS_TAG)) {
-            selectable = true
+        var gpu_icon = new Gtk.Image.from_icon_name ("gpu-symbolic", Gtk.IconSize.SMALL_TOOLBAR) {
+            tooltip_text = _("GPU")
         };
-        version_label.get_style_context ().add_class ("dim-label");
-
-        // pack_end (build_separator_middot ());
-        pack_end (github_label);
-        pack_end (build_separator_middot ());
-        pack_end (version_label);
-        pack_end (build_separator_middot ());
-        pack_end (support_ua_label);
 
-    }
-
-    private Gtk.Label build_separator_middot () {
-        var label = new Gtk.Label ("𐄁") {
-            margin_end = 6,
+        gpu_usage_label = new Gtk.Label (_("Calculating…")) {
             margin_start = 6,
+            width_chars = 4,
+            xalign = 0
         };
-        label.get_style_context ().add_class ("dim-label");
-        return label;
+
+        var action_bar = new Gtk.ActionBar ();
+        action_bar.pack_start (cpu_icon);
+        action_bar.pack_start (cpu_usage_label);
+        action_bar.pack_start (ram_icon);
+        action_bar.pack_start (memory_usage_label);
+        action_bar.pack_start (swap_icon);
+        action_bar.pack_start (swap_usage_label);
+        action_bar.pack_start (gpu_icon);
+        action_bar.pack_start (gpu_usage_label);
+
+        child = action_bar;
     }
 
     public bool update (ResourcesSerialized sysres) {
-        cpu_usage_label.set_text (("%d%%").printf (sysres.cpu_percentage));
-        memory_usage_label.set_text (("%u%%").printf (sysres.memory_percentage));
-        gpu_usage_label.set_text (("%d%%").printf (sysres.gpu_percentage));
+        cpu_usage_label.label = ("%d%%").printf (sysres.cpu_percentage);
+        memory_usage_label.label = ("%u%%").printf (sysres.memory_percentage);
+        gpu_usage_label.label = ("%d%%").printf (sysres.gpu_percentage);
 
-        string cpu_tooltip_text = ("%.2f %s").printf (sysres.cpu_frequency, _("GHz"));
-        cpu_usage_label.tooltip_text = cpu_tooltip_text;
+        cpu_usage_label.tooltip_text = ("%.2f %s").printf (sysres.cpu_frequency, _("GHz"));
 
-        string memory_tooltip_text = ("%s / %s").printf (
+        memory_usage_label.tooltip_text = ("%s / %s").printf (
             format_size ((uint64) sysres.memory_used, IEC_UNITS),
             format_size ((uint64) sysres.memory_total, IEC_UNITS)
         );
-        memory_usage_label.tooltip_text = memory_tooltip_text;
 
         // The total amount of the swap is 0 when it is unavailable
         if (sysres.swap_total == 0) {
-            swap_usage_label.set_text ("N/A");
+            swap_usage_label.label = _("N/A");
         } else {
-            swap_usage_label.set_text (("%d%%").printf (sysres.swap_percentage));
-            string swap_tooltip_text = ("%.1f %s / %.1f %s").printf (sysres.swap_used, _("GiB"), sysres.swap_total, _("GiB"));
-            swap_usage_label.tooltip_text = swap_tooltip_text;
+            swap_usage_label.label = ("%d%%").printf (sysres.swap_percentage);
+            swap_usage_label.tooltip_text = ("%s / %s").printf (
+                // We get a value in GB, not bytes
+                format_size ((uint64) sysres.swap_used * 1024 * 1024 * 1024, IEC_UNITS),
+                format_size ((uint64) sysres.swap_total * 1024 * 1024 * 1024, IEC_UNITS)
+            );
         }
 
         return true;