diff --git a/devicon.json b/devicon.json
index 0be61a7d8..266b7d0e2 100644
--- a/devicon.json
+++ b/devicon.json
@@ -1255,12 +1255,10 @@
             ],
             "font": [
                 "plain",
-                "plain-wordmark",
-                "line",
-                "line-wordmark"
+                "line"
             ]
         },
-        "color": "#9c033a",
+        "color": "#004482",
         "aliases": [
             {
                 "base": "plain",
diff --git a/icons/cplusplus/cplusplus-line.svg b/icons/cplusplus/cplusplus-line.svg
index ac88257af..6820776e9 100644
--- a/icons/cplusplus/cplusplus-line.svg
+++ b/icons/cplusplus/cplusplus-line.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path d="M87 70v-5h5v-4h-5v-5h-5v5h-5v4h5v5zm18-14h-4v5h-6v4h6v5h4v-5h5v-4h-5zm11.5-23.7c-.6-1.1-1.4-2.1-2.3-2.6L66.1 1.9c-.8-.5-1.9-.7-3.1-.7-1.2 0-2.3.3-3.1.7L11.4 29.7c-1.7 1-3.4 3.5-3.4 5.4v55.7c0 1.1.7 2.3 1.4 3.4l.1.1c.5.8 1.3 1.5 2 1.9l48.3 27.9c.8.5 2 .7 3.2.7 1.2 0 2.3-.3 3.1-.7l47.5-27.9c1.7-1 2.4-3.5 2.4-5.4V35.1c0-.8.4-1.8 0-2.6l.5-.2zm-4.2 2.1c0 .3-.3.5-.3.7v55.7c0 .8-.2 1.7-.4 2L64 120.6c-.1.1-.5.2-1.1.2-.6 0-1-.1-1.1-.2L13.6 92.8s-.1-.1-.2-.1l-.6-.6c-.4-.7.2-1.1-.8-1.2V35.2c1-.5.9-1.7 1.4-1.9L61.7 5.4c.1 0 .6-.2 1.2-.2s1 .1 1.1.2l48 27.7.4.9c.1.1-.1.3-.1.4zM63 87.5c-13.5 0-24.5-11-24.5-24.5s11-24.5 24.5-24.5c9.1 0 17.1 5 21.3 12.5l13-7.5c-6.8-11.9-19.6-20-34.3-20-21.8 0-39.5 17.7-39.5 39.5s17.7 39.5 39.5 39.5c14.6 0 27.4-8 34.2-19.8l-12.9-7.6C80.1 82.5 72.1 87.5 63 87.5z" fill="#9C033A"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#004482" d="M63.443-.5c-1.855 0-3.712.398-5.166 1.238L11.344 27.836c-2.91 1.676-5.164 5.587-5.164 8.943v54.198c0 1.558.534 3.212 1.347 4.728l-.033.033.192.332c.926 1.607 2.204 3.015 3.658 3.856l46.931 27.094c2.857 1.65 7.252 1.66 10.163.066h.056l.113-.066 46.936-27.094c1.454-.84 2.729-2.25 3.656-3.856.927-1.606 1.508-3.413 1.508-5.093V36.779c0-1.624-.563-3.366-1.441-4.935v-.04l-.067-.113v-.002c-.927-1.609-2.201-3.017-3.656-3.853L68.609.738C67.155-.102 65.3-.5 63.443-.5zm0 1c1.71 0 3.417.383 4.666 1.105l46.934 27.098c1.246.716 2.43 2 3.283 3.479l.006.007v.002c.854 1.48 1.375 3.149 1.375 4.588v54.198c0 1.445-.521 3.114-1.375 4.593-.854 1.48-2.04 2.767-3.289 3.489l-46.818 27.027h-.002l-.116.066c-2.497 1.444-6.833 1.444-9.332 0L11.844 99.06c-1.245-.72-2.425-1.999-3.278-3.47l-.011-.02C7.7 94.088 7.18 92.42 7.18 90.976V36.779c0-2.884 2.165-6.636 4.664-8.076L58.777 1.605C60.027.883 61.734.5 63.443.5zm-.498 25.033v.053c-20.903.276-37.843 17.326-37.843 38.293 0 21.138 17.205 38.344 38.343 38.344 13.645 0 26.368-7.342 33.203-19.16l.25-.432-17.24-9.979-.25.432c-3.29 5.685-9.407 9.217-15.963 9.217-10.161 0-18.422-8.26-18.422-18.422 0-10.163 8.262-18.424 18.422-18.424 6.55 0 12.674 3.536 15.957 9.217l.25.432 17.246-9.977-.25-.434c-6.84-11.819-19.558-19.16-33.203-19.16h-.5zm.5 1.002h.03c13.106.01 25.315 6.999 32.029 18.244L79.96 53.771c-3.52-5.734-9.776-9.316-16.516-9.316-10.703 0-19.422 8.719-19.422 19.424S52.741 83.3 63.445 83.3c6.744 0 12.994-3.58 16.52-9.317l15.537 8.995c-6.715 11.252-18.94 18.244-32.057 18.244-20.595 0-37.343-16.748-37.343-37.344S42.85 26.535 63.445 26.535zM92.381 57.07v4.207h-4.207v5.203h4.207v4.207h5.201V66.48h4.203v-5.203h-4.203V57.07h-5.201zm15.765 0v4.207h-4.205v5.203h4.205v4.207h5.208V66.48h4.203v-5.203h-4.203V57.07h-5.208zm-14.765 1h3.201v4.207h4.203v3.203h-4.203v4.207h-3.201V65.48h-4.207v-3.203h4.207V58.07zm15.765 0h3.208v4.207h4.203v3.203h-4.203v4.207h-3.208V65.48h-4.205v-3.203h4.205V58.07z"/>
+</svg>
diff --git a/icons/cplusplus/cplusplus-original.svg b/icons/cplusplus/cplusplus-original.svg
index 3f9929eab..6cae2226d 100644
--- a/icons/cplusplus/cplusplus-original.svg
+++ b/icons/cplusplus/cplusplus-original.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#D26383" d="M115.4 30.7L67.1 2.9c-.8-.5-1.9-.7-3.1-.7-1.2 0-2.3.3-3.1.7l-48 27.9c-1.7 1-2.9 3.5-2.9 5.4v55.7c0 1.1.2 2.4 1 3.5l106.8-62c-.6-1.2-1.5-2.1-2.4-2.7z"/><path fill="#9C033A" d="M10.7 95.3c.5.8 1.2 1.5 1.9 1.9l48.2 27.9c.8.5 1.9.7 3.1.7 1.2 0 2.3-.3 3.1-.7l48-27.9c1.7-1 2.9-3.5 2.9-5.4V36.1c0-.9-.1-1.9-.6-2.8l-106.6 62z"/><path fill="#fff" d="M85.3 76.1C81.1 83.5 73.1 88.5 64 88.5c-13.5 0-24.5-11-24.5-24.5s11-24.5 24.5-24.5c9.1 0 17.1 5 21.3 12.5l13-7.5c-6.8-11.9-19.6-20-34.3-20-21.8 0-39.5 17.7-39.5 39.5s17.7 39.5 39.5 39.5c14.6 0 27.4-8 34.2-19.8l-12.9-7.6z"/><path d="M82.1 61.8h5.2v-5.3h4.4v5.3H97v4.4h-5.3v5.2h-4.4v-5.2h-5.2v-4.4zm18.5 0h5.2v-5.3h4.4v5.3h5.3v4.4h-5.3v5.2h-4.4v-5.2h-5.2v-4.4z" fill="#fff"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#00599c" d="M118.766 95.82c.89-1.543 1.441-3.28 1.441-4.843V36.78c0-1.558-.55-3.297-1.441-4.84l-55.32 31.94Zm0 0"/>
+  <path fill="#004482" d="m68.36 126.586 46.933-27.094c1.352-.781 2.582-2.129 3.473-3.672l-55.32-31.94L8.12 95.82c.89 1.543 2.121 2.89 3.473 3.672l46.933 27.094c2.703 1.562 7.13 1.562 9.832 0Zm0 0"/>
+  <path fill="#659ad2" d="M118.766 31.941c-.891-1.546-2.121-2.894-3.473-3.671L68.359 1.172c-2.703-1.563-7.129-1.563-9.832 0L11.594 28.27C8.89 29.828 6.68 33.66 6.68 36.78v54.196c0 1.562.55 3.3 1.441 4.843L63.445 63.88Zm0 0"/>
+  <path fill="#fff" d="M63.445 26.035c-20.867 0-37.843 16.977-37.843 37.844s16.976 37.844 37.843 37.844c13.465 0 26.024-7.247 32.77-18.91L79.84 73.335c-3.38 5.84-9.66 9.465-16.395 9.465-10.433 0-18.922-8.488-18.922-18.922 0-10.434 8.49-18.922 18.922-18.922 6.73 0 13.017 3.629 16.39 9.465l16.38-9.477c-6.75-11.664-19.305-18.91-32.77-18.91zM92.88 57.57v4.207h-4.207v4.203h4.207v4.207h4.203V65.98h4.203v-4.203h-4.203V57.57H92.88zm15.766 0v4.207h-4.204v4.203h4.204v4.207h4.207V65.98h4.203v-4.203h-4.203V57.57h-4.207z"/>
+</svg>
diff --git a/icons/cplusplus/cplusplus-plain.svg b/icons/cplusplus/cplusplus-plain.svg
index 75756c44b..78c798ef8 100644
--- a/icons/cplusplus/cplusplus-plain.svg
+++ b/icons/cplusplus/cplusplus-plain.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#9C033A" d="M117.5 33.5l.3-.2c-.6-1.1-1.5-2.1-2.4-2.6L67.1 2.9c-.8-.5-1.9-.7-3.1-.7-1.2 0-2.3.3-3.1.7l-48 27.9c-1.7 1-2.9 3.5-2.9 5.4v55.7c0 1.1.2 2.3.9 3.4l-.2.1c.5.8 1.2 1.5 1.9 1.9l48.2 27.9c.8.5 1.9.7 3.1.7 1.2 0 2.3-.3 3.1-.7l48-27.9c1.7-1 2.9-3.5 2.9-5.4V36.1c.1-.8 0-1.7-.4-2.6zM82 66v-4h5v-5h5v5h5v4h-5v5h-5v-5h-5zm3.3-14C81.1 44.5 73.1 39.5 64 39.5c-13.5 0-24.5 11-24.5 24.5s11 24.5 24.5 24.5c9.1 0 17.1-5 21.3-12.4l12.9 7.6c-6.8 11.8-19.6 19.8-34.2 19.8-21.8 0-39.5-17.7-39.5-39.5S42.2 24.5 64 24.5c14.7 0 27.5 8.1 34.3 20l-13 7.5zM115 66h-5v5h-4v-5h-6v-4h6v-5h4v5h5v4z"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
+    <path fill="#004482" d="M63.443 0c-1.782 0-3.564.39-4.916 1.172L11.594 28.27C8.89 29.828 6.68 33.66 6.68 36.78v54.197c0 1.562.55 3.298 1.441 4.841l-.002.002c.89 1.543 2.123 2.89 3.475 3.672l46.931 27.094c2.703 1.562 7.13 1.562 9.832 0h.002l46.934-27.094c1.352-.78 2.582-2.129 3.473-3.672.89-1.543 1.441-3.28 1.441-4.843V36.779c0-1.557-.55-3.295-1.441-4.838v-.002c-.891-1.545-2.121-2.893-3.473-3.67L68.359 1.173C67.008.39 65.226 0 63.443 0zm.002 26.033c13.465 0 26.02 7.246 32.77 18.91l-16.38 9.479c-3.372-5.836-9.66-9.467-16.39-9.467-10.432 0-18.922 8.49-18.922 18.924S53.013 82.8 63.445 82.8c6.735 0 13.015-3.625 16.395-9.465l16.375 9.477c-6.746 11.662-19.305 18.91-32.77 18.91-20.867 0-37.843-16.977-37.843-37.844s16.976-37.844 37.843-37.844v-.002zM92.881 57.57h4.201v4.207h4.203v4.203h-4.203v4.207h-4.201V65.98h-4.207v-4.203h4.207V57.57zm15.765 0h4.208v4.207h4.203v4.203h-4.203v4.207h-4.208V65.98h-4.205v-4.203h4.205V57.57z"/>
+</svg>
diff --git a/icons/cplusplus/cplusplus.eps b/icons/cplusplus/cplusplus.eps
deleted file mode 100644
index 62bdbe67e..000000000
Binary files a/icons/cplusplus/cplusplus.eps and /dev/null differ