diff --git a/devicon.json b/devicon.json
index e15896d7..79b7bb77 100644
--- a/devicon.json
+++ b/devicon.json
@@ -5697,6 +5697,29 @@
         "color": "#11557C",
         "aliases": []
     },
+    {
+        "name": "mattermost",
+        "altnames": [],
+        "tags": [
+            "app",
+            "chat", 
+            "collaboration",
+            "open-source",
+            "platform"
+        ],
+        "versions": {
+            "svg": [
+                "original",
+                "original-wordmark"
+            ],
+            "font": [
+                "original",
+                "original-wordmark"
+            ]
+        },
+        "color": "#19191c",
+        "aliases": []
+    },
     {
         "name": "maven",
         "altnames": [
diff --git a/icons/mattermost/mattermost-original-wordmark.svg b/icons/mattermost/mattermost-original-wordmark.svg
new file mode 100644
index 00000000..6f9edac6
--- /dev/null
+++ b/icons/mattermost/mattermost-original-wordmark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 218 218"><g fill="#19191c" fill-rule="evenodd"><path d="M83.9 109.62c0-.546-.093-.992-.273-1.331a2.059 2.059 0 0 0-.75-.8c-.32-.196-.71-.325-1.179-.395a10.99 10.99 0 0 0-1.55-.102c-1.226 0-2.535.238-3.921.715a9.215 9.215 0 0 1-.719-1.668c-.156-.523-.238-1.148-.238-1.878 1-.34 2-.59 3.003-.75 1-.16 1.933-.238 2.797-.238 2.362 0 4.21.566 5.541 1.706 1.332 1.137 1.996 2.953 1.996 5.456v10.232a28.35 28.35 0 0 1-2.898.714c-1.136.23-2.425.344-3.855.344-1.16 0-2.222-.105-3.19-.308-.965-.203-1.797-.547-2.488-1.024a4.78 4.78 0 0 1-1.605-1.843c-.375-.75-.562-1.667-.562-2.76 0-1.09.234-2.008.699-2.746a5.376 5.376 0 0 1 1.808-1.773 7.989 7.989 0 0 1 2.472-.957c.91-.191 1.82-.289 2.73-.289.66 0 1.386.035 2.183.102zm0 3.511c-.273-.047-.57-.086-.886-.117a7.965 7.965 0 0 0-.855-.055c-1.113 0-1.996.2-2.644.598-.648.398-.968 1.043-.968 1.93 0 .589.125 1.042.375 1.362.25.316.55.55.902.699a3.71 3.71 0 0 0 1.124.273c.399.036.746.051 1.043.051.34 0 .68-.027 1.023-.086.34-.054.637-.105.887-.152zm7.936-5.866h-2.218l-.172-.683 6.378-8.15h.785v5.15h4.127c.067.34.114.65.137.922a11.446 11.446 0 0 1 0 1.773c-.023.293-.07.625-.137.988H96.61v6.925c0 .702.058 1.273.171 1.702.114.434.278.773.496 1.023.215.25.48.422.801.512.316.094.691.137 1.125.137.34 0 .675-.028 1.007-.082.328-.059.617-.11.867-.157.16.434.274.883.344 1.348.066.468.101.882.101 1.246 0 .25-.008.46-.02.632a4.91 4.91 0 0 1-.05.492c-1.043.25-2.124.375-3.237.375-2.07 0-3.652-.48-4.741-1.449-1.094-.964-1.637-2.542-1.637-4.721zm12.794 0h-2.214l-.172-.683 6.377-8.15h.785v5.15h4.128c.066.34.113.65.137.922.02.27.03.555.03.852 0 .316-.01.625-.03.921-.024.293-.07.625-.137.988h-4.128v6.925c0 .702.059 1.273.172 1.702.113.434.277.773.492 1.023.219.25.484.422.8.512.32.094.696.137 1.13.137a6.18 6.18 0 0 0 1.003-.082c.332-.059.62-.11.87-.157.16.434.274.883.34 1.348.07.468.102.882.102 1.246 0 .25-.004.46-.016.632a6.306 6.306 0 0 1-.05.492 13.89 13.89 0 0 1-3.242.375c-2.066 0-3.647-.48-4.74-1.449-1.09-.964-1.637-2.542-1.637-4.721zm22.405 3.242c-.047-1.094-.348-1.972-.906-2.644-.555-.672-1.336-1.008-2.336-1.008-1.136 0-2 .32-2.593.957-.59.637-.941 1.535-1.054 2.695zm-6.925 3.374c.09 1.367.57 2.355 1.434 2.968.863.613 2 .922 3.409.922.773 0 1.562-.075 2.37-.223.809-.148 1.574-.36 2.305-.633.25.457.464 1.004.648 1.64.18.637.281 1.317.305 2.047-1.773.68-3.773 1.023-6.003 1.023-1.636 0-3.042-.23-4.214-.683-1.167-.453-2.124-1.086-2.862-1.894-.738-.805-1.285-1.766-1.637-2.882-.355-1.113-.53-2.328-.53-3.648 0-1.296.183-2.511.546-3.651.363-1.137.902-2.125 1.62-2.964a7.603 7.603 0 0 1 2.66-1.996c1.059-.488 2.293-.734 3.702-.734 1.227 0 2.32.215 3.273.648a7.137 7.137 0 0 1 2.437 1.773c.672.75 1.18 1.644 1.52 2.679.343 1.031.51 2.14.51 3.323a15.381 15.381 0 0 1-.167 2.285zm13.345-10.298c.34-.07.664-.121.972-.156.305-.032.64-.051 1.004-.051.344 0 .68.023 1.007.07.328.043.653.102.973.168a2.2 2.2 0 0 1 .187.496 12.72 12.72 0 0 1 .273 1.398c.032.238.063.437.087.598a8.877 8.877 0 0 1 1.839-1.894c.726-.555 1.636-.836 2.73-.836.226 0 .488.012.785.035.293.023.511.059.648.102.043.226.078.488.101.784.024.297.036.602.036.922 0 .387-.02.809-.055 1.262a8.343 8.343 0 0 1-.187 1.296 4.54 4.54 0 0 0-.836-.07h-.563c-.386 0-.816.043-1.296.12-.477.079-.93.29-1.363.634-.434.34-.789.85-1.074 1.534-.285.68-.426 1.637-.426 2.863v8.392a10.7 10.7 0 0 1-1.23.133 20.063 20.063 0 0 1-2.37 0 12.12 12.12 0 0 1-1.242-.133zm12.91 0c.317-.07.637-.121.954-.156a10.881 10.881 0 0 1 2.081 0c.297.035.601.085.922.156a2.1 2.1 0 0 1 .187.492c.055.219.11.445.152.683.047.239.086.473.121.7.036.226.063.421.086.581a5.33 5.33 0 0 1 .715-1.023 5.175 5.175 0 0 1 1.058-.922 5.716 5.716 0 0 1 1.379-.667 5.504 5.504 0 0 1 1.722-.254c2.753 0 4.515 1.046 5.288 3.136.457-.84 1.097-1.574 1.925-2.199.832-.625 1.883-.937 3.156-.937 2.003 0 3.475.55 4.416 1.656.946 1.1 1.418 2.823 1.418 5.166v11.22a14.605 14.605 0 0 1-4.842 0v-9.958c0-1.23-.157-2.172-.461-2.832-.309-.66-.926-.988-1.86-.988-.386 0-.768.055-1.143.168a2.436 2.436 0 0 0-1.024.633c-.304.305-.554.738-.75 1.296-.19.555-.288 1.277-.288 2.164v9.517a14.593 14.593 0 0 1-4.842 0v-9.958c0-1.23-.157-2.172-.462-2.832-.308-.66-.925-.988-1.859-.988a4.12 4.12 0 0 0-1.16.168 2.267 2.267 0 0 0-1.038.668c-.309.328-.555.789-.735 1.379-.183.593-.273 1.366-.273 2.32v9.243a14.605 14.605 0 0 1-4.842 0zm35.441 14.356c1.273 0 2.19-.47 2.745-1.414.559-.945.836-2.3.836-4.077 0-1.773-.277-3.132-.836-4.073-.554-.946-1.472-1.418-2.745-1.418-1.25 0-2.152.472-2.71 1.418-.559.94-.836 2.3-.836 4.073 0 1.777.277 3.132.836 4.077.558.945 1.46 1.414 2.71 1.414zm0 3.686c-1.43 0-2.675-.234-3.733-.699-1.059-.469-1.934-1.117-2.625-1.945-.695-.832-1.218-1.804-1.57-2.917-.351-1.113-.527-2.32-.527-3.616 0-1.293.176-2.511.527-3.648.352-1.136.875-2.12 1.57-2.948.691-.832 1.566-1.484 2.625-1.965 1.058-.476 2.304-.714 3.733-.714 1.433 0 2.683.238 3.753.714 1.07.48 1.956 1.133 2.66 1.965.706.828 1.23 1.812 1.57 2.948.34 1.137.51 2.355.51 3.648 0 1.296-.17 2.503-.51 3.616a8.097 8.097 0 0 1-1.57 2.917c-.704.828-1.59 1.476-2.66 1.945-1.07.465-2.32.7-3.753.7zm14.711-8.084c-1.273-.363-2.269-.906-2.984-1.62-.714-.715-1.073-1.789-1.073-3.222 0-1.73.617-3.082 1.858-4.058 1.238-.98 2.925-1.468 5.066-1.468.886 0 1.76.078 2.624.238.863.16 1.742.398 2.628.719a9.3 9.3 0 0 1-.343 1.839 8.68 8.68 0 0 1-.649 1.671 13.63 13.63 0 0 0-1.808-.597 8.365 8.365 0 0 0-2.078-.254c-.773 0-1.374.117-1.808.355-.433.243-.648.621-.648 1.145 0 .5.152.851.46 1.058.306.203.747.398 1.313.578l1.945.582a9.36 9.36 0 0 1 1.722.664c.512.261.95.586 1.312.972.363.387.649.863.852 1.433.207.567.308 1.262.308 2.078 0 .844-.176 1.628-.527 2.355a5.521 5.521 0 0 1-1.535 1.894c-.672.531-1.484.953-2.44 1.261-.954.305-2.035.461-3.238.461-.547 0-1.047-.02-1.504-.05a12.52 12.52 0 0 1-1.312-.172 16.466 16.466 0 0 1-1.246-.29 14.729 14.729 0 0 1-1.327-.445 9.824 9.824 0 0 1 .324-1.859c.168-.624.39-1.234.664-1.823.75.296 1.46.515 2.132.664.672.148 1.37.222 2.097.222.32 0 .664-.027 1.039-.086.375-.054.722-.16 1.043-.304a2.49 2.49 0 0 0 .8-.582c.215-.238.324-.55.324-.937 0-.547-.164-.938-.496-1.176-.328-.238-.789-.45-1.378-.633zm11.798-6.276h-2.218l-.172-.683 6.377-8.15h.785v5.15h4.128c.07.34.113.65.137.922.023.27.035.555.035.852 0 .316-.012.625-.035.921a8.981 8.981 0 0 1-.137.988h-4.128v6.925c0 .702.059 1.273.172 1.702.113.434.277.773.496 1.023.215.25.48.422.8.512a4.01 4.01 0 0 0 1.125.137c.34 0 .676-.028 1.008-.082.328-.059.617-.11.867-.157.16.434.273.883.343 1.348a9.012 9.012 0 0 1 .086 1.878 6.277 6.277 0 0 1-.054.492 13.86 13.86 0 0 1-3.238.375c-2.07 0-3.651-.48-4.74-1.449-1.09-.964-1.637-2.542-1.637-4.721zM47.539 98.182a20.7 20.7 0 0 1 2.843-.207c.96 0 1.91.07 2.847.207l6.096 12.653 6.28-12.653a14.53 14.53 0 0 1 2.55-.207c.937 0 1.835.07 2.698.207l1.254 23.236a18.35 18.35 0 0 1-2.66.207c-.835 0-1.66-.07-2.472-.207l-.667-16.8-5.394 11.61c-.347.047-.703.09-1.074.121-.367.035-.738.05-1.105.05-.32 0-.64-.01-.96-.03a7.97 7.97 0 0 1-1-.14l-5.022-11.85-.52 17.04a13.47 13.47 0 0 1-2.292.206c-.785 0-1.601-.07-2.437-.207l1.035-23.236M28.43 94.534l.188 3.8c3.081 3.406 4.296 8.225 2.765 12.759-2.293 6.76-9.842 10.317-16.863 7.94-7.026-2.38-10.865-9.788-8.572-16.551 1.538-4.546 5.451-7.643 9.99-8.463l2.448-2.894C10.743 90.918 3.53 95.663.949 103.282c-3.167 9.365 1.851 19.526 11.216 22.698 9.365 3.17 19.526-1.852 22.697-11.216 2.578-7.612-.257-15.746-6.432-20.23"/><path d="m24.04 105.75-.132-5.315-.101-3.058-.07-2.647s.015-1.277-.032-1.578a.482.482 0 0 0-.05-.16c-.005-.004-.009-.012-.012-.016l-.008-.02a.424.424 0 0 0-.528-.171s-.003 0-.003.004a.078.078 0 0 0-.032.015.443.443 0 0 0-.132.09c-.215.211-.98 1.234-.98 1.234l-1.664 2.062-1.941 2.367-3.331 4.14s-1.527 1.909-1.192 4.256c.34 2.347 2.086 3.491 3.437 3.948 1.355.461 3.437.613 5.132-1.046 1.695-1.66 1.64-4.105 1.64-4.105"/></g></svg>
diff --git a/icons/mattermost/mattermost-original.svg b/icons/mattermost/mattermost-original.svg
new file mode 100644
index 00000000..db2e8e78
--- /dev/null
+++ b/icons/mattermost/mattermost-original.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 218 218"><g fill="#19191c" fill-rule="evenodd"><path d="M173.053 20.805 174.2 43.94c18.754 20.72 26.16 50.066 16.821 77.647-13.935 41.168-59.895 62.813-102.648 48.339C45.62 155.453 22.26 110.344 36.196 69.175c9.37-27.675 33.2-46.523 60.805-51.514L111.916.039C65.386-1.219 21.488 27.663 5.784 74.057c-19.297 57.006 11.271 118.861 68.276 138.16 57.005 19.296 118.86-11.273 138.157-68.278 15.68-46.32-1.562-95.846-39.164-123.134"/><path d="m146.331 89.07-.789-32.342-.632-18.61-.43-16.126s.09-7.772-.183-9.6a2.907 2.907 0 0 0-.32-.972c-.02-.035-.036-.074-.055-.113-.02-.036-.043-.067-.063-.102a2.525 2.525 0 0 0-1.375-1.136 2.524 2.524 0 0 0-1.816.085c-.015.004-.023.008-.035.012a4.55 4.55 0 0 0-.195.098 3.036 3.036 0 0 0-.793.55c-1.328 1.29-5.98 7.519-5.98 7.519L123.532 30.88l-11.806 14.396L91.45 70.491s-9.303 11.612-7.248 25.906c2.054 14.29 12.68 21.254 20.925 24.043 8.24 2.792 20.91 3.714 31.229-6.39 10.314-10.104 9.974-24.98 9.974-24.98"/></g></svg>