diff --git a/icon/icon.svg b/icon/icon.svg
new file mode 100644
index 000000000..8bc6f5fb2
--- /dev/null
+++ b/icon/icon.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   id="svg230"
+   width="21.333338"
+   height="21.333334"
+   viewBox="0 0 21.333338 21.333334"
+   sodipodi:docname="icon_mac.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata236">
+    <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="defs234" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="1379"
+     id="namedview232"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="15.644737"
+     inkscape:cx="22.840312"
+     inkscape:cy="0.29164121"
+     inkscape:window-x="3200"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg230"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <path
+     style="fill:#000000;stroke-width:0.04372846"
+     d="M 9.6856224,21.29181 C 8.9628381,21.24251 8.507107,21.1734 8.2582654,21.07524 8.1423774,21.02964 7.9153685,20.97109 7.7538034,20.94523 7.5922373,20.91953 7.3278307,20.84029 7.166232,20.76932 7.0046195,20.69842 6.8429008,20.64039 6.8068425,20.64039 c -0.036065,0 -0.1901707,-0.0652 -0.3424898,-0.14498 -0.152313,-0.0797 -0.3457971,-0.17155 -0.4299724,-0.204 -0.084169,-0.0324 -0.1840845,-0.0852 -0.222029,-0.11734 -0.037932,-0.032 -0.175685,-0.10334 -0.3060919,-0.15836 C 5.2017873,19.8873 4.9407598,19.72542 4.4684828,19.37223 4.2594397,19.21591 4.0392304,19.05618 3.9791403,19.01731 3.7547307,18.87213 2.3984835,17.4706 2.1764675,17.15449 2.0496341,16.97389 1.8952678,16.76439 1.8334307,16.6889 1.7715667,16.6134 1.6712654,16.46313 1.6104749,16.3549 1.5496779,16.24662 1.4147578,16.02037 1.310623,15.852 0.97411291,15.30794 0.53535386,14.19547 0.3275375,13.35941 0.2856729,13.19107 0.22564226,12.96038 0.19409732,12.84678 0.11257458,12.55323 0,11.35475 0,10.78036 0,9.87038 0.12154064,8.64457 0.24667443,8.29249 0.28200633,8.19319 0.33848353,7.96861 0.3722218,7.7935 0.4059536,7.61839 0.48234344,7.36258 0.54194687,7.22501 0.60154387,7.08746 0.68089332,6.86434 0.71826507,6.72919 0.75559657,6.59404 0.81395367,6.46044 0.84785898,6.4323 0.88179048,6.4042 0.95399341,6.26875 1.0083709,6.1314 1.0627679,5.99405 1.1335515,5.85063 1.1657501,5.81269 1.1979481,5.77469 1.2692847,5.637 1.3242892,5.50658 1.4504163,5.20755 1.6062084,4.9564 1.9786637,4.45171 2.1410028,4.23172 2.2738232,4.03687 2.2738232,4.01868 c 0,-0.0827 1.5864694,-1.61571 1.8961075,-1.83225 C 4.3590147,2.05415 4.5754577,1.89542 4.6509341,1.83357 4.7263971,1.77167 4.8767032,1.6714 4.9849243,1.6106 5.0931457,1.5498 5.3141684,1.41839 5.4760737,1.31855 5.8627753,1.08007 6.4768851,0.79557 6.7777503,0.71555 6.9100236,0.68035 7.0627898,0.62245 7.1172272,0.58674 7.1716912,0.55114 7.4077934,0.47234 7.6419551,0.41165 7.8761236,0.35095 8.1956083,0.26369 8.3519409,0.21765 8.6888976,0.11845 9.894392,0 10.567766,0 c 0.956768,0 2.118184,0.12121 2.53455,0.26443 0.131914,0.0453 0.36163,0.10427 0.510489,0.13094 0.148853,0.0267 0.378876,0.0953 0.511149,0.15255 0.132267,0.0573 0.328863,0.12668 0.436872,0.15435 0.108014,0.0276 0.245748,0.0843 0.306092,0.12586 0.06033,0.0416 0.34585,0.18836 0.634448,0.32608 0.288599,0.1377 0.554241,0.26854 0.590319,0.29078 0.03607,0.0223 0.154139,0.094 0.26236,0.15961 0.108227,0.0655 0.315031,0.21022 0.459571,0.32149 0.144534,0.1112 0.341303,0.25215 0.437272,0.31309 0.22651,0.14383 1.644754,1.56218 1.823272,1.82339 0.07557,0.11055 0.217602,0.31678 0.315625,0.45822 0.425952,0.61461 0.637168,0.94703 0.638588,1.00506 6.44e-4,0.0272 0.05893,0.12601 0.129507,0.21919 0.07056,0.0932 0.161585,0.27036 0.202264,0.39357 0.04073,0.12321 0.09843,0.26338 0.128293,0.3115 0.02987,0.0481 0.06841,0.13665 0.08563,0.19678 0.01727,0.0601 0.08949,0.24364 0.160626,0.4078 0.07113,0.16414 0.159625,0.45912 0.196664,0.65548 0.037,0.19637 0.104146,0.45042 0.149145,0.5646 0.08403,0.21319 0.130013,0.53714 0.221931,1.56333 0.04127,0.46064 0.0412,0.78998 -1.72e-4,1.50866 -0.06007,1.04267 -0.112734,1.44133 -0.22971,1.73843 -0.0448,0.11373 -0.1026,0.3401 -0.128466,0.5029 -0.02587,0.16281 -0.102507,0.4141 -0.170311,0.5584 -0.06781,0.14432 -0.137467,0.32752 -0.15478,0.40709 -0.0328,0.15062 -0.68532,1.46834 -0.838886,1.69398 -0.04833,0.0711 -0.183417,0.27242 -0.300165,0.44751 -0.116747,0.1751 -0.239595,0.34106 -0.273,0.36878 -0.0334,0.0277 -0.09673,0.12054 -0.140726,0.20638 -0.044,0.0857 -0.386128,0.46373 -0.760291,0.83983 -0.743549,0.74744 -1.227947,1.14062 -1.968011,1.5974 -0.283432,0.17493 -1.108752,0.62678 -1.14485,0.62678 -0.01493,0 -0.166938,0.0688 -0.337797,0.15305 -0.170865,0.0841 -0.337091,0.15305 -0.369403,0.15305 -0.03233,0 -0.158831,0.0507 -0.281165,0.11266 -0.122334,0.0619 -0.382202,0.14285 -0.577479,0.17969 -0.195284,0.0368 -0.448458,0.10375 -0.562613,0.14879 -0.114154,0.0449 -0.379995,0.10106 -0.590771,0.12466 -1.271485,0.14203 -1.747682,0.15665 -2.7882177,0.0856 z M 7.0892093,14.69327 c 0.3077846,-0.0445 1.0920936,-0.32974 1.2945298,-0.47075 0.066684,-0.0465 0.1848512,-0.106 0.2626072,-0.1324 0.150113,-0.0508 0.736211,-0.47986 1.0565421,-0.77333 0.1056881,-0.0968 0.2661205,-0.27596 0.3564966,-0.39805 0.313505,-0.42345 0.451657,-0.54329 0.626242,-0.54329 0.14364,0 0.178685,0.0263 0.365816,0.27331 0.376148,0.49672 1.156504,1.19086 1.585776,1.41052 0.08418,0.0432 0.217103,0.12707 0.295399,0.18652 0.07828,0.0595 0.294739,0.15336 0.480997,0.20857 0.186264,0.0551 0.427206,0.13341 0.535427,0.17382 0.255648,0.0955 1.283371,0.13643 1.803746,0.0719 0.5411,-0.0672 1.420504,-0.45523 1.956811,-0.86355 0.270567,-0.20601 0.743364,-0.68721 0.743364,-0.7566 0,-0.0251 0.05547,-0.11014 0.123254,-0.18909 0.06779,-0.0791 0.150267,-0.21253 0.183299,-0.29669 0.03307,-0.0841 0.104053,-0.22194 0.157838,-0.30612 0.154879,-0.24244 0.328131,-1.00327 0.35479,-1.55802 0.01967,-0.4091 0.0092,-0.53458 -0.06587,-0.78715 C 19.157144,9.77762 19.095514,9.5382 19.069255,9.41083 19.020185,9.1729 18.785569,8.71672 18.513628,8.33053 18.103302,7.7478 17.209545,7.05403 16.677951,6.9056 16.531412,6.8647 16.35202,6.80039 16.27931,6.76283 16.080453,6.66003 15.649848,6.6039 15.056337,6.60354 c -0.694247,-4.5e-4 -1.149938,0.0655 -1.500827,0.217 -0.156327,0.0675 -0.330192,0.13664 -0.386362,0.15362 -0.0562,0.0171 -0.203757,0.0916 -0.327958,0.16588 C 11.994211,7.64635 11.539874,8.026 11.128634,8.57111 10.859174,8.92832 10.814942,8.9646 10.649017,8.9646 10.514803,8.9646 10.476238,8.9357 10.3139,8.71316 10.068005,8.37613 9.4991594,7.81694 9.0895259,7.50957 8.9059685,7.37184 8.7390967,7.25916 8.7187039,7.25916 8.6983049,7.25916 8.5713712,7.19116 8.4366174,7.10792 8.3018644,7.02472 8.0981008,6.93572 7.9837998,6.91011 7.8694984,6.88451 7.6981601,6.82381 7.6030315,6.77529 7.5079085,6.72679 7.2587081,6.66582 7.0492652,6.64001 6.5668621,6.58041 5.4717883,6.61801 5.181709,6.70411 4.9197753,6.78181 4.4372785,6.97407 4.2852994,7.06114 4.2251684,7.09554 4.0813161,7.17474 3.9656149,7.23723 3.7169204,7.37137 3.1272292,7.92334 2.8684549,8.26422 2.6004881,8.61717 2.2980892,9.27114 2.1604163,9.79538 c -0.1394134,0.5309 -0.1584661,1.14521 -0.047731,1.53811 0.036132,0.12814 0.096489,0.37241 0.1341597,0.54286 0.1005014,0.45468 0.4634311,1.0485 0.9671069,1.58234 0.3819877,0.40488 1.0742278,0.87164 1.4470764,0.97574 0.1465327,0.0408 0.3302302,0.10734 0.4082197,0.14773 0.077989,0.0403 0.2630938,0.0891 0.41134,0.10841 0.3857615,0.0501 1.2692181,0.0516 1.6086087,0.003 z M 6.1437018,13.28933 C 6.0474988,13.27373 5.8284699,13.23923 5.6569648,13.21263 5.2766238,13.15373 5.1767084,13.11703 4.8360713,12.91074 4.2665057,12.56581 3.9960524,12.25632 3.7082596,11.62009 l -0.1825244,-0.40348 6.697e-4,-0.57535 6.633e-4,-0.57537 0.168512,-0.34295 C 4.0313037,9.0396 4.2594126,8.78087 4.8600503,8.40209 5.3757186,8.07691 6.3197393,7.96013 7.0489371,8.13132 7.7583228,8.29785 8.404998,8.73373 9.0481603,9.47884 c 0.5262609,0.60968 0.6727269,0.85063 0.6935792,1.14106 0.016133,0.22429 0.004,0.26689 -0.1329334,0.46563 -0.082869,0.12028 -0.1824514,0.27774 -0.2213159,0.34983 -0.088383,0.16401 -0.864611,0.96885 -1.1255921,1.16712 -0.606464,0.46067 -1.5757163,0.77487 -2.1186171,0.68679 z m 1.4012579,-2.33304 c 0.1386135,-0.13862 0.1487994,-0.41969 0.019865,-0.5486 -0.082769,-0.0828 -0.1457594,-0.0875 -1.1757958,-0.0875 -0.9728724,0 -1.0979469,0.008 -1.1788825,0.0765 -0.1419471,0.12 -0.1455935,0.44041 -0.00667,0.57941 0.082709,0.0827 0.1457595,0.0875 1.1607703,0.0875 h 1.0733075 z m 7.2786333,2.33102 c -0.958207,-0.15127 -1.321915,-0.30169 -1.894461,-0.78354 -0.363249,-0.30569 -0.887917,-0.89877 -1.15553,-1.30618 -0.162767,-0.24779 -0.185839,-0.31328 -0.185839,-0.52753 0,-0.21429 0.02307,-0.27973 0.186085,-0.52794 0.464977,-0.70798 1.051909,-1.31475 1.578636,-1.63198 0.07559,-0.0455 0.206291,-0.12787 0.290466,-0.1829 0.191717,-0.12548 0.989486,-0.28078 1.443003,-0.28094 0.401541,-3.5e-4 1.04205,0.14848 1.251046,0.29033 0.08433,0.0573 0.225969,0.14181 0.314759,0.18795 0.376148,0.19552 0.753189,0.66691 0.981512,1.22716 0.176684,0.43355 0.222603,0.78236 0.163919,1.24522 -0.0662,0.52226 -0.427226,1.19604 -0.859026,1.60324 -0.442124,0.41692 -1.548578,0.77644 -2.11457,0.68711 z m 0.370623,-1.40851 c 0.05653,-0.0413 0.09123,-0.14409 0.114106,-0.33808 0.0422,-0.35822 0.160559,-0.4771 0.474871,-0.4771 0.270494,0 0.3936,-0.0953 0.424952,-0.32907 0.0368,-0.2743 -0.07428,-0.37904 -0.442337,-0.41712 -0.162033,-0.0168 -0.323092,-0.0589 -0.35791,-0.0937 -0.03533,-0.0353 -0.07837,-0.20442 -0.09743,-0.38278 -0.02507,-0.23433 -0.05593,-0.3354 -0.115814,-0.37922 -0.153466,-0.11227 -0.653996,-0.0535 -0.69696,0.0817 -0.0096,0.0304 -0.0302,0.16797 -0.0456,0.30563 -0.03467,0.30947 -0.122,0.42282 -0.349983,0.45432 -0.280786,0.0387 -0.406593,0.10361 -0.451578,0.23268 -0.09941,0.28514 0.04387,0.47764 0.396588,0.53283 0.290325,0.0453 0.370274,0.13982 0.409098,0.48306 0.0274,0.24233 0.04133,0.26954 0.165866,0.32373 0.176712,0.0769 0.469084,0.0785 0.572153,0.003 z"
+     id="path240"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/icon/icon_darwin.go b/icon/icon_darwin.go
new file mode 100644
index 000000000..dfdfa34a7
--- /dev/null
+++ b/icon/icon_darwin.go
@@ -0,0 +1,23 @@
+package icon
+
+import _ "embed" // import embed to embed the icon
+
+// GetIcon will return the icon
+func GetIcon() []byte {
+	return data
+}
+
+// GetIconHiber will return the hibernated icon
+func GetIconHiber() []byte {
+	return dataHibernate
+}
+
+// data represents the icon
+//
+//go:embed icon_mac.png
+var data []byte
+
+// dataHibernate represents the icon hibernated
+//
+//go:embed icon_mac_hiber.png
+var dataHibernate []byte
diff --git a/icon/icon_hiber.svg b/icon/icon_hiber.svg
new file mode 100644
index 000000000..91021711e
--- /dev/null
+++ b/icon/icon_hiber.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   id="svg230"
+   width="21.333338"
+   height="21.333334"
+   viewBox="0 0 21.333338 21.333334"
+   sodipodi:docname="icon_mac_hiber.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata236">
+    <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="defs234" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="1379"
+     id="namedview232"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="15.644737"
+     inkscape:cx="22.840312"
+     inkscape:cy="0.29164121"
+     inkscape:window-x="3200"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg230"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <path
+     style="fill:#000000;stroke-width:0.04372846;opacity:0.35"
+     d="M 9.6856224,21.29181 C 8.9628381,21.24251 8.507107,21.1734 8.2582654,21.07524 8.1423774,21.02964 7.9153685,20.97109 7.7538034,20.94523 7.5922373,20.91953 7.3278307,20.84029 7.166232,20.76932 7.0046195,20.69842 6.8429008,20.64039 6.8068425,20.64039 c -0.036065,0 -0.1901707,-0.0652 -0.3424898,-0.14498 -0.152313,-0.0797 -0.3457971,-0.17155 -0.4299724,-0.204 -0.084169,-0.0324 -0.1840845,-0.0852 -0.222029,-0.11734 -0.037932,-0.032 -0.175685,-0.10334 -0.3060919,-0.15836 C 5.2017873,19.8873 4.9407598,19.72542 4.4684828,19.37223 4.2594397,19.21591 4.0392304,19.05618 3.9791403,19.01731 3.7547307,18.87213 2.3984835,17.4706 2.1764675,17.15449 2.0496341,16.97389 1.8952678,16.76439 1.8334307,16.6889 1.7715667,16.6134 1.6712654,16.46313 1.6104749,16.3549 1.5496779,16.24662 1.4147578,16.02037 1.310623,15.852 0.97411291,15.30794 0.53535386,14.19547 0.3275375,13.35941 0.2856729,13.19107 0.22564226,12.96038 0.19409732,12.84678 0.11257458,12.55323 0,11.35475 0,10.78036 0,9.87038 0.12154064,8.64457 0.24667443,8.29249 0.28200633,8.19319 0.33848353,7.96861 0.3722218,7.7935 0.4059536,7.61839 0.48234344,7.36258 0.54194687,7.22501 0.60154387,7.08746 0.68089332,6.86434 0.71826507,6.72919 0.75559657,6.59404 0.81395367,6.46044 0.84785898,6.4323 0.88179048,6.4042 0.95399341,6.26875 1.0083709,6.1314 1.0627679,5.99405 1.1335515,5.85063 1.1657501,5.81269 1.1979481,5.77469 1.2692847,5.637 1.3242892,5.50658 1.4504163,5.20755 1.6062084,4.9564 1.9786637,4.45171 2.1410028,4.23172 2.2738232,4.03687 2.2738232,4.01868 c 0,-0.0827 1.5864694,-1.61571 1.8961075,-1.83225 C 4.3590147,2.05415 4.5754577,1.89542 4.6509341,1.83357 4.7263971,1.77167 4.8767032,1.6714 4.9849243,1.6106 5.0931457,1.5498 5.3141684,1.41839 5.4760737,1.31855 5.8627753,1.08007 6.4768851,0.79557 6.7777503,0.71555 6.9100236,0.68035 7.0627898,0.62245 7.1172272,0.58674 7.1716912,0.55114 7.4077934,0.47234 7.6419551,0.41165 7.8761236,0.35095 8.1956083,0.26369 8.3519409,0.21765 8.6888976,0.11845 9.894392,0 10.567766,0 c 0.956768,0 2.118184,0.12121 2.53455,0.26443 0.131914,0.0453 0.36163,0.10427 0.510489,0.13094 0.148853,0.0267 0.378876,0.0953 0.511149,0.15255 0.132267,0.0573 0.328863,0.12668 0.436872,0.15435 0.108014,0.0276 0.245748,0.0843 0.306092,0.12586 0.06033,0.0416 0.34585,0.18836 0.634448,0.32608 0.288599,0.1377 0.554241,0.26854 0.590319,0.29078 0.03607,0.0223 0.154139,0.094 0.26236,0.15961 0.108227,0.0655 0.315031,0.21022 0.459571,0.32149 0.144534,0.1112 0.341303,0.25215 0.437272,0.31309 0.22651,0.14383 1.644754,1.56218 1.823272,1.82339 0.07557,0.11055 0.217602,0.31678 0.315625,0.45822 0.425952,0.61461 0.637168,0.94703 0.638588,1.00506 6.44e-4,0.0272 0.05893,0.12601 0.129507,0.21919 0.07056,0.0932 0.161585,0.27036 0.202264,0.39357 0.04073,0.12321 0.09843,0.26338 0.128293,0.3115 0.02987,0.0481 0.06841,0.13665 0.08563,0.19678 0.01727,0.0601 0.08949,0.24364 0.160626,0.4078 0.07113,0.16414 0.159625,0.45912 0.196664,0.65548 0.037,0.19637 0.104146,0.45042 0.149145,0.5646 0.08403,0.21319 0.130013,0.53714 0.221931,1.56333 0.04127,0.46064 0.0412,0.78998 -1.72e-4,1.50866 -0.06007,1.04267 -0.112734,1.44133 -0.22971,1.73843 -0.0448,0.11373 -0.1026,0.3401 -0.128466,0.5029 -0.02587,0.16281 -0.102507,0.4141 -0.170311,0.5584 -0.06781,0.14432 -0.137467,0.32752 -0.15478,0.40709 -0.0328,0.15062 -0.68532,1.46834 -0.838886,1.69398 -0.04833,0.0711 -0.183417,0.27242 -0.300165,0.44751 -0.116747,0.1751 -0.239595,0.34106 -0.273,0.36878 -0.0334,0.0277 -0.09673,0.12054 -0.140726,0.20638 -0.044,0.0857 -0.386128,0.46373 -0.760291,0.83983 -0.743549,0.74744 -1.227947,1.14062 -1.968011,1.5974 -0.283432,0.17493 -1.108752,0.62678 -1.14485,0.62678 -0.01493,0 -0.166938,0.0688 -0.337797,0.15305 -0.170865,0.0841 -0.337091,0.15305 -0.369403,0.15305 -0.03233,0 -0.158831,0.0507 -0.281165,0.11266 -0.122334,0.0619 -0.382202,0.14285 -0.577479,0.17969 -0.195284,0.0368 -0.448458,0.10375 -0.562613,0.14879 -0.114154,0.0449 -0.379995,0.10106 -0.590771,0.12466 -1.271485,0.14203 -1.747682,0.15665 -2.7882177,0.0856 z M 7.0892093,14.69327 c 0.3077846,-0.0445 1.0920936,-0.32974 1.2945298,-0.47075 0.066684,-0.0465 0.1848512,-0.106 0.2626072,-0.1324 0.150113,-0.0508 0.736211,-0.47986 1.0565421,-0.77333 0.1056881,-0.0968 0.2661205,-0.27596 0.3564966,-0.39805 0.313505,-0.42345 0.451657,-0.54329 0.626242,-0.54329 0.14364,0 0.178685,0.0263 0.365816,0.27331 0.376148,0.49672 1.156504,1.19086 1.585776,1.41052 0.08418,0.0432 0.217103,0.12707 0.295399,0.18652 0.07828,0.0595 0.294739,0.15336 0.480997,0.20857 0.186264,0.0551 0.427206,0.13341 0.535427,0.17382 0.255648,0.0955 1.283371,0.13643 1.803746,0.0719 0.5411,-0.0672 1.420504,-0.45523 1.956811,-0.86355 0.270567,-0.20601 0.743364,-0.68721 0.743364,-0.7566 0,-0.0251 0.05547,-0.11014 0.123254,-0.18909 0.06779,-0.0791 0.150267,-0.21253 0.183299,-0.29669 0.03307,-0.0841 0.104053,-0.22194 0.157838,-0.30612 0.154879,-0.24244 0.328131,-1.00327 0.35479,-1.55802 0.01967,-0.4091 0.0092,-0.53458 -0.06587,-0.78715 C 19.157144,9.77762 19.095514,9.5382 19.069255,9.41083 19.020185,9.1729 18.785569,8.71672 18.513628,8.33053 18.103302,7.7478 17.209545,7.05403 16.677951,6.9056 16.531412,6.8647 16.35202,6.80039 16.27931,6.76283 16.080453,6.66003 15.649848,6.6039 15.056337,6.60354 c -0.694247,-4.5e-4 -1.149938,0.0655 -1.500827,0.217 -0.156327,0.0675 -0.330192,0.13664 -0.386362,0.15362 -0.0562,0.0171 -0.203757,0.0916 -0.327958,0.16588 C 11.994211,7.64635 11.539874,8.026 11.128634,8.57111 10.859174,8.92832 10.814942,8.9646 10.649017,8.9646 10.514803,8.9646 10.476238,8.9357 10.3139,8.71316 10.068005,8.37613 9.4991594,7.81694 9.0895259,7.50957 8.9059685,7.37184 8.7390967,7.25916 8.7187039,7.25916 8.6983049,7.25916 8.5713712,7.19116 8.4366174,7.10792 8.3018644,7.02472 8.0981008,6.93572 7.9837998,6.91011 7.8694984,6.88451 7.6981601,6.82381 7.6030315,6.77529 7.5079085,6.72679 7.2587081,6.66582 7.0492652,6.64001 6.5668621,6.58041 5.4717883,6.61801 5.181709,6.70411 4.9197753,6.78181 4.4372785,6.97407 4.2852994,7.06114 4.2251684,7.09554 4.0813161,7.17474 3.9656149,7.23723 3.7169204,7.37137 3.1272292,7.92334 2.8684549,8.26422 2.6004881,8.61717 2.2980892,9.27114 2.1604163,9.79538 c -0.1394134,0.5309 -0.1584661,1.14521 -0.047731,1.53811 0.036132,0.12814 0.096489,0.37241 0.1341597,0.54286 0.1005014,0.45468 0.4634311,1.0485 0.9671069,1.58234 0.3819877,0.40488 1.0742278,0.87164 1.4470764,0.97574 0.1465327,0.0408 0.3302302,0.10734 0.4082197,0.14773 0.077989,0.0403 0.2630938,0.0891 0.41134,0.10841 0.3857615,0.0501 1.2692181,0.0516 1.6086087,0.003 z M 6.1437018,13.28933 C 6.0474988,13.27373 5.8284699,13.23923 5.6569648,13.21263 5.2766238,13.15373 5.1767084,13.11703 4.8360713,12.91074 4.2665057,12.56581 3.9960524,12.25632 3.7082596,11.62009 l -0.1825244,-0.40348 6.697e-4,-0.57535 6.633e-4,-0.57537 0.168512,-0.34295 C 4.0313037,9.0396 4.2594126,8.78087 4.8600503,8.40209 5.3757186,8.07691 6.3197393,7.96013 7.0489371,8.13132 7.7583228,8.29785 8.404998,8.73373 9.0481603,9.47884 c 0.5262609,0.60968 0.6727269,0.85063 0.6935792,1.14106 0.016133,0.22429 0.004,0.26689 -0.1329334,0.46563 -0.082869,0.12028 -0.1824514,0.27774 -0.2213159,0.34983 -0.088383,0.16401 -0.864611,0.96885 -1.1255921,1.16712 -0.606464,0.46067 -1.5757163,0.77487 -2.1186171,0.68679 z m 1.4012579,-2.33304 c 0.1386135,-0.13862 0.1487994,-0.41969 0.019865,-0.5486 -0.082769,-0.0828 -0.1457594,-0.0875 -1.1757958,-0.0875 -0.9728724,0 -1.0979469,0.008 -1.1788825,0.0765 -0.1419471,0.12 -0.1455935,0.44041 -0.00667,0.57941 0.082709,0.0827 0.1457595,0.0875 1.1607703,0.0875 h 1.0733075 z m 7.2786333,2.33102 c -0.958207,-0.15127 -1.321915,-0.30169 -1.894461,-0.78354 -0.363249,-0.30569 -0.887917,-0.89877 -1.15553,-1.30618 -0.162767,-0.24779 -0.185839,-0.31328 -0.185839,-0.52753 0,-0.21429 0.02307,-0.27973 0.186085,-0.52794 0.464977,-0.70798 1.051909,-1.31475 1.578636,-1.63198 0.07559,-0.0455 0.206291,-0.12787 0.290466,-0.1829 0.191717,-0.12548 0.989486,-0.28078 1.443003,-0.28094 0.401541,-3.5e-4 1.04205,0.14848 1.251046,0.29033 0.08433,0.0573 0.225969,0.14181 0.314759,0.18795 0.376148,0.19552 0.753189,0.66691 0.981512,1.22716 0.176684,0.43355 0.222603,0.78236 0.163919,1.24522 -0.0662,0.52226 -0.427226,1.19604 -0.859026,1.60324 -0.442124,0.41692 -1.548578,0.77644 -2.11457,0.68711 z m 0.370623,-1.40851 c 0.05653,-0.0413 0.09123,-0.14409 0.114106,-0.33808 0.0422,-0.35822 0.160559,-0.4771 0.474871,-0.4771 0.270494,0 0.3936,-0.0953 0.424952,-0.32907 0.0368,-0.2743 -0.07428,-0.37904 -0.442337,-0.41712 -0.162033,-0.0168 -0.323092,-0.0589 -0.35791,-0.0937 -0.03533,-0.0353 -0.07837,-0.20442 -0.09743,-0.38278 -0.02507,-0.23433 -0.05593,-0.3354 -0.115814,-0.37922 -0.153466,-0.11227 -0.653996,-0.0535 -0.69696,0.0817 -0.0096,0.0304 -0.0302,0.16797 -0.0456,0.30563 -0.03467,0.30947 -0.122,0.42282 -0.349983,0.45432 -0.280786,0.0387 -0.406593,0.10361 -0.451578,0.23268 -0.09941,0.28514 0.04387,0.47764 0.396588,0.53283 0.290325,0.0453 0.370274,0.13982 0.409098,0.48306 0.0274,0.24233 0.04133,0.26954 0.165866,0.32373 0.176712,0.0769 0.469084,0.0785 0.572153,0.003 z"
+     id="path240"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/icon/iconlinux.go b/icon/icon_linux.go
similarity index 95%
rename from icon/iconlinux.go
rename to icon/icon_linux.go
index 0a09a3e9e..b00f743aa 100644
--- a/icon/iconlinux.go
+++ b/icon/icon_linux.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package icon
 
 import _ "embed" // import embed to embed the icon
