diff --git a/roles/i3/tasks/main.yml b/roles/i3/tasks/main.yml
index 3774697..fb1d300 100644
--- a/roles/i3/tasks/main.yml
+++ b/roles/i3/tasks/main.yml
@@ -19,8 +19,6 @@
       - scrot
       - sysstat
       - ttf-font-awesome
-      - ttf-jetbrains-mono
-      - ttf-fira-code
       - udiskie  # automount external drives (set in .xinitrc)
       - upower
       - viewnior
@@ -37,8 +35,6 @@
     name:
       - dunst
       - fonts-font-awesome
-      - fonts-jetbrains-mono
-      - fonts-firacode
       - hsetroot
       - i3-wm
       - i3lock
diff --git a/roles/terminator/files/config b/roles/terminator/files/config
index f4e3985..a793c95 100644
--- a/roles/terminator/files/config
+++ b/roles/terminator/files/config
@@ -138,7 +138,7 @@
   [[default]]
     background_color = "#121212"
     background_image = None
-    font = FiraCode 10
+    font = FiraCode Nerd Font 10
     cursor_color = "#bbbbbb"
     foreground_color = "#bbbbbb"
     palette = "#121212:#fa2573:#98e123:#dfd460:#1080d0:#8700ff:#43a8d0:#bbbbbb:#555555:#f6669d:#b1e05f:#fff26d:#00afff:#af87ff:#51ceff:#ffffff"
diff --git a/roles/terminator/tasks/main.yml b/roles/terminator/tasks/main.yml
index 3dc834f..f5ff8ed 100644
--- a/roles/terminator/tasks/main.yml
+++ b/roles/terminator/tasks/main.yml
@@ -13,6 +13,26 @@
       - terminator
   when: ansible_facts['distribution'] == 'Debian'
 
+- name: Install Nerd Fonts patch of FiraCode (Archlinux)
+  when: ansible_facts['distribution'] == 'Archlinux'
+  block:
+    - name: Clone nerd-fonts-fira-code (Archlinux)
+      git:
+        repo: https://aur.archlinux.org/nerd-fonts-fira-code.git
+        dest: ~/builds/nerd-fonts-fira-code
+        clone: true
+        update: false
+        version: master
+    - name: Make and install librewolf (Archlinux)
+      command:
+        cmd: makepkg -cirs --needed
+        chdir: ~/builds/nerd-fonts-fira-code
+        stdin: Y
+      register: result
+      changed_when: "'installing existing package' not in result.stderr"
+
+# TODO: Install nerd-fonts-fira-code for Debian
+
 - name: Copy terminator config
   copy: src={{ item.src }} dest={{ item.dest }} mode=0644
   with_items: