diff --git a/res/deskflow.ico b/res/deskflow.ico
index b35873027..3e4d9f620 100644
Binary files a/res/deskflow.ico and b/res/deskflow.ico differ
diff --git a/res/deskflow.png b/res/deskflow.png
index 15da1fa2e..0976815c5 100644
Binary files a/res/deskflow.png and b/res/deskflow.png differ
diff --git a/res/deskflow.svg b/res/deskflow.svg
index 6e8edd76e..c62dadf32 100644
--- a/res/deskflow.svg
+++ b/res/deskflow.svg
@@ -1,15 +1,59 @@
-<svg width="800" height="800" viewBox="0 0 67 67" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path d="M26.2192 59.4389C29.1145 60.2147 32.0905 58.4965 32.8663 55.6012C33.6421 52.7059 31.9239 49.7299 29.0286 48.9541C26.1333 48.1783 23.1573 49.8965 22.3815 52.7918C21.6057 55.6871 23.3239 58.6631 26.2192 59.4389Z" fill="white"/>
-<path d="M10.866 32.8547C13.7613 33.6305 16.7373 31.9123 17.5131 29.017C18.2889 26.1217 16.5707 23.1456 13.6754 22.3699C10.78 21.5941 7.80403 23.3123 7.02824 26.2076C6.25244 29.1029 7.97065 32.0789 10.866 32.8547Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M40.2623 7.02466C54.7002 10.8933 63.2922 25.7342 59.4721 40.1746L59.4508 40.2602C58.6756 43.1534 55.6969 44.8732 52.8037 44.098C49.9089 43.3223 48.1908 40.344 48.966 37.4508L48.978 37.3996C51.2701 28.734 46.1143 19.8303 37.4529 17.5095L37.4856 17.5183C40.3689 18.2715 43.3278 16.5535 44.1 13.6718C44.8721 10.7901 43.1686 7.82274 40.295 7.03345L40.2623 7.02466Z" fill="#33CC99"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M59.4477 40.2596C55.579 54.6975 40.7381 63.2895 26.2977 59.4694L26.2121 59.4482C23.3189 58.673 21.5991 55.6942 22.3744 52.8011C23.15 49.9063 26.1283 48.1881 29.0215 48.9633L29.0727 48.9754C37.7384 51.2675 46.642 46.1116 48.9628 37.4502L48.9541 37.483C48.2008 40.3662 49.9189 43.3252 52.8006 44.0973C55.6822 44.8695 58.6496 43.166 59.4389 40.2924L59.4477 40.2596Z" fill="#33B2CC"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M26.2122 59.4478C11.7743 55.5791 3.1823 40.7382 7.00243 26.2978L7.02366 26.2122C7.79888 23.319 10.7776 21.5992 13.6708 22.3744C16.5656 23.1501 18.2837 26.1284 17.5085 29.0216L17.4965 29.0728C15.2044 37.7384 20.3602 46.6421 29.0216 48.9629L28.9888 48.9541C26.1056 48.2009 23.1467 49.9189 22.3745 52.8006C21.6024 55.6823 23.3059 58.6497 26.1794 59.439L26.2122 59.4478Z" fill="#87D639"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.02333 26.2125C10.892 11.7745 25.7329 3.18253 40.1733 7.00266L40.2589 7.02389C43.1521 7.79911 44.8719 10.7778 44.0966 13.671C43.321 16.5658 40.3427 18.2839 37.4495 17.5087L37.3983 17.4967C28.7327 15.2046 19.829 20.3604 17.5082 29.0219L17.517 28.9891C18.2702 26.1058 16.5521 23.1469 13.6704 22.3747C10.7888 21.6026 7.82141 23.3061 7.03212 26.1797L7.02333 26.2125Z" fill="#3B67D3"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="54.2735" height="54.2735" fill="white" transform="translate(14.047) rotate(15)"/>
-</clipPath>
-</defs>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="400"
+   viewBox="0 -960 16000 16000"
+   width="400"
+   fill="#e8eaed"
+   version="1.1"
+   id="svg58"
+   sodipodi:docname="deskflow-icon.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   inkscape:export-filename="deskflow.png"
+   inkscape:export-xdpi="4000"
+   inkscape:export-ydpi="4000"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs62" />
+  <sodipodi:namedview
+     id="namedview60"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="140.71425"
+     inkscape:cy="220.61732"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg58" />
+  <g
+     id="g312"
+     transform="matrix(1.0746139,0,0,0.99657266,-596.91134,-9.7327822)"
+     inkscape:label="deskflow">
+    <path
+       style="fill:#3366cc;fill-opacity:1;stroke-width:22.0314"
+       d="m 10822.775,14277.69 c -725.441,-75.758 -1360.4107,-335.408 -2953.399,-1207.698 -1184.4329,-648.572 -1657.2077,-869.797 -2159.0787,-1010.295 -195.3193,-54.679 -239.4632,-58.606 -660.9423,-58.798 -412.4131,-0.187 -465.9968,4.307 -616.8795,51.442 -617.2354,192.932 -1111.1495,547.318 -1705.8871,1223.984 -372.355,423.649 -452.1256,475.865 -726.9905,475.865 -232.6962,0 -389.3132,-114.626 -538.1425,-393.859 -97.6499,-183.208 -136.2498,-354.745 -136.943,-608.569 -0.9871,-361.332 90.7554,-581.303 405.6158,-972.546 454.315,-564.53 1071.3806,-1096.759 1627.0063,-1403.32 574.0763,-316.742 1301.046,-474.5294 1911.1995,-414.8217 877.7976,85.8977 1479.4495,322.5197 3173.8588,1248.2357 1360.4629,743.271 1887.4222,972.691 2357.3612,1026.316 962.745,109.86 1619.788,-234.099 2426.041,-1270.024 265.988,-341.759 440.291,-523.347 538.01,-560.5 85.218,-32.404 353.332,-26.223 440.38,10.151 114.885,48.003 290.277,236.695 363.058,390.589 90.975,192.367 115.643,338.837 106.757,633.906 -7.394,245.557 -11.399,264.246 -91.148,425.591 -151.774,307.052 -552.228,834.715 -929.562,1224.851 -709.182,733.24 -1400.349,1092.826 -2291.735,1192.297 -223.305,24.917 -275.771,24.644 -538.58,-2.799 z"
+       id="path3393"
+       inkscape:label="wave 3" />
+    <path
+       style="fill:#33b2cc;fill-opacity:1;stroke-width:26.9658"
+       d="M 10691.975,9232.2954 C 10023.904,9138.2267 9291.0238,8829.9773 7943.0848,8076.1112 6609.9067,7330.5005 6198.1922,7138.9358 5652.3423,7010.2615 c -243.5381,-57.4099 -347.9813,-65.1846 -698.6764,-52.0098 -350.6523,13.1729 -447.6471,28.2841 -648.4026,101.0161 -564.5998,204.5483 -1088.9878,604.082 -1609.3308,1226.1566 -346.6786,414.4566 -584.4059,525.2808 -885.347,412.7324 -192.604,-72.0329 -433.8052,-423.3421 -490.3134,-714.1418 -38.1396,-196.2741 -16.3788,-517.0343 47.5576,-701.0115 146.4281,-421.345 909.508,-1246.3029 1581.9071,-1710.1823 963.612,-664.7841 1984.7795,-839.4204 3092.0317,-528.7881 635.0677,178.1644 1074.5795,381.1158 2396.9103,1106.8098 963.7205,528.8895 1563.7032,820.226 1945.1742,944.5303 309.63,100.896 861.648,137.9622 1159.223,77.8413 588.657,-118.9268 1115.294,-522.1996 1702.251,-1303.4965 310.762,-413.655 424.656,-516.4984 632.476,-571.1126 312.793,-82.2063 660.875,196.9193 776.17,622.3954 40.112,148.0341 49.106,237.616 42.717,425.5773 -11.234,330.4785 -72.528,487.867 -338.44,868.9363 -740.488,1061.1785 -1618.249,1744.1642 -2516.836,1958.3492 -314.615,74.9868 -841.585,101.7751 -1149.443,58.4277 z"
+       id="path1767"
+       inkscape:label="wave 2" />
+    <path
+       style="fill:#33cc99;fill-opacity:1;stroke-width:26.9658"
+       d="M 10576.744,4172.4544 C 9875.4106,4054.5311 9254.561,3795.6536 8047.1318,3117.6748 6298.7948,2135.9727 5901.1838,1973.7358 5169.1286,1943.3652 c -309.4699,-12.839 -457.2545,-4.6405 -640.2217,35.5164 -623.6823,136.8833 -1265.1525,579.7083 -1843.7689,1272.8049 -261.4251,313.1489 -336.0185,374.0949 -523.4853,427.7108 -333.9533,95.5119 -631.6749,-125.6455 -797.5,-592.4091 -65.1417,-183.3604 -70.0111,-219.3096 -60.5107,-446.7291 15.0698,-360.7299 102.7469,-573.6147 372.566,-904.6099 1271.6034,-1559.91423 2646.1446,-2145.742 4181.6081,-1782.19574 680.9761,161.23227 1320.8731,447.96799 2599.9925,1165.04794 1490.1626,835.3921 2027.4634,1046.8526 2657.2604,1045.7931 824.736,-1.3855 1475.964,-418.6346 2184.35,-1399.53052 316.552,-438.32663 413.046,-512.11801 670.274,-512.57528 154.752,-0.27638 193.077,12.59982 339.34,113.99621 259.074,179.60222 391.048,479.99014 391.048,890.06929 0,346.9967 -62.66,514.2152 -341.533,911.4521 -1108.285,1578.6765 -2362.287,2243.4278 -3781.804,2004.7481 z"
+       id="path970"
+       inkscape:label="wave 1" />
+  </g>
 </svg>