diff --git a/icon/icon_linux.png b/icon/icon_linux.png
index c282ea137..b32940840 100644
Binary files a/icon/icon_linux.png and b/icon/icon_linux.png differ
diff --git a/icon/icon_linux_hiber.png b/icon/icon_linux_hiber.png
index 7a4078fcb..5995ce96a 100644
Binary files a/icon/icon_linux_hiber.png and b/icon/icon_linux_hiber.png differ
diff --git a/icon/icon_mac.png b/icon/icon_mac.png
index 0f6605b33..24dd8ae1b 100644
Binary files a/icon/icon_mac.png and b/icon/icon_mac.png differ
diff --git a/icon/icon_mac_hiber.png b/icon/icon_mac_hiber.png
index dcd47edb3..b57292690 100644
Binary files a/icon/icon_mac_hiber.png and b/icon/icon_mac_hiber.png differ
diff --git a/icon/icon_mac_light.png b/icon/icon_mac_light.png
deleted file mode 100644
index 9cc820e02..000000000
Binary files a/icon/icon_mac_light.png and /dev/null differ
diff --git a/icon/icon_mac_light_hiber.png b/icon/icon_mac_light_hiber.png
deleted file mode 100644
index 4280fd333..000000000
Binary files a/icon/icon_mac_light_hiber.png and /dev/null differ
diff --git a/icon/icon_win.ico b/icon/icon_win.ico
index f62cfde83..de577ec75 100644
Binary files a/icon/icon_win.ico and b/icon/icon_win.ico differ
diff --git a/icon/icon_win_hiber.ico b/icon/icon_win_hiber.ico
index 031a4c224..652370e13 100644
Binary files a/icon/icon_win_hiber.ico and b/icon/icon_win_hiber.ico differ
diff --git a/icon/iconwin.go b/icon/icon_windows.go
similarity index 95%
rename from icon/iconwin.go
rename to icon/icon_windows.go
index 1225ba03b..2cf75b5e3 100644
--- a/icon/iconwin.go
+++ b/icon/icon_windows.go
@@ -1,5 +1,3 @@
-//go:build windows
-
 package icon
 
 import _ "embed" // import embed to embed the icon
