diff --git a/icons/icy.xpm b/icons/icy.xpm
new file mode 100644
index 0000000..4751671
--- /dev/null
+++ b/icons/icy.xpm
@@ -0,0 +1,107 @@
+/* XPM */
+static char * e:\EmacsPortable_App\Data\src\mode_icons\icons\icy_xpm[] = {
+"18 16 88 1",
+" 	c None",
+".	c #777C80",
+"+	c #5F6C76",
+"@	c #62717B",
+"#	c #898887",
+"$	c #767574",
+"%	c #A6E4FF",
+"&	c #A0DCFF",
+"*	c #A1DEFF",
+"=	c #A1DDFF",
+"-	c #8ABFE5",
+";	c #557992",
+">	c #9CD6FF",
+",	c #84B5D8",
+"'	c #97CFF6",
+")	c #85B6D8",
+"!	c #9ED9FF",
+"~	c #9BD5FE",
+"{	c #98D1F9",
+"]	c #5E8098",
+"^	c #97D0F9",
+"/	c #364047",
+"(	c #729CB9",
+"_	c #95CDF4",
+":	c #50728A",
+"<	c #303940",
+"[	c #99D3FB",
+"}	c #595A5C",
+"|	c #729AB6",
+"1	c #65737D",
+"2	c #3B505F",
+"3	c #55768D",
+"4	c #666361",
+"5	c #46667C",
+"6	c #959290",
+"7	c #4F6270",
+"8	c #405A6C",
+"9	c #213340",
+"0	c #949799",
+"a	c #91C8EF",
+"b	c #596F80",
+"c	c #777E84",
+"d	c #5C676F",
+"e	c #2F4351",
+"f	c #F4F4F3",
+"g	c #000000",
+"h	c #2B2B2B",
+"i	c #16191B",
+"j	c #9DD7FF",
+"k	c #454E54",
+"l	c #344451",
+"m	c #404649",
+"n	c #939699",
+"o	c #7F8283",
+"p	c #A4E1FF",
+"q	c #090E14",
+"r	c #616161",
+"s	c #4B4D4D",
+"t	c #9CD7FF",
+"u	c #7D8285",
+"v	c #373636",
+"w	c #96D0F9",
+"x	c #9AD4FC",
+"y	c #36393A",
+"z	c #C8C8C8",
+"A	c #828384",
+"B	c #989898",
+"C	c #6087A2",
+"D	c #98D0F8",
+"E	c #737475",
+"F	c #BABABB",
+"G	c #74A1C0",
+"H	c #2C4150",
+"I	c #95CDF5",
+"J	c #B3B4B4",
+"K	c #415A6D",
+"L	c #384147",
+"M	c #93CAF1",
+"N	c #11191D",
+"O	c #739EBC",
+"P	c #393939",
+"Q	c #B1B2B3",
+"R	c #57748A",
+"S	c #888888",
+"T	c #2E3C46",
+"U	c #010203",
+"V	c #3E3E3D",
+"W	c #C3C3C3",
+".+++++++++++++++@#",
+"$%&&&&&&&&*&&=&&- ",
+" ;>,')!~>{]^/(_>: ",
+" <[}|12>>345678>9 ",
+" 0a bcd&>efg hijk ",
+"  l mnop>q r  stu ",
+"  r v  wxy z  A!  ",
+"    B  CDE    FG  ",
+"       HIJ     K  ",
+"       LM      N  ",
+"       .O      P  ",
+"       QR      S  ",
+"        T         ",
+"        U         ",
+"        V         ",
+"        W         "};
diff --git a/mode-icons.el b/mode-icons.el
index 6a4b079..9969398 100644
--- a/mode-icons.el
+++ b/mode-icons.el
@@ -190,6 +190,7 @@ This was stole/modified from `c-save-buffer-state'"
     ("Custom" #xf013 FontAwesome)
     ("\\`Go\\'" "go" xpm)
     (" Rbow" "rainbow" xpm)
+    (" Icy" "icy" xpm) ;; http://www.clipartpal.com/clipart_pd/weather/ice_10206.htmlr
     (" Golden" "golden" xpm) ;; Icon created by Arthur Shlain from Noun Project
     ("BibTeX" "bibtex" xpm)
     ("C[+][+]/l" #xf10c font-mfizz)
@@ -210,18 +211,27 @@ This was stole/modified from `c-save-buffer-state'"
     (saved "" nil)
     (modified-outside #xf071 FontAwesome)
     (steal #xf21b FontAwesome)
+    ;; Prefer finder icon since it looks like the old mac icon
+    (apple #xeabf IcoMoon-Free)
     (apple #xf179 FontAwesome)
     (win #xf17a FontAwesome)
     ;; FIXME: use lsb_release to determine Linux variant and choose appropriate icon
     (unix #xeabd IcoMoon-Free)  ;; Clear Tux (Unlike FontAwesome)
+
     ;; This icon is clearer than FontAwesome's Linux Penguin
     (unix #xf166 font-mfizz)    ;; Use ubuntu, since I think it is the most common.
     (unix #xf17c FontAwesome) ;; Fall Back to FontAwesome
     (undecided #xf128 FontAwesome)
     ("Text\\'" #xf0f6 FontAwesome)
     ("\\` ?company\\'" #xf1ad FontAwesome)
+    ("\\` ?AC\\'" #xf18e FontAwesome)
+    ("\\` ?Fly\\'" #xea12 IcoMoon-Free)
+    ("\\` Ergo" #xf11c FontAwesome)
+    ("\\`Messages\\'" #xf044 FontAwesome)
+    ("\\`Conf" #xf1de FontAwesome)
+    ("\\`Fundamental\\'" #xf016 FontAwesome)
     ;; Diminished modes
-    ("\\(?:ElDoc\\|Anzu\\|SP\\|Guide\\|PgLn\\|Undo-Tree\\|Ergo.*\\|,\\|Isearch\\|Ind\\|Fly\\)" nil nil)
+    ("\\` \\(?:ElDoc\\|Anzu\\|SP\\|Guide\\|PgLn\\|Undo-Tree\\|Ergo.*\\|,\\|Isearch\\|Ind\\)\\'" nil nil)
     )
   "Icons for major and minor modes.
 
@@ -316,10 +326,6 @@ the icon."
   :type '(repeat sexp)
   :group 'mode-icons)
 
-(defun mode-icons-ask-user-about-lock (_file _other-user)
-  "Automatically steals lock."
-  t)
-
 (defun mode-icons-save-steal-or-revert-buffer (event)
   "Save buffer OR revert file from mode line.
 Use EVENT to determine location."