diff --git a/src/Views/SystemView/SystemStorageView.vala b/src/Views/SystemView/SystemStorageView.vala
index 069c218d..035f53bd 100644
--- a/src/Views/SystemView/SystemStorageView.vala
+++ b/src/Views/SystemView/SystemStorageView.vala
@@ -92,10 +92,9 @@ public class Monitor.SystemStorageView : Gtk.Box {
         }
 
         construct {
-            var drive_name_label = new Gtk.Label (drive.model) {
-                halign = START
+            var drive_name_label = new Granite.HeaderLabel (drive.model) {
+                size = H3
             };
-            drive_name_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL);
 
             string size_string = format_size ((uint64) drive.size, IEC_UNITS);
             string used_string = format_size ((uint64) (drive.size - drive.free), IEC_UNITS);
diff --git a/src/Widgets/WidgetResource/WidgetResource.vala b/src/Widgets/WidgetResource/WidgetResource.vala
index 7144f1d9..6b21dfb9 100644
--- a/src/Widgets/WidgetResource/WidgetResource.vala
+++ b/src/Widgets/WidgetResource/WidgetResource.vala
@@ -27,7 +27,7 @@ public class Monitor.WidgetResource : Gtk.Box {
     private Gtk.Box header_box;
     private Gtk.Overlay main_overlay;
     private Gtk.Box info_box;
-    private Gtk.Label main_metric_label;
+    private Granite.HeaderLabel main_metric_label;
 
     construct {
         _title = new Granite.HeaderLabel (Utils.NO_DATA);
@@ -39,8 +39,9 @@ public class Monitor.WidgetResource : Gtk.Box {
         main_metric_title.add_css_class (Granite.CssClass.DIM);
         main_metric_title.add_css_class (Granite.CssClass.SMALL);
 
-        main_metric_label = new Gtk.Label (Utils.NO_DATA);
-        main_metric_label.add_css_class (Granite.STYLE_CLASS_H2_LABEL);
+        main_metric_label = new Granite.HeaderLabel (Utils.NO_DATA) {
+            size = H2
+        };
 
         var main_metric_box = new Gtk.Box (VERTICAL, 0) {
             margin_top = 6,