diff --git a/res/gui/Deskflow.qrc b/res/gui/Deskflow.qrc
index 69531fe3d..9e6c03b58 100644
--- a/res/gui/Deskflow.qrc
+++ b/res/gui/Deskflow.qrc
@@ -1,17 +1,16 @@
 <RCC>
     <qresource>
-        <file>icons/16x16/deskflow.png</file>
+        <file>icons/16x16/tray.png</file>
         <file>icons/64x64/video-display.png</file>
         <file>icons/64x64/user-trash.png</file>
         <file>icons/16x16/warning.png</file>
-        <file>icons/256x256/deskflow.ico</file>
-        <file>image/about-light.png</file>
-        <file>image/about-dark.png</file>
+        <file>icons/256x256/app.ico</file>
+        <file>image/logo-light.png</file>
+        <file>image/logo-dark.png</file>
         <file>icons/16x16/padlock.png</file>
-        <file>icons/64x64/deskflow-dark.png</file>
-        <file>icons/64x64/deskflow-light.png</file>
+        <file>icons/64x64/tray-dark.png</file>
+        <file>icons/64x64/tray-light.png</file>
         <file>image/welcome.png</file>
         <file>icons/64x64/folder.png</file>
-        <file>image/setup-blocker.png</file>
     </qresource>
 </RCC>