diff --git a/icon/icondarwin.go b/icon/icondarwin.go
deleted file mode 100644
index a53dfcdf0..000000000
--- a/icon/icondarwin.go
+++ /dev/null
@@ -1,52 +0,0 @@
-//go:build darwin
-
-package icon
-
-import (
-	_ "embed" // import embed to embed the icon
-	"os/exec"
-	"strings"
-)
-
-// isDarkMode will return if the system is in darkmode
-func isDarkMode() bool {
-	cmd := exec.Command("defaults", "read", "-g", "AppleInterfaceStyle")
-	output, _ := cmd.Output()
-	return strings.Contains(string(output), "Dark")
-}
-
-// GetIcon will return the icon
-func GetIcon() []byte {
-	if isDarkMode() {
-		return data
-	}
-	return dataLight
-}
-
-// GetIconHiber will return the hibernated icon
-func GetIconHiber() []byte {
-	if isDarkMode() {
-		return dataDarkHibernate
-	}
-	return dataLightHibernate
-}
-
-// dataLight represents the icon
-//
-//go:embed icon_mac_light.png
-var dataLight []byte
-
-// dataLightHibernate represents the light icon hibernated
-//
-//go:embed icon_mac_light_hiber.png
-var dataLightHibernate []byte
-
-// data represents the icon
-//
-//go:embed icon_mac.png
-var data []byte
-
-// dataDarkHibernate represents the dark icon hibernated
-//
-//go:embed icon_mac_hiber.png
-var dataDarkHibernate []byte
diff --git a/systray/systray_real.go b/systray/systray_real.go
index 20db97118..1c94c7ab1 100644
--- a/systray/systray_real.go
+++ b/systray/systray_real.go
@@ -50,7 +50,7 @@ func (s *Systray) Quit() {
 
 // start creates a systray icon with menu options to go to arduino create, open debug, pause/quit the agent
 func (s *Systray) start() {
-	systray.SetIcon(icon.GetIcon())
+	systray.SetTemplateIcon(icon.GetIcon(), icon.GetIcon())
 
 	// Add version
 	menuVer := systray.AddMenuItem("Agent version "+s.Version, "")
@@ -136,7 +136,7 @@ func RemoveCrashes() {
 
 // starthibernate creates a systray icon with menu options to resume/quit the agent
 func (s *Systray) startHibernate() {
-	systray.SetIcon(icon.GetIconHiber())
+	systray.SetTemplateIcon(icon.GetIconHiber(), icon.GetIconHiber())
 
 	mResume := systray.AddMenuItem("Resume Agent", "")
 	systray.AddSeparator()