diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index b5305e41..92179b4e 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -12,7 +12,9 @@ set(CMAKE_AUTOUIC ON)
 
 configure_file(../shared/src/traintastic/version.hpp.in version.hpp)
 
-add_executable(traintastic-client dark.qrc)
+add_executable(traintastic-client
+  gfx/common.qrc
+  dark.qrc)
 
 add_definitions(-DQT_DEPRECATED_WARNINGS)
 
diff --git a/client/gfx/appicon.svg b/client/gfx/appicon.svg
new file mode 100644
index 00000000..39600d0e
--- /dev/null
+++ b/client/gfx/appicon.svg
@@ -0,0 +1,66 @@
+<?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"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 33.866666 33.866668"
+   height="128"
+   width="128"
+   sodipodi:docname="appicon.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1015"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="3.6875"
+     inkscape:cx="88.748139"
+     inkscape:cy="24.600474"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <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>
+  <circle
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.0583334;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path814"
+     cx="16.933334"
+     cy="16.933334"
+     r="16.933334" />
+  <g
+     transform="matrix(0.74999993,0,0,0.74999993,4.2333333,-192.0583)"
+     id="layer1">
+    <path
+       id="path821-2"
+       style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.02645833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 16.933334,296.99999 c 3.174999,0 3.174999,0 5.291666,-0.52917 1.058333,-0.26458 1.5875,-0.52916 1.852083,-1.5875 0.264584,-2.11667 0.264584,-3.175 0.264584,-4.23333 0,-0.79375 0,-1.05834 -0.583965,-1.2841 -0.209373,-0.0809 -0.464217,-0.16857 -1.003535,-0.3034 -1.5875,-0.52917 -1.5875,-0.52917 -2.38125,-0.79375 -1.058334,-0.52917 -1.058334,-0.79375 -1.322916,-1.85209 -0.529168,-2.38124 -0.529168,-2.38125 -0.529168,-6.35 v -6.87916 c 0,-0.52917 0.269307,-4.01123 1.058334,-4.7625 0.529166,-0.52917 3.351389,-1.23473 5.027083,-1.85209 0.970139,-0.26458 1.940278,-0.52916 2.910417,-0.79375 1.322916,-0.26458 2.293055,-0.17639 3.439583,-0.26458 0.264584,0 0.79375,-0.26458 0.79375,-0.79375 v -1.05833 c 0,-0.29175 -0.264583,-0.52917 -0.529166,-0.52917 h -14.2875 z m -10e-7,0 c -3.174999,0 -3.174999,0 -5.291666,-0.52917 -1.058333,-0.26458 -1.5875,-0.52916 -1.852083,-1.5875 C 9.525,292.76665 9.525,291.70832 9.525,290.64999 c 0,-0.79375 0,-1.05834 0.583965,-1.2841 0.209373,-0.0809 0.464217,-0.16857 1.003535,-0.3034 1.5875,-0.52917 1.5875,-0.52917 2.38125,-0.79375 1.058334,-0.52917 1.058334,-0.79375 1.322916,-1.85209 0.529168,-2.38124 0.529168,-2.38125 0.529168,-6.35 v -6.87916 c 0,-0.52917 -0.269307,-4.01123 -1.058334,-4.7625 -0.529166,-0.52917 -3.351389,-1.23473 -5.027083,-1.85209 -0.970139,-0.26458 -1.940278,-0.52916 -2.910417,-0.79375 -1.322916,-0.26458 -2.293055,-0.17639 -3.439583,-0.26458 -0.264584,0 -0.79375,-0.26458 -0.79375,-0.79375 v -1.05833 c 0,-0.29175 0.264583,-0.52917 0.529166,-0.52917 h 14.2875 z"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/client/gfx/common.qrc b/client/gfx/common.qrc
new file mode 100644
index 00000000..b4f9399a
--- /dev/null
+++ b/client/gfx/common.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource>
+        <file>appicon.svg</file>
+    </qresource>
+</RCC>
diff --git a/client/src/mainwindow.cpp b/client/src/mainwindow.cpp
index b39c525b..7836d46b 100644
--- a/client/src/mainwindow.cpp
+++ b/client/src/mainwindow.cpp
@@ -74,6 +74,7 @@ MainWindow::MainWindow(QWidget* parent) :
 {
   instance = this;
 
+  setWindowIcon(QIcon(":/appicon.svg"));
   updateWindowTitle();
 
   QMenu* menu;