diff --git a/.gitignore b/.gitignore
index e821f9a..df2e167 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,6 @@ lib/magic-buffer.el
 assets/
 ./fg42^
 fg42
-fonts/
 project-config/
 docs/_build
+./fonts/
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 9b35921..7b545b4 100644
--- a/Makefile
+++ b/Makefile
@@ -21,3 +21,6 @@ install:
 	@echo "------------------------------------------------------------------------------------"
 	@echo "Make sure to install external dependencies of FG42. For more info checkout README.md"
 	@echo "Enjoy the bless of GNU/Emacs and FG42 :)"
+install-fonts:
+	@mkdir -p ~/.fonts/
+	@cp -rv ./share/fonts/vazir/* ~/.fonts/
diff --git a/lib/extensions/editor/init.el b/lib/extensions/editor/init.el
index 516dd21..02fdd9e 100644
--- a/lib/extensions/editor/init.el
+++ b/lib/extensions/editor/init.el
@@ -313,6 +313,25 @@
            (require 'emojify)
            (add-hook 'after-init-hook #'global-emojify-mode))
 
+  (set-fontset-font "fontset-default"
+                   (cons (decode-char 'ucs #x0627)
+                         (decode-char 'ucs #x0649))
+                   "Vazir")
+
+  (set-fontset-font "fontset-default"
+                  (cons (decode-char 'ucs #xFE8D)
+                        (decode-char 'ucs #xFEF0))
+                  "Vazir")
+
+  (set-fontset-font "fontset-default"
+                  (cons (decode-char 'ucs #x064e)
+                        (decode-char 'ucs #x06a9))
+                  "Vazir")
+
+  (set-fontset-font "fontset-default"
+                  (cons (decode-char 'ucs #x06F0)
+                        (decode-char 'ucs #x00A0))
+                  "Vazir")
   ;; Backup files ---------------------------------------------
   ;; Put them in one nice place if possible
   (if (file-directory-p "~/.backup")
diff --git a/share/fonts/vazir/Vazir.ttf b/share/fonts/vazir/Vazir.ttf
new file mode 100644
index 0000000..b065afb
Binary files /dev/null and b/share/fonts/vazir/Vazir.ttf differ