diff --git a/mode-icons.el b/mode-icons.el
index de9b3e0..b6ec3e8 100644
--- a/mode-icons.el
+++ b/mode-icons.el
@@ -170,9 +170,9 @@ This was stole/modified from `c-save-buffer-state'"
     ("\\`Web\\'" "html" xpm)
     ("\\`XML\\'" "xml" xpm)
     ("\\`YAML\\'" "yaml" xpm)
-    ("\\` YASnippet\\'" "yas" xpm)
-    ("\\` yas\\'" "yas" xpm)
-    ("\\` hs\\'" "hs" xpm)
+    ("\\` ?YASnippet\\'" "yas" xpm)
+    ("\\` ?yas\\'" "yas" xpm)
+    ("\\` ?hs\\'" "hs" xpm)
     ("\\`Markdown\\'" #xf0c9 github-octicons)
     ("\\`Scala\\'" #xf15b font-mfizz)
     ("\\`Magit\\'" #xf1d2 FontAwesome)
@@ -188,9 +188,9 @@ This was stole/modified from `c-save-buffer-state'"
     ("\\`C\\(/.*\\|\\)\\'" #xf107 font-mfizz)
     ("\\`Custom\\'" #xf013 FontAwesome)
     ("\\`Go\\'" "go" xpm)
-    ("\\` Rbow\\'" "rainbow" xpm)
-    ("\\` ICY\\'" "icy" xpm) ;; http://www.clipartpal.com/clipart_pd/weather/ice_10206.html
-    ("\\` Golden\\'" "golden" xpm-bw) ;; Icon created by Arthur Shlain from Noun Project
+    ("\\` ?Rbow\\'" "rainbow" xpm)
+    ("\\` ?ICY\\'" "icy" xpm) ;; http://www.clipartpal.com/clipart_pd/weather/ice_10206.html
+    ("\\` ?Golden\\'" "golden" xpm-bw) ;; Icon created by Arthur Shlain from Noun Project
     ("\\`BibTeX\\'\\'" "bibtex" xpm-bw)
     ("\\`C[+][+]\\(/.*\\|\\)\\'" #xf10c font-mfizz)
     ("\\`C[#]\\(/.*\\|\\)\\'" #xf10d font-mfizz)
@@ -203,7 +203,7 @@ This was stole/modified from `c-save-buffer-state'"
     ("\\`Octave\\'" "octave" xpm)
     ("\\`AHK\\'" "autohotkey" xpm)
     ("\\`Info\\'" #xf05a FontAwesome)
-    ("\\` Narrow\\'" #xf066 FontAwesome)
+    ("\\` ?Narrow\\'" #xf066 FontAwesome)
     ("\\`Dockerfile\\'" "docker" xpm)
     (read-only #xf023 FontAwesome)
     (writable #xf09c FontAwesome)
@@ -226,9 +226,9 @@ This was stole/modified from `c-save-buffer-state'"
     ("\\` ?company\\'" #xf1ad FontAwesome)
     ("\\` ?AC\\'" #xf18e FontAwesome)
     ("\\` ?Fly\\'" #xea12 IcoMoon-Free)
-    ("\\` Ergo" #xf11c FontAwesome)
-    ("\\` drag\\'" #xf047 FontAwesome)
-    ("\\` Helm\\'" "helm" xpm-bw) ;; By Noe Araujo, MX, https://thenounproject.com/term/helm/233101/
+    ("\\` ?Ergo" #xf11c FontAwesome)
+    ("\\` ?drag\\'" #xf047 FontAwesome)
+    ("\\` ?Helm\\'" "helm" xpm-bw) ;; By Noe Araujo, MX, https://thenounproject.com/term/helm/233101/
     ("\\`Messages\\'" #xf27b FontAwesome)
     ("\\`Conf" #xf1de FontAwesome)
     ("\\`Fundamental\\'" #xf016 FontAwesome)
@@ -237,9 +237,9 @@ This was stole/modified from `c-save-buffer-state'"
     ("\\`LaTeX\\'" "tex" ext)
     ("\\`Image\\[xpm\\]\\'" "xpm" ext)
     ("\\`Image\\[png\\]\\'" "png" ext)
-    ("\\` AI\\'" #xf03c FontAwesome)
+    ("\\` ?AI\\'" #xf03c FontAwesome)
     ;; Diminished modes
-    ("\\` \\(?:ElDoc\\|Anzu\\|SP\\|Guide\\|PgLn\\|Undo-Tree\\|Ergo.*\\|,\\|Isearch\\|Ind\\)\\'" nil nil))
+    ("\\` ?\\(?:ElDoc\\|Anzu\\|SP\\|Guide\\|PgLn\\|Undo-Tree\\|Ergo.*\\|,\\|Isearch\\|Ind\\)\\'" nil nil))
   "Icons for major and minor modes.
 
 Each specificatioun is a list with the first element being the