diff --git a/icons/c.svg b/icons/c.svg
new file mode 100644
index 0000000..d29961d
--- /dev/null
+++ b/icons/c.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="33" height="32" viewBox="0 0 33 32"><path fill="#6A9FB5" fill-rule="evenodd" d="M21.351 10.716c-.662-.718-1.303-1.196-1.923-1.435a5.167 5.167 0 0 0-1.873-.36c-.934 0-1.78.167-2.535.5a5.801 5.801 0 0 0-1.95 1.385 6.293 6.293 0 0 0-1.26 2.063 7.114 7.114 0 0 0-.447 2.537c0 .974.149 1.871.446 2.692.298.82.718 1.529 1.262 2.127a5.87 5.87 0 0 0 1.949 1.41c.756.341 1.6.512 2.535.512.73 0 1.44-.175 2.128-.525.688-.35 1.329-.91 1.923-1.679l2.65 1.897c-.815 1.128-1.809 1.948-2.981 2.46a9.245 9.245 0 0 1-3.746.77c-1.392 0-2.67-.227-3.834-.68a8.743 8.743 0 0 1-3.007-1.922c-.84-.829-1.499-1.824-1.975-2.986C8.238 18.32 8 17.03 8 15.612c0-1.453.238-2.773.713-3.96.476-1.188 1.134-2.2 1.975-3.038a8.65 8.65 0 0 1 3.007-1.935C14.858 6.226 16.137 6 17.529 6c1.224 0 2.357.218 3.402.654 1.045.435 2.017 1.174 2.918 2.217l-2.498 1.845z"/></svg>
\ No newline at end of file
diff --git a/icons/cpp.svg b/icons/cpp.svg
index 5b6d1c6..10ea0fb 100644
--- a/icons/cpp.svg
+++ b/icons/cpp.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10.5 15.97l.41 2.44c-.26.14-.68.27-1.24.39-.57.13-1.24.2-2.01.2-2.21-.04-3.87-.7-4.98-1.96C1.56 15.77 1 14.16 1 12.21c.05-2.31.72-4.08 2-5.32C4.32 5.64 5.96 5 7.94 5c.75 0 1.4.07 1.94.19s.94.25 1.2.4l-.58 2.49-1.06-.34c-.4-.1-.86-.15-1.39-.15-1.16-.01-2.12.36-2.87 1.1-.76.73-1.15 1.85-1.18 3.34 0 1.36.37 2.42 1.08 3.2.71.77 1.71 1.17 2.99 1.18l1.33-.12c.43-.08.79-.19 1.1-.32M11 11h2V9h2v2h2v2h-2v2h-2v-2h-2v-2m7 0h2V9h2v2h2v2h-2v2h-2v-2h-2v-2z" fill="#78909c"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="33" height="32" viewBox="0 0 33 32"><g fill="#6A9FB5" fill-rule="evenodd"><path d="M22.01 17.77h-1.213v-1.802h-1.802v-1.24h1.802v-1.813h1.214v1.813h1.811v1.24h-1.811v1.803zm5.618 0h-1.214v-1.802h-1.802v-1.24h1.802v-1.813h1.214v1.813h1.811v1.24h-1.81v1.803z"/><path d="M18.57 10.716c-.663-.718-1.304-1.196-1.924-1.435a5.167 5.167 0 0 0-1.873-.36c-.934 0-1.78.167-2.535.5a5.801 5.801 0 0 0-1.95 1.385 6.293 6.293 0 0 0-1.26 2.063 7.114 7.114 0 0 0-.447 2.537c0 .974.149 1.871.446 2.692.297.82.718 1.529 1.261 2.127a5.87 5.87 0 0 0 1.95 1.41c.756.341 1.6.512 2.535.512.73 0 1.44-.175 2.127-.525.688-.35 1.33-.91 1.924-1.679l2.65 1.897c-.815 1.128-1.809 1.948-2.981 2.46a9.245 9.245 0 0 1-3.746.77c-1.393 0-2.67-.227-3.834-.68a8.743 8.743 0 0 1-3.007-1.922c-.84-.829-1.5-1.824-1.975-2.986-.475-1.162-.713-2.452-.713-3.87 0-1.453.238-2.773.713-3.96.476-1.188 1.134-2.2 1.975-3.038a8.65 8.65 0 0 1 3.007-1.935C12.076 6.226 13.354 6 14.747 6c1.223 0 2.357.218 3.402.654 1.045.435 2.017 1.174 2.917 2.217l-2.497 1.845z"/></g></svg>
\ No newline at end of file
diff --git a/package.json b/package.json
index 3a28abf..1c315cf 100644
--- a/package.json
+++ b/package.json
@@ -23,12 +23,11 @@
   },
   "scripts": {
     "build": "npm run icons && npm run build-themes",
-    "icons": "npm run remove-icons && npm run minimize-icons && npm run build-icons && npm run minimize-json",
     "minimize-icons": "svgo -f src/icons/svgs -o icons",
     "minimize-json": "json-minify themes/.material-theme-icons.tmp > themes/Material-Theme-Icons.json && npm run remove-icons-tmp",
     "remove-icons": "rimraf icons && rimraf themes/Material-Theme-Icons.json",
     "remove-icons-tmp": "rimraf themes/.material-theme-icons.tmp",
-    "build-icons": "gulp build:icons",
+    "build-icons": "npm run remove-icons && npm run minimize-icons && gulp build:icons && npm run minimize-json",
     "build-themes": "gulp build:themes",
     "release": "npm run bump && npm run changelog",
     "changelog": "gulp changelog",
diff --git a/src/icons/partials/fileExtensions.js b/src/icons/partials/fileExtensions.js
index c851c63..092994b 100644
--- a/src/icons/partials/fileExtensions.js
+++ b/src/icons/partials/fileExtensions.js
@@ -114,11 +114,14 @@
   "c": "_file_c",
   "h": "_file_c",
   "m": "_file_c",
-  "cc": "_file_c++",
-  "cpp": "_file_c++",
-  "hpp": "_file_c++",
-  "mm": "_file_c++",
-  "cxx": "_file_c++",
+  "cc": "_file_cpp",
+  "cpp": "_file_cpp",
+  "c++": "_file_cpp",
+  "hpp": "_file_cpp",
+  "mm": "_file_cpp",
+  "cxx": "_file_cpp",
+  "c": "_file_cpp",
+  "cc": "_file_cpp",
   "go": "_file_go",
   "py": "_file_python",
   "url": "_file_url",
diff --git a/src/icons/svgs/c.svg b/src/icons/svgs/c.svg
new file mode 100644
index 0000000..f088643
--- /dev/null
+++ b/src/icons/svgs/c.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="33" height="32" viewBox="0 0 33 32">
+  <path fill="#6A9FB5" fill-rule="evenodd" d="M13.3514769,4.71604632 C12.6889957,3.99838351 12.0477576,3.51994881 11.4277431,3.28072787 C10.8077287,3.04150694 10.1834769,2.92189826 9.55496917,2.92189826 C8.62070084,2.92189826 7.77562535,3.08849606 7.01971735,3.42169665 C6.26380934,3.75489724 5.61407793,4.21624498 5.07050364,4.80575372 C4.52692934,5.39526246 4.1065149,6.08301234 3.80924771,6.86902399 C3.51198051,7.65503564 3.36334915,8.50083983 3.36334915,9.40646195 C3.36334915,10.3804329 3.51198051,11.277498 3.80924771,12.097684 C4.1065149,12.9178701 4.52692934,13.6269787 5.07050364,14.225031 C5.61407793,14.8230834 6.26380934,15.2929746 7.01971735,15.6347188 C7.77562535,15.976463 8.62070084,16.1473325 9.55496917,16.1473325 C10.2853971,16.1473325 10.9945811,15.9721912 11.6825423,15.6219034 C12.3705035,15.2716156 13.0117417,14.7120179 13.6062761,13.9430935 L16.2561875,15.8397643 C15.4408261,16.9675201 14.4471192,17.7876939 13.2750372,18.3003102 C12.1029551,18.8129265 10.8544516,19.0692308 9.52948925,19.0692308 C8.13658011,19.0692308 6.85835035,18.8428286 5.69476162,18.3900176 C4.53117289,17.9372065 3.52897282,17.2964458 2.68813133,16.4677161 C1.84728983,15.6389864 1.18906521,14.6436714 0.713437698,13.4817411 C0.237810188,12.3198108 -1.42108547e-14,11.0297459 -1.42108547e-14,9.61150744 C-1.42108547e-14,8.15909461 0.237810188,6.83912746 0.713437698,5.65156638 C1.18906521,4.4640053 1.84728983,3.4516033 2.68813133,2.61433002 C3.52897282,1.77705675 4.53117289,1.13202425 5.69476162,0.679213193 C6.85835035,0.226402134 8.13658011,-5.32907052e-15 9.52948925,-5.32907052e-15 C10.7525314,-5.32907052e-15 11.8863764,0.217858657 12.9310583,0.653582506 C13.9757401,1.08930636 14.9482139,1.82831709 15.8485089,2.87063689 L13.3514769,4.71604632 Z" transform="translate(8 6)"/>
+</svg>
diff --git a/src/icons/svgs/cpp.svg b/src/icons/svgs/cpp.svg
index fc88293..1395b2e 100755
--- a/src/icons/svgs/cpp.svg
+++ b/src/icons/svgs/cpp.svg
@@ -1,54 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="cpp.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="729"
-     inkscape:window-height="480"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="-4.9322034"
-     inkscape:cy="11.79661"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M10.5,15.97L10.91,18.41C10.65,18.55 10.23,18.68 9.67,18.8C9.1,18.93 8.43,19 7.66,19C5.45,18.96 3.79,18.3 2.68,17.04C1.56,15.77 1,14.16 1,12.21C1.05,9.9 1.72,8.13 3,6.89C4.32,5.64 5.96,5 7.94,5C8.69,5 9.34,5.07 9.88,5.19C10.42,5.31 10.82,5.44 11.08,5.59L10.5,8.08L9.44,7.74C9.04,7.64 8.58,7.59 8.05,7.59C6.89,7.58 5.93,7.95 5.18,8.69C4.42,9.42 4.03,10.54 4,12.03C4,13.39 4.37,14.45 5.08,15.23C5.79,16 6.79,16.4 8.07,16.41L9.4,16.29C9.83,16.21 10.19,16.1 10.5,15.97M11,11H13V9H15V11H17V13H15V15H13V13H11V11M18,11H20V9H22V11H24V13H22V15H20V13H18V11Z"
-     id="path4"
-     style="fill:#78909C;fill-opacity:1" />
+<svg xmlns="http://www.w3.org/2000/svg" width="33" height="32" viewBox="0 0 33 32">
+  <g fill="#6A9FB5" fill-rule="evenodd" transform="translate(4 6)">
+    <path d="M4.24568593,5.61681192 L3.03186472,5.61681192 L3.03186472,3.81370197 L1.22995184,3.81370197 L1.22995184,2.5737681 L3.03186472,2.5737681 L3.03186472,0.761193008 L4.24568593,0.761193008 L4.24568593,2.5737681 L6.05700828,2.5737681 L6.05700828,3.81370197 L4.24568593,3.81370197 L4.24568593,5.61681192 Z M9.86313758,5.61681192 L8.64931637,5.61681192 L8.64931637,3.81370197 L6.84740349,3.81370197 L6.84740349,2.5737681 L8.64931637,2.5737681 L8.64931637,0.761193008 L9.86313758,0.761193008 L9.86313758,2.5737681 L11.6744599,2.5737681 L11.6744599,3.81370197 L9.86313758,3.81370197 L9.86313758,5.61681192 Z" transform="translate(13.765 6.154)"/>
+    <path d="M14.5693533,4.71604632 C13.9068721,3.99838351 13.2656339,3.51994881 12.6456195,3.28072787 C12.025605,3.04150694 11.4013533,2.92189826 10.7728455,2.92189826 C9.83857719,2.92189826 8.9935017,3.08849606 8.23759369,3.42169665 C7.48168568,3.75489724 6.83195428,4.21624498 6.28837998,4.80575372 C5.74480568,5.39526246 5.32439124,6.08301234 5.02712405,6.86902399 C4.72985686,7.65503564 4.58122549,8.50083983 4.58122549,9.40646195 C4.58122549,10.3804329 4.72985686,11.277498 5.02712405,12.097684 C5.32439124,12.9178701 5.74480568,13.6269787 6.28837998,14.225031 C6.83195428,14.8230834 7.48168568,15.2929746 8.23759369,15.6347188 C8.9935017,15.976463 9.83857719,16.1473325 10.7728455,16.1473325 C11.5032735,16.1473325 12.2124574,15.9721912 12.9004186,15.6219034 C13.5883799,15.2716156 14.229618,14.7120179 14.8241524,13.9430935 L17.4740639,15.8397643 C16.6587024,16.9675201 15.6649956,17.7876939 14.4929135,18.3003102 C13.3208314,18.8129265 12.0723279,19.0692308 10.7473656,19.0692308 C9.35445646,19.0692308 8.0762267,18.8428286 6.91263797,18.3900176 C5.74904924,17.9372065 4.74684916,17.2964458 3.90600767,16.4677161 C3.06516618,15.6389864 2.40694155,14.6436714 1.93131404,13.4817411 C1.45568653,12.3198108 1.21787634,11.0297459 1.21787634,9.61150744 C1.21787634,8.15909461 1.45568653,6.83912746 1.93131404,5.65156638 C2.40694155,4.4640053 3.06516618,3.4516033 3.90600767,2.61433002 C4.74684916,1.77705675 5.74904924,1.13202425 6.91263797,0.679213193 C8.0762267,0.226402134 9.35445646,-5.32907052e-15 10.7473656,-5.32907052e-15 C11.9704078,-5.32907052e-15 13.1042528,0.217858657 14.1489346,0.653582506 C15.1936165,1.08930636 16.1660903,1.82831709 17.0663852,2.87063689 L14.5693533,4.71604632 Z"/>
+  </g>
 </svg>
diff --git a/test/source.c b/test/source.c
new file mode 100644
index 0000000..e69de29
diff --git a/test/source.c++ b/test/source.c++
new file mode 100644
index 0000000..e69de29
diff --git a/test/source.cc b/test/source.cc
new file mode 100644
index 0000000..e69de29