diff --git a/res/gui/icons/16x16/deskflow.png b/res/gui/icons/16x16/deskflow.png
deleted file mode 100644
index 43d34e628..000000000
Binary files a/res/gui/icons/16x16/deskflow.png and /dev/null differ
diff --git a/res/gui/icons/16x16/tray.png b/res/gui/icons/16x16/tray.png
new file mode 100644
index 000000000..00fe245f8
Binary files /dev/null and b/res/gui/icons/16x16/tray.png differ
diff --git a/res/gui/icons/256x256/app.ico b/res/gui/icons/256x256/app.ico
new file mode 100644
index 000000000..3e4d9f620
Binary files /dev/null and b/res/gui/icons/256x256/app.ico differ
diff --git a/res/gui/icons/256x256/deskflow.ico b/res/gui/icons/256x256/deskflow.ico
deleted file mode 100644
index 9dfdd3835..000000000
Binary files a/res/gui/icons/256x256/deskflow.ico and /dev/null differ
diff --git a/res/gui/icons/64x64/deskflow-dark.png b/res/gui/icons/64x64/deskflow-dark.png
deleted file mode 100644
index e02e133ad..000000000
Binary files a/res/gui/icons/64x64/deskflow-dark.png and /dev/null differ
diff --git a/res/gui/icons/64x64/deskflow-light.png b/res/gui/icons/64x64/deskflow-light.png
deleted file mode 100644
index 8a31d2590..000000000
Binary files a/res/gui/icons/64x64/deskflow-light.png and /dev/null differ
diff --git a/res/gui/icons/64x64/tray-dark.png b/res/gui/icons/64x64/tray-dark.png
new file mode 100644
index 000000000..53640ace5
Binary files /dev/null and b/res/gui/icons/64x64/tray-dark.png differ
diff --git a/res/gui/icons/64x64/tray-light.png b/res/gui/icons/64x64/tray-light.png
new file mode 100644
index 000000000..82a1f1166
Binary files /dev/null and b/res/gui/icons/64x64/tray-light.png differ
diff --git a/res/gui/image/about-dark.png b/res/gui/image/about-dark.png
deleted file mode 100644
index 456e75eae..000000000
Binary files a/res/gui/image/about-dark.png and /dev/null differ
diff --git a/res/gui/image/about-light.png b/res/gui/image/about-light.png
deleted file mode 100644
index d0d640982..000000000
Binary files a/res/gui/image/about-light.png and /dev/null differ
diff --git a/res/gui/image/logo-dark.png b/res/gui/image/logo-dark.png
new file mode 100644
index 000000000..c940ccd29
Binary files /dev/null and b/res/gui/image/logo-dark.png differ
diff --git a/res/gui/image/logo-light.png b/res/gui/image/logo-light.png
new file mode 100644
index 000000000..fd0dd6a36
Binary files /dev/null and b/res/gui/image/logo-light.png differ
diff --git a/res/gui/image/setup-blocker.png b/res/gui/image/setup-blocker.png
deleted file mode 100644
index e1aa696a0..000000000
Binary files a/res/gui/image/setup-blocker.png and /dev/null differ
diff --git a/res/gui/win/Deskflow.rc b/res/gui/win/Deskflow.rc
index 0526095c2..fff0e42a2 100644
--- a/res/gui/win/Deskflow.rc
+++ b/res/gui/win/Deskflow.rc
@@ -1 +1 @@
-IDI_ICON1 ICON DISCARDABLE "../icons/256x256/deskflow.ico"
+IDI_ICON1 ICON DISCARDABLE "../icons/256x256/app.ico"
diff --git a/src/gui/src/AboutDialog.cpp b/src/gui/src/AboutDialog.cpp
index 50494ace1..b985cde47 100644
--- a/src/gui/src/AboutDialog.cpp
+++ b/src/gui/src/AboutDialog.cpp
@@ -55,7 +55,7 @@ int AboutDialog::exec() {
 void AboutDialog::updateLogo() const {
   if (isDarkMode()) {
     qDebug("dark mode detected, showing dark logo");
-    QPixmap logo(":/image/about-dark.png");
+    QPixmap logo(":/image/logo-dark.png");
     if (!logo.isNull()) {
       m_pLabel_Logo->setPixmap(logo);
     }
diff --git a/src/gui/src/AboutDialogBase.ui b/src/gui/src/AboutDialogBase.ui
index 5dc084f20..6c5314969 100644
--- a/src/gui/src/AboutDialogBase.ui
+++ b/src/gui/src/AboutDialogBase.ui
@@ -114,14 +114,14 @@
      <property name="maximumSize">
       <size>
        <width>200</width>
-       <height>50</height>
+       <height>39</height>
       </size>
      </property>
      <property name="text">
       <string notr="true"/>
      </property>
      <property name="pixmap">
-      <pixmap>:/image/about-light.png</pixmap>
+      <pixmap>:/image/logo-light.png</pixmap>
      </property>
      <property name="scaledContents">
       <bool>true</bool>
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 9f8dcc496..61dad7234 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -73,11 +73,11 @@ using CoreMode = CoreProcess::Mode;
 using CoreConnectionState = CoreProcess::ConnectionState;
 using CoreProcessState = CoreProcess::ProcessState;
 
-const auto kIconFile16 = ":/icons/16x16/deskflow.png";
+const auto kIconFile16 = ":/icons/16x16/tray.png";
 
 #ifdef Q_OS_MAC
-const auto kLightIconFile = ":/icons/64x64/deskflow-light.png";
-const auto kDarkIconFile = ":/icons/64x64/deskflow-dark.png";
+const auto kLightIconFile = ":/icons/64x64/tray-light.png";
+const auto kDarkIconFile = ":/icons/64x64/tray-dark.png";
 #endif // Q_OS_MAC
 
 MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig)