diff --git a/configuration.org b/configuration.org
index e4bb5b3..4ce88c4 100644
--- a/configuration.org
+++ b/configuration.org
@@ -1031,24 +1031,21 @@ Before this can be used, make sure the [[https://zhm.github.io/symbola/][Symbola
 
 #+BEGIN_SRC emacs-lisp
 (defun gpolonkai/set-font-size (frame)
-  (set-face-attribute 'default t :font "Hack-12")
-  (set-frame-font "Hack-12" t t))
+  (set-face-attribute 'default frame :font "Hack-12")
+  (set-frame-font "Hack-12" t frame))
 
 (defun --set-emoji-font (frame)
   "Adjust the font setting of FRAME so Emacs can display Emoji properly."
   (when (fboundp 'set-fontset-font)
-    (if (eq system-type 'darwin)
-        ;; For NS/Cocoa
-        (set-fontset-font t 'symbol
-                          (font-spec :family "Apple Color Emoji")
-                          frame 'prepend)
-      ;; For Linux
-      (set-fontset-font t 'symbol
-                       (font-spec :family "Symbola")
-                       frame 'prepend))))
+    (set-fontset-font t 'symbol
+                      (font-spec :family "Symbola")
+                      frame 'prepend)))
 
 (add-hook 'after-make-frame-functions 'gpolonkai/set-font-size)
 (add-hook 'after-make-frame-functions '--set-emoji-font)
+
+(gpolonkai/set-font-size nil)
+(--set-emoji-font nil)
 #+END_SRC
 
 * Set up global minor modes provided by Emacs