diff --git a/core/core-evil.el b/core/core-evil.el
index f4db414e6..2ad761907 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -63,7 +63,7 @@
                       (calendar-mode             . emacs)
                       (Man-mode                  . emacs)
                       (grep-mode                 . emacs)
-                      (image-mode                . emacs)
+                      (image-mode                . normal)
                       ))
     (evil-set-initial-state `,(car mode-map) `,(cdr mode-map)))
 
diff --git a/core/core-ui.el b/core/core-ui.el
index 84357cc89..db57bd48d 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -57,9 +57,9 @@
       (add-hook! minibuffer-setup 'narf|minibuffer-setup))
   (menu-bar-mode -1))
 
+;; Fix display of certain unicode characters
 (mapc (lambda (x) (set-fontset-font "fontset-default" `(,x . ,x) (font-spec :name "DejaVu Sans") nil 'prepend))
       '(?☑ ?☐ ?✍ ?⚠))
-
 (mapc (lambda (x) (set-fontset-font "fontset-default" `(,x . ,x) (font-spec :name "DejaVu Sans" :size 10) nil))
       '(?➊ ?➋ ?➌ ?➍ ?➎ ?❻ ?➐ ?➑ ?➒ ?➓ ?λ))