diff --git a/core/home/config/Nomarchy.ttf b/core/home/config/Nomarchy.ttf
new file mode 100644
index 0000000..4bb999d
Binary files /dev/null and b/core/home/config/Nomarchy.ttf differ
diff --git a/core/home/config/nomarchy.ttf b/core/home/config/nomarchy.ttf
deleted file mode 100644
index e025e2c..0000000
Binary files a/core/home/config/nomarchy.ttf and /dev/null differ
diff --git a/core/system/fonts.nix b/core/system/fonts.nix
index 5c553ae..bf89414 100644
--- a/core/system/fonts.nix
+++ b/core/system/fonts.nix
@@ -4,11 +4,13 @@ let
   nomarchy-font = pkgs.stdenv.mkDerivation {
     pname = "nomarchy-font";
     version = "1.0";
-    # Pull from core/home/config where the ttf is located
-    src = ./../home/config; 
+    # Point directly to the font file
+    src = ./../home/config/Nomarchy.ttf;
+    # No archive to unpack
+    unpackPhase = "true";
     installPhase = ''
       mkdir -p $out/share/fonts/truetype
-      cp nomarchy.ttf $out/share/fonts/truetype/
+      cp $src $out/share/fonts/truetype/Nomarchy.ttf
     '';
   };
 in
diff --git a/features/desktop/waybar/themes/summer-night/config.jsonc b/features/desktop/waybar/themes/summer-night/config.jsonc
index fa0b5d9..b70d4e5 100644
--- a/features/desktop/waybar/themes/summer-night/config.jsonc
+++ b/features/desktop/waybar/themes/summer-night/config.jsonc
@@ -38,7 +38,7 @@
   
   "custom/nomarchy": {
       "interval": "once",
-      "format": "<span font='nomarchy'>a</span>",
+      "format": "\uf000",
       "on-click": "nomarchy-menu",
       "tooltip-format": "Application Launcher"
     },
diff --git a/features/desktop/waybar/themes/summer-night/style.css b/features/desktop/waybar/themes/summer-night/style.css
index c3f36ee..1c2f39a 100644
--- a/features/desktop/waybar/themes/summer-night/style.css
+++ b/features/desktop/waybar/themes/summer-night/style.css
@@ -28,7 +28,7 @@
 /* Spacing inside the element */
 
 * {
-  font-family: JetBrainsMono Nerd Font, FontAwesome;
+  font-family: JetBrainsMono Nerd Font, FontAwesome, Nomarchy;
   font-size: 13px;
   font-weight: bold;
 }