diff --git a/icons/c.xpm b/icons/c.xpm
new file mode 100644
index 0000000..6978a3a
--- /dev/null
+++ b/icons/c.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static char * c_xpm[] = {
+"16 16 25 1",
+" 	c None",
+".	c #0165B3",
+"+	c #03599C",
+"@	c #5191E2",
+"#	c #FEFEFE",
+"$	c #FFFFFF",
+"%	c #5191E3",
+"&	c #28619E",
+"*	c #FCFCFD",
+"=	c #0768B6",
+"-	c #5191E1",
+";	c #5995E2",
+">	c #5995E1",
+",	c #6DA9FD",
+"'	c #1A5D9D",
+")	c #1B5D9D",
+"!	c #FDFDFE",
+"~	c #29629F",
+"{	c #FDFDFD",
+"]	c #5593E3",
+"^	c #065A9D",
+"/	c #5995E3",
+"(	c #5191E0",
+"_	c #FCFCFC",
+":	c #FCFCFE",
+" .++++++++++++. ",
+".++++++..++++++.",
+"+++++@@##@@+++++",
+"++++@###$##@++++",
+"+++@##%&&%$*=+++",
+"++-##@++++;;>+++",
+"++,#%++++++++')+",
+"++!#%+++++++++++",
+"++*,~+++++++++++",
+"++*{]^++++++++++",
+"++,!/^^+++++++++",
+"++(!{%^++^%%>+++",
+"+++(*{%&&%{_=+++",
+"++++@*:{{:*@++++",
+".++++@-**-@++++.",
+" .+++++..+++++. "};
diff --git a/icons/cpp.xpm b/icons/cpp.xpm
new file mode 100644
index 0000000..e6a7a37
--- /dev/null
+++ b/icons/cpp.xpm
@@ -0,0 +1,46 @@
+/* XPM */
+static char * cpp_xpm[] = {
+"16 16 27 1",
+" 	c None",
+".	c #0165B3",
+"+	c #03599C",
+"@	c #5191E2",
+"#	c #FEFEFE",
+"$	c #FFFFFF",
+"%	c #5191E3",
+"&	c #28619E",
+"*	c #FCFCFD",
+"=	c #0768B6",
+"-	c #5191E1",
+";	c #1C6BB7",
+">	c #5995E2",
+",	c #6DA9FD",
+"'	c #1B5D9D",
+")	c #FCFCFC",
+"!	c #FDFDFE",
+"~	c #085A9D",
+"{	c #0A69B7",
+"]	c #29629F",
+"^	c #FDFDFD",
+"/	c #5995E1",
+"(	c #5593E3",
+"_	c #065A9D",
+":	c #5995E3",
+"<	c #5191E0",
+"[	c #FCFCFE",
+" .++++++++++++. ",
+".++++++..++++++.",
+"+++++@@##@@+++++",
+"++++@###$##@++++",
+"+++@##%&&%$*=+++",
+"++-##@++;+>>+;++",
+"++,#%++'#'++')'+",
+"++!#%+'=#=~'{)='",
+"++*,]+^^#^/^#^^)",
+"++*^(_'=^=+'{)='",
+"++,!:__'^'__')'+",
+"++<!^%_';_%%+;++",
+"+++<*^%&&%^)++++",
+"++++@*[^^[*@++++",
+".++++@-**-@++++.",
+" .+++++..+++++. "};
diff --git a/icons/csharp.xpm b/icons/csharp.xpm
new file mode 100644
index 0000000..38e868a
--- /dev/null
+++ b/icons/csharp.xpm
@@ -0,0 +1,43 @@
+/* XPM */
+static char * csharp_xpm[] = {
+"16 16 24 1",
+" 	c None",
+".	c #7B3B91",
+"+	c #68227A",
+"@	c #7B3990",
+"#	c #A464BA",
+"$	c #A464BB",
+"%	c #FCFCFC",
+"&	c #FDFDFD",
+"*	c #FEFEFE",
+"=	c #FAFAFB",
+"-	c #A361BA",
+";	c #FFFFFF",
+">	c #69237B",
+",	c #7F4795",
+"'	c #7D4193",
+")	c #FBFBFC",
+"!	c #FAFAFA",
+"~	c #FCFCFD",
+"{	c #A567BC",
+"]	c #FBFBFB",
+"^	c #6B2C7C",
+"/	c #F9F9F9",
+"(	c #7F4695",
+"_	c #FCFCFE",
+" .++++++++++++@ ",
+".++#$%&**$$++++@",
+"++#=%*$-;*%>++++",
+"+#=%,'+>.'$>++++",
+"+$%,,+++++>+++++",
+">)%'++++++$!$$%$",
+">~{'++++++]]&]%]",
+">~{++++++++!++*+",
+">~$+++++++^!++&+",
+">~{'++++++/!//!/",
+">))'++++++$]$$]$",
+"+$),,+++++++++++",
+"+#=)('++.'$>++++",
+"++#=)~$$&_&>++++",
+"@++#$%)~~$$++++@",
+" @+++>>>>+++++@ "};
diff --git a/icons/dart.xpm b/icons/dart.xpm
new file mode 100644
index 0000000..31306f0
--- /dev/null
+++ b/icons/dart.xpm
@@ -0,0 +1,67 @@
+/* XPM */
+static char * dart_xpm[] = {
+"16 16 48 1",
+" 	c None",
+".	c #39C0FF",
+"+	c #3CC2FF",
+"@	c #3AC1FF",
+"#	c #3AC0FF",
+"$	c #3FC3FF",
+"%	c #41C4FF",
+"&	c #2A97D6",
+"*	c #37ABE6",
+"=	c #39ADE7",
+"-	c #32A6E2",
+";	c #2A8CC6",
+">	c #1D94D3",
+",	c #02589C",
+"'	c #03589C",
+")	c #02589B",
+"!	c #02599C",
+"~	c #207BB7",
+"{	c #2AB6F6",
+"]	c #1E95D3",
+"^	c #03599C",
+"/	c #04599C",
+"(	c #01589B",
+"_	c #1F7AB6",
+":	c #2BB7F6",
+"<	c #1F95D3",
+"[	c #2CB7F6",
+"}	c #055A9D",
+"|	c #015699",
+"1	c #01579B",
+"2	c #207AB6",
+"3	c #2096D4",
+"4	c #065A9D",
+"5	c #015698",
+"6	c #2DB7F6",
+"7	c #015598",
+"8	c #257EB9",
+"9	c #2BB6F6",
+"0	c #28B4F5",
+"a	c #1E94D3",
+"b	c #02589A",
+"c	c #01579A",
+"d	c #025597",
+"e	c #3BC0FE",
+"f	c #3FC3FE",
+"g	c #40C3FE",
+"h	c #3DC2FF",
+"i	c #40C4FF",
+"       .+@      ",
+"     #$%%%+     ",
+"   &*======-    ",
+"  ;>,'''''')!   ",
+"  ~{]^////''))  ",
+" (_::</////'')) ",
+" )_:[[<}}}//'))|",
+"1)2:[[[34}//'')5",
+"1)2:[[[63}//'')5",
+"1)_:[[[[[<//'))7",
+" )_::[[[[[<^'))7",
+"  89::[[[[:]^)17",
+"   0{::::::{abcd",
+"    efgggggff   ",
+"     h%%%%%ii   ",
+"      +$$$$$$   "};
diff --git a/icons/react.xpm b/icons/react.xpm
index 1de2a89..b5be19a 100644
--- a/icons/react.xpm
+++ b/icons/react.xpm
@@ -1,21 +1,30 @@
 /* XPM */
 static char * react_xpm[] = {
-"16 16 2 1",
+"16 16 11 1",
 " 	c None",
-".	c #61DAFB",
-"                ",
-"    ..   ...    ",
-"   .  ....  .   ",
-"   .   ..   .   ",
-"   .  ....  .   ",
-"   ..........   ",
-" .....    ..... ",
-".   .  ..  .   .",
-".   .  ..  .   .",
-" .....    ..... ",
-"   ..........   ",
-"   .  ....  .   ",
-"   .   ..   .   ",
-"   .  ....  .   ",
-"    ...  ...    ",
-"                "};
+".	c #484848",
+"+	c #000000",
+"@	c #61DAFB",
+"#	c #000203",
+"$	c #006482",
+"%	c #041419",
+"&	c #006783",
+"*	c #006784",
+"=	c #000101",
+"-	c #000407",
+" .++++++++++++. ",
+".+++@@+++#@@+++.",
+"+++@+$@%%@$+@+++",
+"+++@++$@@$++@+++",
+"+++@++@@@@++@+++",
+"++&@@@*==*@@@&++",
+"+@@@@*++++*@@@@+",
+"@-+&@++@@++@&+-@",
+"@-+&@++@@++@&+-@",
+"+@@@@*++++*@@@@+",
+"++&@@@*++*@@@&++",
+"+++@+$@@@@$+@+++",
+"+++@++$@@$++@+++",
+"+++@++@%%@++@+++",
+".+++@@=+++@@+++.",
+" .++++++++++++. "};
diff --git a/mode-icons.el b/mode-icons.el
index 9afda19..a3dccc6 100644
--- a/mode-icons.el
+++ b/mode-icons.el
@@ -29,8 +29,12 @@
 ;; icon.  Currently the following programming modes are supported,
 ;; among others:
 ;;
