diff --git a/files/i3gtk.css b/files/i3gtk.css
index bca79f2..fa24b6e 100644
--- a/files/i3gtk.css
+++ b/files/i3gtk.css
@@ -9,7 +9,7 @@ button {
 	background: #333;
 	
 	color: #fff;
-	font: 14px "JetBrains Mono NL";
+	font: 14px "monospace";
 }
 
 button:hover {
diff --git a/modules/stuff/dunst.nix b/modules/stuff/dunst.nix
index ceb209d..111daa2 100644
--- a/modules/stuff/dunst.nix
+++ b/modules/stuff/dunst.nix
@@ -25,7 +25,7 @@ in {
           frame_width = 1;
           background = "#333333";
           foreground = "#feeeee";
-          font = "JetBrains Mono NL 10";
+          font = "monospace 10";
           frame_color = "#4c7899";
         };
       };
diff --git a/modules/stuff/i3.nix b/modules/stuff/i3.nix
index f22bec5..b3bd039 100644
--- a/modules/stuff/i3.nix
+++ b/modules/stuff/i3.nix
@@ -138,7 +138,7 @@ in {
           };
 
           fonts = {
-            names = [ "JetBrains Mono NL" ];
+            names = [ "monospace" ];
             size = 10.0;
           };
 
@@ -256,6 +256,9 @@ in {
             inherit fonts;
             trayOutput = "primary";
             statusCommand = "${lib.getExe hmCfg.programs.i3status.package}";
+            extraConfig = ''
+              height 24
+            '';
           }];
         };
       };
diff --git a/modules/stuff/theme.nix b/modules/stuff/theme.nix
index 0101e1c..8876c80 100644
--- a/modules/stuff/theme.nix
+++ b/modules/stuff/theme.nix
@@ -12,11 +12,14 @@ in {
       enableDefaultPackages = true;
       packages = with pkgs; [
         jetbrains-mono
+        monaspace
       ];
-      fontconfig.defaultFonts = {
-        serif     = [ "JetBrains Mono NL" ];
-        sansSerif = [ "JetBrains Mono NL" ];
-        monospace = [ "JetBrains Mono NL" ];
+      fontconfig.defaultFonts = let 
+        font = "Monaspace Xenon";
+      in {
+        serif     = [ font ];
+        sansSerif = [ font ];
+        monospace = [ font ];
       };
     };
 
@@ -57,4 +60,4 @@ in {
       };
     };
   };
-}
\ No newline at end of file
+}