diff --git a/electron-builder.json b/electron-builder.json
index dbd750f2..4d7516e1 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -6,7 +6,7 @@
   "appId": "Mattermost.Desktop",
   "artifactName": "${name}-${version}-${os}-${arch}.${ext}",
   "directories": {
-    "buildResources": "resources",
+    "buildResources": "src/assets",
     "output": "release"
   },
   "extraMetadata": {
@@ -57,7 +57,7 @@
         "from": "resources/linux",
         "filter": [
           "create_desktop_file.sh",
-          "icon.svg",
+          "app_icon.png",
           "README.md"
         ]
       }
@@ -105,7 +105,7 @@
     "iconTextSize": 13
   },
   "squirrelWindows": {
-    "iconUrl": "file://resources/icon.ico",
+    "iconUrl": "file://src/assets/icon.ico",
     "artifactName": "${name}-setup-${version}-${arch}.${ext}"
   },
   "win": {
diff --git a/resources/icon.icns b/resources/icon.icns
deleted file mode 100644
index 3cd7d4ef..00000000
Binary files a/resources/icon.icns and /dev/null differ
diff --git a/resources/icon.ico b/resources/icon.ico
deleted file mode 100644
index ee73f815..00000000
Binary files a/resources/icon.ico and /dev/null differ
diff --git a/resources/osx/ClickedMenuIcon.svg b/resources/osx/ClickedMenuIcon.svg
deleted file mode 100644
index 36de34c9..00000000
--- a/resources/osx/ClickedMenuIcon.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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"
-   x="0px"
-   y="0px"
-   viewBox="0 0 500 500"
-   style="enable-background:new 0 0 500 500;"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ClickedMenuIcon.svg"><metadata
-     id="metadata14"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs12" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1342"
-     inkscape:window-height="773"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="0.472"
-     inkscape:cx="-312.89678"
-     inkscape:cy="250"
-     inkscape:window-x="485"
-     inkscape:window-y="333"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" /><style
-     type="text/css"
-     id="style4"> .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#222222;} </style><g
-     id="XMLID_1_"
-     style="fill:#ffffff;fill-opacity:1;stroke:none"
-     transform="matrix(0.99998928,0,0,0.99998928,-0.01497322,0.02529433)"><g
-       id="XMLID_3_"
-       style="fill:#ffffff;fill-opacity:1;stroke:none"><path
-         id="XMLID_4_"
-         class="st0"
-         d="m 396.9,47.7 2.6,53.1 c 43,47.5 60,114.8 38.6,178.1 C 406.1,373.3 300.7,423 202.7,389.8 104.7,356.6 51.1,253.1 83,158.7 104.5,95.2 159.2,52 222.5,40.5 L 256.7,0.1 C 150,-2.8 49.3,63.4 13.3,169.9 -31,300.6 39.1,442.5 169.9,486.7 300.7,530.9 442.5,460.9 486.8,330.1 522.7,223.9 483.1,110.3 396.9,47.7 Z"
-         style="clip-rule:evenodd;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-         inkscape:connector-curvature="0" /></g><path
-       id="XMLID_2_"
-       class="st0"
-       d="m 335.6,204.3 -1.8,-74.2 -1.5,-42.7 -1,-37 c 0,0 0.2,-17.8 -0.4,-22 -0.1,-0.9 -0.4,-1.6 -0.7,-2.2 0,-0.1 -0.1,-0.2 -0.1,-0.3 0,-0.1 -0.1,-0.2 -0.1,-0.2 -0.7,-1.2 -1.8,-2.1 -3.1,-2.6 -1.4,-0.5 -2.9,-0.4 -4.2,0.2 0,0 -0.1,0 -0.1,0 -0.2,0.1 -0.3,0.1 -0.4,0.2 -0.6,0.3 -1.2,0.7 -1.8,1.3 -3,3 -13.7,17.2 -13.7,17.2 l -23.2,28.8 -27.1,33 -46.5,57.8 c 0,0 -21.3,26.6 -16.6,59.4 4.7,32.8 29.1,48.7 48,55.1 18.9,6.4 48,8.5 71.6,-14.7 23.5,-23 22.7,-57.1 22.7,-57.1 z"
-       style="clip-rule:evenodd;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/resources/osx/ClickedMenuIconMention.svg b/resources/osx/ClickedMenuIconMention.svg
deleted file mode 100644
index 12125217..00000000
--- a/resources/osx/ClickedMenuIconMention.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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"
-   x="0px"
-   y="0px"
-   viewBox="0 0 500 500"
-   style="enable-background:new 0 0 500 500;"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ClickedMenuIconMention.svg"><metadata
-     id="metadata14"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs12"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4148"><g
-         id="g4150"
-         style="fill:#000000;fill-opacity:0.70196078;stroke:none"
-         transform="matrix(0.99998928,0,0,0.99998928,-0.01497322,0.02529433)"><g
-           id="g4152"
-           style="fill:#000000;fill-opacity:0.70196078;stroke:none"><path
-             id="path4154"
-             class="st0"
-             d="m 396.9,47.7 2.6,53.1 c 43,47.5 60,114.8 38.6,178.1 C 406.1,373.3 300.7,423 202.7,389.8 104.7,356.6 51.1,253.1 83,158.7 104.5,95.2 159.2,52 222.5,40.5 L 256.7,0.1 C 150,-2.8 49.3,63.4 13.3,169.9 -31,300.6 39.1,442.5 169.9,486.7 300.7,530.9 442.5,460.9 486.8,330.1 522.7,223.9 483.1,110.3 396.9,47.7 Z"
-             style="clip-rule:evenodd;fill:#000000;fill-opacity:0.70196078;fill-rule:evenodd;stroke:none"
-             inkscape:connector-curvature="0" /></g><path
-           id="path4156"
-           class="st0"
-           d="m 335.6,204.3 -1.8,-74.2 -1.5,-42.7 -1,-37 c 0,0 0.2,-17.8 -0.4,-22 -0.1,-0.9 -0.4,-1.6 -0.7,-2.2 0,-0.1 -0.1,-0.2 -0.1,-0.3 0,-0.1 -0.1,-0.2 -0.1,-0.2 -0.7,-1.2 -1.8,-2.1 -3.1,-2.6 -1.4,-0.5 -2.9,-0.4 -4.2,0.2 0,0 -0.1,0 -0.1,0 -0.2,0.1 -0.3,0.1 -0.4,0.2 -0.6,0.3 -1.2,0.7 -1.8,1.3 -3,3 -13.7,17.2 -13.7,17.2 l -23.2,28.8 -27.1,33 -46.5,57.8 c 0,0 -21.3,26.6 -16.6,59.4 4.7,32.8 29.1,48.7 48,55.1 18.9,6.4 48,8.5 71.6,-14.7 23.5,-23 22.7,-57.1 22.7,-57.1 z"
-           style="clip-rule:evenodd;fill:#000000;fill-opacity:0.70196078;fill-rule:evenodd;stroke:none"
-           inkscape:connector-curvature="0" /></g></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1278"
-     inkscape:window-height="1368"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="0.472"
-     inkscape:cx="-382.01244"
-     inkscape:cy="250"
-     inkscape:window-x="1273"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" /><style
-     type="text/css"
-     id="style4"> .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#222222;} </style><path
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M -62.5 -62.5 L -62.5 562.5 L 562.5 562.5 L 562.5 -62.5 L -62.5 -62.5 z M 343.75 156.25 A 187.5 187.5 0 0 1 531.25 343.75 A 187.5 187.5 0 0 1 343.75 531.25 A 187.5 187.5 0 0 1 156.25 343.75 A 187.5 187.5 0 0 1 343.75 156.25 z "
-     id="rect4141"
-     clip-path="url(#clipPath4148)" /><circle
-     style="opacity:1;fill:#ff1744;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path4137"
-     cx="343.75"
-     cy="343.75"
-     r="156.25" /></svg>
\ No newline at end of file
diff --git a/resources/osx/ClickedMenuIconUnread.svg b/resources/osx/ClickedMenuIconUnread.svg
deleted file mode 100644
index bab613cb..00000000
--- a/resources/osx/ClickedMenuIconUnread.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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"
-   x="0px"
-   y="0px"
-   viewBox="0 0 500 500"
-   style="enable-background:new 0 0 500 500;"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ClickedMenuIconUnread.svg"><metadata
-     id="metadata14"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs12"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4148"><g
-         id="g4150"
-         style="fill:#000000;fill-opacity:0.70196078;stroke:none"
-         transform="matrix(0.99998928,0,0,0.99998928,-0.01497322,0.02529433)"><g
-           id="g4152"
-           style="fill:#000000;fill-opacity:0.70196078;stroke:none"><path
-             id="path4154"
-             class="st0"
-             d="m 396.9,47.7 2.6,53.1 c 43,47.5 60,114.8 38.6,178.1 C 406.1,373.3 300.7,423 202.7,389.8 104.7,356.6 51.1,253.1 83,158.7 104.5,95.2 159.2,52 222.5,40.5 L 256.7,0.1 C 150,-2.8 49.3,63.4 13.3,169.9 -31,300.6 39.1,442.5 169.9,486.7 300.7,530.9 442.5,460.9 486.8,330.1 522.7,223.9 483.1,110.3 396.9,47.7 Z"
-             style="clip-rule:evenodd;fill:#000000;fill-opacity:0.70196078;fill-rule:evenodd;stroke:none"
-             inkscape:connector-curvature="0" /></g><path
-           id="path4156"
-           class="st0"
-           d="m 335.6,204.3 -1.8,-74.2 -1.5,-42.7 -1,-37 c 0,0 0.2,-17.8 -0.4,-22 -0.1,-0.9 -0.4,-1.6 -0.7,-2.2 0,-0.1 -0.1,-0.2 -0.1,-0.3 0,-0.1 -0.1,-0.2 -0.1,-0.2 -0.7,-1.2 -1.8,-2.1 -3.1,-2.6 -1.4,-0.5 -2.9,-0.4 -4.2,0.2 0,0 -0.1,0 -0.1,0 -0.2,0.1 -0.3,0.1 -0.4,0.2 -0.6,0.3 -1.2,0.7 -1.8,1.3 -3,3 -13.7,17.2 -13.7,17.2 l -23.2,28.8 -27.1,33 -46.5,57.8 c 0,0 -21.3,26.6 -16.6,59.4 4.7,32.8 29.1,48.7 48,55.1 18.9,6.4 48,8.5 71.6,-14.7 23.5,-23 22.7,-57.1 22.7,-57.1 z"
-           style="clip-rule:evenodd;fill:#000000;fill-opacity:0.70196078;fill-rule:evenodd;stroke:none"
-           inkscape:connector-curvature="0" /></g></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1278"
-     inkscape:window-height="1368"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="0.472"
-     inkscape:cx="-382.01244"
-     inkscape:cy="250"
-     inkscape:window-x="1273"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" /><style
-     type="text/css"
-     id="style4"> .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#222222;} </style><path
-     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M -62.5 -62.5 L -62.5 562.5 L 562.5 562.5 L 562.5 -62.5 L -62.5 -62.5 z M 343.75 156.25 A 187.5 187.5 0 0 1 531.25 343.75 A 187.5 187.5 0 0 1 343.75 531.25 A 187.5 187.5 0 0 1 156.25 343.75 A 187.5 187.5 0 0 1 343.75 156.25 z "
-     id="rect4141"
-     clip-path="url(#clipPath4148)" /><circle
-     style="opacity:1;fill:#00e5ff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path4137"
-     cx="343.75"
-     cy="343.75"
-     r="156.25" /></svg>
\ No newline at end of file
diff --git a/resources/osx/DMG_BG.png b/resources/osx/DMG_BG.png
deleted file mode 100644
index 41113749..00000000
Binary files a/resources/osx/DMG_BG.png and /dev/null differ
diff --git a/resources/osx/MenuIcon.svg b/resources/osx/MenuIcon.svg
deleted file mode 100644
index 10627108..00000000
--- a/resources/osx/MenuIcon.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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"
-   x="0px"
-   y="0px"
-   viewBox="0 0 500 500"
-   style="enable-background:new 0 0 500 500;"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="MenuIcon.svg"><metadata
-     id="metadata14"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs12" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1342"
-     inkscape:window-height="773"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="0.472"
-     inkscape:cx="-337.92373"
-     inkscape:cy="250"
-     inkscape:window-x="485"
-     inkscape:window-y="333"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" /><style
-     type="text/css"
-     id="style4"> .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#222222;} </style><g
-     id="XMLID_1_"
-     style="fill:#000000;fill-opacity:0.70196078;stroke:none"
-     transform="matrix(0.99998928,0,0,0.99998928,-0.01497322,0.02529433)"><g
-       id="XMLID_3_"
-       style="fill:#000000;fill-opacity:0.70196078;stroke:none"><path
-         id="XMLID_4_"
-         class="st0"
-         d="m 396.9,47.7 2.6,53.1 c 43,47.5 60,114.8 38.6,178.1 C 406.1,373.3 300.7,423 202.7,389.8 104.7,356.6 51.1,253.1 83,158.7 104.5,95.2 159.2,52 222.5,40.5 L 256.7,0.1 C 150,-2.8 49.3,63.4 13.3,169.9 -31,300.6 39.1,442.5 169.9,486.7 300.7,530.9 442.5,460.9 486.8,330.1 522.7,223.9 483.1,110.3 396.9,47.7 Z"
-         style="clip-rule:evenodd;fill:#000000;fill-opacity:0.70196078;fill-rule:evenodd;stroke:none"
-         inkscape:connector-curvature="0" /></g><path
-       id="XMLID_2_"
-       class="st0"
-       d="m 335.6,204.3 -1.8,-74.2 -1.5,-42.7 -1,-37 c 0,0 0.2,-17.8 -0.4,-22 -0.1,-0.9 -0.4,-1.6 -0.7,-2.2 0,-0.1 -0.1,-0.2 -0.1,-0.3 0,-0.1 -0.1,-0.2 -0.1,-0.2 -0.7,-1.2 -1.8,-2.1 -3.1,-2.6 -1.4,-0.5 -2.9,-0.4 -4.2,0.2 0,0 -0.1,0 -0.1,0 -0.2,0.1 -0.3,0.1 -0.4,0.2 -0.6,0.3 -1.2,0.7 -1.8,1.3 -3,3 -13.7,17.2 -13.7,17.2 l -23.2,28.8 -27.1,33 -46.5,57.8 c 0,0 -21.3,26.6 -16.6,59.4 4.7,32.8 29.1,48.7 48,55.1 18.9,6.4 48,8.5 71.6,-14.7 23.5,-23 22.7,-57.1 22.7,-57.1 z"
-       style="clip-rule:evenodd;fill:#000000;fill-opacity:0.70196078;fill-rule:evenodd;stroke:none"
-       inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/resources/osx/MenuIconMention.svg b/resources/osx/MenuIconMention.svg
deleted file mode 100644
index 6a97864a..00000000
--- a/resources/osx/MenuIconMention.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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"
-   x="0px"
-   y="0px"
-   viewBox="0 0 500 500"
-   style="enable-background:new 0 0 500 500;"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="MenuIconMention.svg"><metadata
-     id="metadata14"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs12"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4148"><g
-         id="g4150"
-         style="fill:#000000;fill-opacity:0.70196078;stroke:none"
-         transform="matrix(0.99998928,0,0,0.99998928,-0.01497322,0.02529433)"><g
-           id="g4152"
-           style="fill:#000000;fill-opacity:0.70196078;stroke:none"><path
-             id="path4154"
-             class="st0"
-             d="m 396.9,47.7 2.6,53.1 c 43,47.5 60,114.8 38.6,178.1 C 406.1,373.3 300.7,423 202.7,389.8 104.7,356.6 51.1,253.1 83,158.7 104.5,95.2 159.2,52 222.5,40.5 L 256.7,0.1 C 150,-2.8 49.3,63.4 13.3,169.9 -31,300.6 39.1,442.5 169.9,486.7 300.7,530.9 442.5,460.9 486.8,330.1 522.7,223.9 483.1,110.3 396.9,47.7 Z"
-             style="clip-rule:evenodd;fill:#000000;fill-opacity:0.70196078;fill-rule:evenodd;stroke:none"
-             inkscape:connector-curvature="0" /></g><path
-           id="path4156"
-           class="st0"
-           d="m 335.6,204.3 -1.8,-74.2 -1.5,-42.7 -1,-37 c 0,0 0.2,-17.8 -0.4,-22 -0.1,-0.9 -0.4,-1.6 -0.7,-2.2 0,-0.1 -0.1,-0.2 -0.1,-0.3 0,-0.1 -0.1,-0.2 -0.1,-0.2 -0.7,-1.2 -1.8,-2.1 -3.1,-2.6 -1.4,-0.5 -2.9,-0.4 -4.2,0.2 0,0 -0.1,0 -0.1,0 -0.2,0.1 -0.3,0.1 -0.4,0.2 -0.6,0.3 -1.2,0.7 -1.8,1.3 -3,3 -13.7,17.2 -13.7,17.2 l -23.2,28.8 -27.1,33 -46.5,57.8 c 0,0 -21.3,26.6 -16.6,59.4 4.7,32.8 29.1,48.7 48,55.1 18.9,6.4 48,8.5 71.6,-14.7 23.5,-23 22.7,-57.1 22.7,-57.1 z"
-           style="clip-rule:evenodd;fill:#000000;fill-opacity:0.70196078;fill-rule:evenodd;stroke:none"
-           inkscape:connector-curvature="0" /></g></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1278"
-     inkscape:window-height="1368"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="0.472"
-     inkscape:cx="-2.7751473"
-     inkscape:cy="250"
-     inkscape:window-x="1273"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" /><style
-     type="text/css"
-     id="style4"> .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#222222;} </style><path
-     style="opacity:1;fill:#000000;fill-opacity:0.7019608;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M -62.5 -62.5 L -62.5 562.5 L 562.5 562.5 L 562.5 -62.5 L -62.5 -62.5 z M 343.75 156.25 A 187.5 187.5 0 0 1 531.25 343.75 A 187.5 187.5 0 0 1 343.75 531.25 A 187.5 187.5 0 0 1 156.25 343.75 A 187.5 187.5 0 0 1 343.75 156.25 z "
-     id="rect4141"
-     clip-path="url(#clipPath4148)" /><circle
-     style="opacity:1;fill:#ff1744;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path4137"
-     cx="343.75"
-     cy="343.75"
-     r="156.25" /></svg>
\ No newline at end of file
diff --git a/resources/osx/MenuIconUnread.svg b/resources/osx/MenuIconUnread.svg
deleted file mode 100644
index e80d0860..00000000
--- a/resources/osx/MenuIconUnread.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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"
-   x="0px"
-   y="0px"
-   viewBox="0 0 500 500"
-   style="enable-background:new 0 0 500 500;"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="MenuIconUnread.svg"><metadata
-     id="metadata14"><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="defs12"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4148"><g
-         id="g4150"
-         style="fill:#000000;fill-opacity:0.70196078;stroke:none"
-         transform="matrix(0.99998928,0,0,0.99998928,-0.01497322,0.02529433)"><g
-           id="g4152"
-           style="fill:#000000;fill-opacity:0.70196078;stroke:none"><path
-             id="path4154"
-             class="st0"
-             d="m 396.9,47.7 2.6,53.1 c 43,47.5 60,114.8 38.6,178.1 C 406.1,373.3 300.7,423 202.7,389.8 104.7,356.6 51.1,253.1 83,158.7 104.5,95.2 159.2,52 222.5,40.5 L 256.7,0.1 C 150,-2.8 49.3,63.4 13.3,169.9 -31,300.6 39.1,442.5 169.9,486.7 300.7,530.9 442.5,460.9 486.8,330.1 522.7,223.9 483.1,110.3 396.9,47.7 Z"
-             style="clip-rule:evenodd;fill:#000000;fill-opacity:0.70196078;fill-rule:evenodd;stroke:none"
-             inkscape:connector-curvature="0" /></g><path
-           id="path4156"
-           class="st0"
-           d="m 335.6,204.3 -1.8,-74.2 -1.5,-42.7 -1,-37 c 0,0 0.2,-17.8 -0.4,-22 -0.1,-0.9 -0.4,-1.6 -0.7,-2.2 0,-0.1 -0.1,-0.2 -0.1,-0.3 0,-0.1 -0.1,-0.2 -0.1,-0.2 -0.7,-1.2 -1.8,-2.1 -3.1,-2.6 -1.4,-0.5 -2.9,-0.4 -4.2,0.2 0,0 -0.1,0 -0.1,0 -0.2,0.1 -0.3,0.1 -0.4,0.2 -0.6,0.3 -1.2,0.7 -1.8,1.3 -3,3 -13.7,17.2 -13.7,17.2 l -23.2,28.8 -27.1,33 -46.5,57.8 c 0,0 -21.3,26.6 -16.6,59.4 4.7,32.8 29.1,48.7 48,55.1 18.9,6.4 48,8.5 71.6,-14.7 23.5,-23 22.7,-57.1 22.7,-57.1 z"
-           style="clip-rule:evenodd;fill:#000000;fill-opacity:0.70196078;fill-rule:evenodd;stroke:none"
-           inkscape:connector-curvature="0" /></g></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1278"
-     inkscape:window-height="1368"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="0.472"
-     inkscape:cx="-2.7751473"
-     inkscape:cy="250"
-     inkscape:window-x="1273"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" /><style
-     type="text/css"
-     id="style4"> .st0{fill-rule:evenodd;clip-rule:evenodd;fill:#222222;} </style><path
-     style="opacity:1;fill:#000000;fill-opacity:0.7019608;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M -62.5 -62.5 L -62.5 562.5 L 562.5 562.5 L 562.5 -62.5 L -62.5 -62.5 z M 343.75 156.25 A 187.5 187.5 0 0 1 531.25 343.75 A 187.5 187.5 0 0 1 343.75 531.25 A 187.5 187.5 0 0 1 156.25 343.75 A 187.5 187.5 0 0 1 343.75 156.25 z "
-     id="rect4141"
-     clip-path="url(#clipPath4148)" /><circle
-     style="opacity:1;fill:#00e5ff;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path4137"
-     cx="343.75"
-     cy="343.75"
-     r="156.25" /></svg>
\ No newline at end of file
diff --git a/src/assets/appicon.png b/src/assets/appicon.png
deleted file mode 100644
index 5b370618..00000000
Binary files a/src/assets/appicon.png and /dev/null differ
diff --git a/src/assets/appicon_48.png b/src/assets/appicon_48.png
index 5ff3a8d2..904db094 100644
Binary files a/src/assets/appicon_48.png and b/src/assets/appicon_48.png differ
diff --git a/src/assets/icon.icns b/src/assets/icon.icns
new file mode 100644
index 00000000..28058f81
Binary files /dev/null and b/src/assets/icon.icns differ
diff --git a/src/assets/icon.ico b/src/assets/icon.ico
new file mode 100644
index 00000000..0e6aff75
Binary files /dev/null and b/src/assets/icon.ico differ
diff --git a/resources/linux/README.md b/src/assets/linux/README.md
similarity index 100%
rename from resources/linux/README.md
rename to src/assets/linux/README.md
diff --git a/src/assets/linux/app_icon.png b/src/assets/linux/app_icon.png
new file mode 100644
index 00000000..85ace081
Binary files /dev/null and b/src/assets/linux/app_icon.png differ
diff --git a/resources/linux/create_desktop_file.sh b/src/assets/linux/create_desktop_file.sh
similarity index 92%
rename from resources/linux/create_desktop_file.sh
rename to src/assets/linux/create_desktop_file.sh
index 2c1cd3b5..f958db12 100755
--- a/resources/linux/create_desktop_file.sh
+++ b/src/assets/linux/create_desktop_file.sh
@@ -12,7 +12,7 @@ Comment=Mattermost Desktop application for Linux
 Exec="${FULL_PATH}/mattermost-desktop"
 Terminal=false
 Type=Application
-Icon=${FULL_PATH}/icon.svg
+Icon=${FULL_PATH}/app_icon.png
 Categories=Network;InstantMessaging;
 EOS
 chmod +x Mattermost.desktop
diff --git a/src/assets/linux/dark/MenuIcon.png b/src/assets/linux/dark/MenuIcon.png
new file mode 100644
index 00000000..6c45895c
Binary files /dev/null and b/src/assets/linux/dark/MenuIcon.png differ
diff --git a/src/assets/linux/dark/MenuIcon@2x.png b/src/assets/linux/dark/MenuIcon@2x.png
new file mode 100644
index 00000000..6bbabb47
Binary files /dev/null and b/src/assets/linux/dark/MenuIcon@2x.png differ
diff --git a/src/assets/linux/dark/MenuIconMention.png b/src/assets/linux/dark/MenuIconMention.png
new file mode 100644
index 00000000..780ace3c
Binary files /dev/null and b/src/assets/linux/dark/MenuIconMention.png differ
diff --git a/src/assets/linux/dark/MenuIconMention@2x.png b/src/assets/linux/dark/MenuIconMention@2x.png
new file mode 100644
index 00000000..0ab83c6e
Binary files /dev/null and b/src/assets/linux/dark/MenuIconMention@2x.png differ
diff --git a/src/assets/linux/dark/MenuIconMentionTemplate.png b/src/assets/linux/dark/MenuIconMentionTemplate.png
deleted file mode 100755
index dd4eaa03..00000000
Binary files a/src/assets/linux/dark/MenuIconMentionTemplate.png and /dev/null differ
diff --git a/src/assets/linux/dark/MenuIconTemplate.png b/src/assets/linux/dark/MenuIconTemplate.png
deleted file mode 100755
index c1f634af..00000000
Binary files a/src/assets/linux/dark/MenuIconTemplate.png and /dev/null differ
diff --git a/src/assets/linux/dark/MenuIconUnread.png b/src/assets/linux/dark/MenuIconUnread.png
new file mode 100644
index 00000000..bdbe61bf
Binary files /dev/null and b/src/assets/linux/dark/MenuIconUnread.png differ
diff --git a/src/assets/linux/dark/MenuIconUnread@2x.png b/src/assets/linux/dark/MenuIconUnread@2x.png
new file mode 100644
index 00000000..554eedde
Binary files /dev/null and b/src/assets/linux/dark/MenuIconUnread@2x.png differ
diff --git a/src/assets/linux/dark/MenuIconUnreadTemplate.png b/src/assets/linux/dark/MenuIconUnreadTemplate.png
deleted file mode 100755
index 345cd8ec..00000000
Binary files a/src/assets/linux/dark/MenuIconUnreadTemplate.png and /dev/null differ
diff --git a/resources/linux/icon.svg b/src/assets/linux/icon.svg
similarity index 100%
rename from resources/linux/icon.svg
rename to src/assets/linux/icon.svg
diff --git a/src/assets/linux/light/MenuIcon.png b/src/assets/linux/light/MenuIcon.png
new file mode 100644
index 00000000..6c8bcaab
Binary files /dev/null and b/src/assets/linux/light/MenuIcon.png differ
diff --git a/src/assets/linux/light/MenuIcon@2x.png b/src/assets/linux/light/MenuIcon@2x.png
new file mode 100644
index 00000000..898b2eff
Binary files /dev/null and b/src/assets/linux/light/MenuIcon@2x.png differ
diff --git a/src/assets/linux/light/MenuIconMention.png b/src/assets/linux/light/MenuIconMention.png
new file mode 100644
index 00000000..c97aa252
Binary files /dev/null and b/src/assets/linux/light/MenuIconMention.png differ
diff --git a/src/assets/linux/light/MenuIconMention@2x.png b/src/assets/linux/light/MenuIconMention@2x.png
new file mode 100644
index 00000000..50a9f776
Binary files /dev/null and b/src/assets/linux/light/MenuIconMention@2x.png differ
diff --git a/src/assets/linux/light/MenuIconMentionTemplate.png b/src/assets/linux/light/MenuIconMentionTemplate.png
deleted file mode 100755
index dd51262e..00000000
Binary files a/src/assets/linux/light/MenuIconMentionTemplate.png and /dev/null differ
diff --git a/src/assets/linux/light/MenuIconTemplate.png b/src/assets/linux/light/MenuIconTemplate.png
deleted file mode 100755
index 1cbbb063..00000000
Binary files a/src/assets/linux/light/MenuIconTemplate.png and /dev/null differ
diff --git a/src/assets/linux/light/MenuIconUnread.png b/src/assets/linux/light/MenuIconUnread.png
new file mode 100644
index 00000000..d1ef2bd8
Binary files /dev/null and b/src/assets/linux/light/MenuIconUnread.png differ
diff --git a/src/assets/linux/light/MenuIconUnread@2x.png b/src/assets/linux/light/MenuIconUnread@2x.png
new file mode 100644
index 00000000..0f20d1e8
Binary files /dev/null and b/src/assets/linux/light/MenuIconUnread@2x.png differ
diff --git a/src/assets/linux/light/MenuIconUnreadTemplate.png b/src/assets/linux/light/MenuIconUnreadTemplate.png
deleted file mode 100755
index 857e7d6b..00000000
Binary files a/src/assets/linux/light/MenuIconUnreadTemplate.png and /dev/null differ
diff --git a/src/assets/osx/ClickedMenuIcon.png b/src/assets/osx/ClickedMenuIcon.png
deleted file mode 100755
index b0e18062..00000000
Binary files a/src/assets/osx/ClickedMenuIcon.png and /dev/null differ
diff --git a/src/assets/osx/ClickedMenuIcon@2x.png b/src/assets/osx/ClickedMenuIcon@2x.png
deleted file mode 100755
index c97e02af..00000000
Binary files a/src/assets/osx/ClickedMenuIcon@2x.png and /dev/null differ
diff --git a/src/assets/osx/ClickedMenuIconMention.png b/src/assets/osx/ClickedMenuIconMention.png
deleted file mode 100755
index 695e0190..00000000
Binary files a/src/assets/osx/ClickedMenuIconMention.png and /dev/null differ
diff --git a/src/assets/osx/ClickedMenuIconMention@2x.png b/src/assets/osx/ClickedMenuIconMention@2x.png
deleted file mode 100755
index 20b75ebc..00000000
Binary files a/src/assets/osx/ClickedMenuIconMention@2x.png and /dev/null differ
diff --git a/src/assets/osx/ClickedMenuIconUnread.png b/src/assets/osx/ClickedMenuIconUnread.png
deleted file mode 100755
index 0593ea37..00000000
Binary files a/src/assets/osx/ClickedMenuIconUnread.png and /dev/null differ
diff --git a/src/assets/osx/ClickedMenuIconUnread@2x.png b/src/assets/osx/ClickedMenuIconUnread@2x.png
deleted file mode 100755
index 04d3cfe8..00000000
Binary files a/src/assets/osx/ClickedMenuIconUnread@2x.png and /dev/null differ
diff --git a/src/assets/osx/MenuIcon.png b/src/assets/osx/MenuIcon.png
deleted file mode 100755
index 6a51c1bf..00000000
Binary files a/src/assets/osx/MenuIcon.png and /dev/null differ
diff --git a/src/assets/osx/MenuIcon@2x.png b/src/assets/osx/MenuIcon@2x.png
deleted file mode 100755
index d6317c1f..00000000
Binary files a/src/assets/osx/MenuIcon@2x.png and /dev/null differ
diff --git a/src/assets/osx/MenuIconMention.png b/src/assets/osx/MenuIconMention.png
deleted file mode 100755
index 5453b009..00000000
Binary files a/src/assets/osx/MenuIconMention.png and /dev/null differ
diff --git a/src/assets/osx/MenuIconMention@2x.png b/src/assets/osx/MenuIconMention@2x.png
deleted file mode 100755
index be97e00e..00000000
Binary files a/src/assets/osx/MenuIconMention@2x.png and /dev/null differ
diff --git a/src/assets/osx/MenuIconUnread.png b/src/assets/osx/MenuIconUnread.png
deleted file mode 100755
index cfff033b..00000000
Binary files a/src/assets/osx/MenuIconUnread.png and /dev/null differ
diff --git a/src/assets/osx/MenuIconUnread@2x.png b/src/assets/osx/MenuIconUnread@2x.png
deleted file mode 100755
index 21d8955d..00000000
Binary files a/src/assets/osx/MenuIconUnread@2x.png and /dev/null differ
diff --git a/src/assets/osx/menuIcons/MenuIcon16Template.png b/src/assets/osx/menuIcons/MenuIcon16Template.png
new file mode 100644
index 00000000..3097a540
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIcon16Template.png differ
diff --git a/src/assets/osx/menuIcons/MenuIcon16Template@2x.png b/src/assets/osx/menuIcons/MenuIcon16Template@2x.png
new file mode 100644
index 00000000..08fe8484
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIcon16Template@2x.png differ
diff --git a/src/assets/osx/menuIcons/MenuIcon20Template.png b/src/assets/osx/menuIcons/MenuIcon20Template.png
new file mode 100644
index 00000000..55d8d9bc
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIcon20Template.png differ
diff --git a/src/assets/osx/menuIcons/MenuIcon20Template@2x.png b/src/assets/osx/menuIcons/MenuIcon20Template@2x.png
new file mode 100644
index 00000000..7e8f7e10
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIcon20Template@2x.png differ
diff --git a/src/assets/osx/menuIcons/MenuIcon24Template.png b/src/assets/osx/menuIcons/MenuIcon24Template.png
new file mode 100644
index 00000000..c3739db3
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIcon24Template.png differ
diff --git a/src/assets/osx/menuIcons/MenuIcon24Template@2x.png b/src/assets/osx/menuIcons/MenuIcon24Template@2x.png
new file mode 100644
index 00000000..aaa86ef1
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIcon24Template@2x.png differ
diff --git a/src/assets/osx/menuIcons/MenuIcon32Template.png b/src/assets/osx/menuIcons/MenuIcon32Template.png
new file mode 100644
index 00000000..d41afaa8
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIcon32Template.png differ
diff --git a/src/assets/osx/menuIcons/MenuIcon32Template@2x.png b/src/assets/osx/menuIcons/MenuIcon32Template@2x.png
new file mode 100644
index 00000000..882663d6
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIcon32Template@2x.png differ
diff --git a/src/assets/osx/menuIcons/MenuIconUnread16Template.png b/src/assets/osx/menuIcons/MenuIconUnread16Template.png
new file mode 100644
index 00000000..6de30fa0
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIconUnread16Template.png differ
diff --git a/src/assets/osx/menuIcons/MenuIconUnread16Template@2x.png b/src/assets/osx/menuIcons/MenuIconUnread16Template@2x.png
new file mode 100644
index 00000000..dda0f627
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIconUnread16Template@2x.png differ
diff --git a/src/assets/osx/menuIcons/MenuIconUnread20Template.png b/src/assets/osx/menuIcons/MenuIconUnread20Template.png
new file mode 100644
index 00000000..324ee4f7
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIconUnread20Template.png differ
diff --git a/src/assets/osx/menuIcons/MenuIconUnread20Template@2x.png b/src/assets/osx/menuIcons/MenuIconUnread20Template@2x.png
new file mode 100644
index 00000000..9ca4cb55
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIconUnread20Template@2x.png differ
diff --git a/src/assets/osx/menuIcons/MenuIconUnread24Template.png b/src/assets/osx/menuIcons/MenuIconUnread24Template.png
new file mode 100644
index 00000000..15b168fa
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIconUnread24Template.png differ
diff --git a/src/assets/osx/menuIcons/MenuIconUnread24Template@2x.png b/src/assets/osx/menuIcons/MenuIconUnread24Template@2x.png
new file mode 100644
index 00000000..c437191e
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIconUnread24Template@2x.png differ
diff --git a/src/assets/osx/menuIcons/MenuIconUnread32Template.png b/src/assets/osx/menuIcons/MenuIconUnread32Template.png
new file mode 100644
index 00000000..9fc9930f
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIconUnread32Template.png differ
diff --git a/src/assets/osx/menuIcons/MenuIconUnread32Template@2x.png b/src/assets/osx/menuIcons/MenuIconUnread32Template@2x.png
new file mode 100644
index 00000000..88484517
Binary files /dev/null and b/src/assets/osx/menuIcons/MenuIconUnread32Template@2x.png differ
diff --git a/src/assets/windows/tray.ico b/src/assets/windows/tray.ico
index 1f7102f0..3ea9753e 100644
Binary files a/src/assets/windows/tray.ico and b/src/assets/windows/tray.ico differ
diff --git a/src/assets/windows/tray@2x.ico b/src/assets/windows/tray@2x.ico
new file mode 100644
index 00000000..77b80b98
Binary files /dev/null and b/src/assets/windows/tray@2x.ico differ
diff --git a/src/assets/windows/tray_mention.ico b/src/assets/windows/tray_mention.ico
index 6b56c7aa..8fc018c5 100644
Binary files a/src/assets/windows/tray_mention.ico and b/src/assets/windows/tray_mention.ico differ
diff --git a/src/assets/windows/tray_mention@2x.ico b/src/assets/windows/tray_mention@2x.ico
new file mode 100644
index 00000000..3223eb09
Binary files /dev/null and b/src/assets/windows/tray_mention@2x.ico differ
diff --git a/src/assets/windows/tray_unread.ico b/src/assets/windows/tray_unread.ico
index 55c08026..b521a52b 100644
Binary files a/src/assets/windows/tray_unread.ico and b/src/assets/windows/tray_unread.ico differ
diff --git a/src/assets/windows/tray_unread@2x.ico b/src/assets/windows/tray_unread@2x.ico
new file mode 100644
index 00000000..940cb767
Binary files /dev/null and b/src/assets/windows/tray_unread@2x.ico differ
diff --git a/src/main/tray/tray.js b/src/main/tray/tray.js
index ea0f7e95..9174d524 100644
--- a/src/main/tray/tray.js
+++ b/src/main/tray/tray.js
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 import path from 'path';
-import {app, nativeImage, nativeTheme, Tray, systemPreferences} from 'electron';
+import {app, nativeImage, Tray, systemPreferences} from 'electron';
 
 import {UPDATE_TRAY} from 'common/communication';
 
@@ -27,19 +27,17 @@ export function refreshTrayImages(trayIconTheme) {
         break;
     case 'darwin':
     {
+        const osxNormal = nativeImage.createFromPath(path.resolve(assetsDir, 'osx/menuIcons/MenuIcon16Template.png'));
+        const osxUnread = nativeImage.createFromPath(path.resolve(assetsDir, 'osx/menuIcons/MenuIconUnread16Template.png'));
+        osxNormal.setTemplateImage(true);
+        osxUnread.setTemplateImage(true);
+
         trayImages = {
-            light: {
-                normal: nativeImage.createFromPath(path.resolve(assetsDir, 'osx/MenuIcon.png')),
-                unread: nativeImage.createFromPath(path.resolve(assetsDir, 'osx/MenuIconUnread.png')),
-                mention: nativeImage.createFromPath(path.resolve(assetsDir, 'osx/MenuIconMention.png')),
-            },
-            clicked: {
-                normal: nativeImage.createFromPath(path.resolve(assetsDir, 'osx/ClickedMenuIcon.png')),
-                unread: nativeImage.createFromPath(path.resolve(assetsDir, 'osx/ClickedMenuIconUnread.png')),
-                mention: nativeImage.createFromPath(path.resolve(assetsDir, 'osx/ClickedMenuIconMention.png')),
-            },
+            normal: osxNormal,
+            unread: osxUnread,
+            mention: osxUnread,
         };
-        switchMenuIconImages(trayImages, nativeTheme.shouldUseDarkColors);
+
         break;
     }
     case 'linux':
@@ -47,16 +45,16 @@ export function refreshTrayImages(trayIconTheme) {
         const theme = trayIconTheme;
         try {
             trayImages = {
-                normal: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', theme, 'MenuIconTemplate.png')),
-                unread: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', theme, 'MenuIconUnreadTemplate.png')),
-                mention: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', theme, 'MenuIconMentionTemplate.png')),
+                normal: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', theme, 'MenuIcon.png')),
+                unread: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', theme, 'MenuIconUnread.png')),
+                mention: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', theme, 'MenuIconMention.png')),
             };
         } catch (e) {
             //Fallback for invalid theme setting
             trayImages = {
-                normal: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', 'light', 'MenuIconTemplate.png')),
-                unread: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', 'light', 'MenuIconUnreadTemplate.png')),
-                mention: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', 'light', 'MenuIconMentionTemplate.png')),
+                normal: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', 'light', 'MenuIcon.png')),
+                unread: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', 'light', 'MenuIconUnread.png')),
+                mention: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', 'light', 'MenuIconMention.png')),
             };
         }
         break;
@@ -70,25 +68,12 @@ export function refreshTrayImages(trayIconTheme) {
     return trayImages;
 }
 
-export function switchMenuIconImages(icons, isDarkMode) {
-    if (isDarkMode) {
-        icons.normal = icons.clicked.normal;
-        icons.unread = icons.clicked.unread;
-        icons.mention = icons.clicked.mention;
-    } else {
-        icons.normal = icons.light.normal;
-        icons.unread = icons.light.unread;
-        icons.mention = icons.light.mention;
-    }
-}
-
 export function setupTray(icontheme) {
     refreshTrayImages(icontheme);
     trayIcon = new Tray(trayImages.normal);
     if (process.platform === 'darwin') {
         trayIcon.setPressedImage(trayImages.clicked.normal);
         systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', () => {
-            switchMenuIconImages(trayImages, nativeTheme.shouldUseDarkColors);
             trayIcon.setImage(trayImages.normal);
         });
     }
diff --git a/src/main/windows/windowManager.js b/src/main/windows/windowManager.js
index 4db3b6c4..e3cd1dd6 100644
--- a/src/main/windows/windowManager.js
+++ b/src/main/windows/windowManager.js
@@ -62,7 +62,7 @@ export function showMainWindow(deeplinkingURL) {
         status.mainWindow.show();
     } else {
         status.mainWindow = createMainWindow(status.config, {
-            linuxAppIcon: path.join(assetsDir, 'appicon.png'),
+            linuxAppIcon: path.join(assetsDir, 'linux', 'app_icon.png'),
         });
 
         if (!status.mainWindow) {