+;; - C
+;; - C++
+;; - C#
 ;; - CSS
 ;; - Coffee
+;; - Dart
 ;; - Emacs-Lisp
 ;; - HTML
 ;; - Haml
@@ -143,6 +147,7 @@ This was stole/modified from `c-save-buffer-state'"
   `(("\\`CSS\\'" "css" xpm)
     ("\\`Coffee\\'" "coffee" xpm-bw)
     ("\\`Compilation\\'" "compile" xpm)
+    ("\\`Dart\\'" "dart" xpm)
     ("\\`Emacs-Lisp\\'" "emacs" xpm)
     ("\\`Lisp Interaction\\'" "emacs" xpm)
     ("\\`HTML\\'" "html" xpm)
@@ -192,7 +197,7 @@ This was stole/modified from `c-save-buffer-state'"
     ("\\`Calendar\\'" #xf073 FontAwesome)
     ("\\`Help\\'" #xf059 FontAwesome)
     ("\\`WoMan\\'" #xf05a FontAwesome)
-    ("\\`C\\(/.*\\|\\)\\'" #xf107 font-mfizz)
+    ("\\`C\\(/.*\\|\\)\\'" "c" xpm)
     ("\\`Custom\\'" #xf013 FontAwesome)
     ("\\`Go\\'" "go" xpm)
     ("\\` ?Rbow\\'" "rainbow" xpm)
@@ -200,8 +205,8 @@ This was stole/modified from `c-save-buffer-state'"
     ("\\` ?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)
+    ("\\`C[+][+]\\(/.*\\|\\)\\'" "cpp" xpm)
+    ("\\`C[#]\\(/.*\\|\\)\\'" "csharp" xpm)
     ("\\`Elixir\\'" #xf115 font-mfizz)
     ("\\`Erlang\\'" #xf116 font-mfizz)
     ("\\`Haskell\\'" #xf126 font-mfizz)