diff --git a/INSTALL.md b/INSTALL.md
index be9ae12a0..7edc5a4b5 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -131,9 +131,12 @@ Assuming the default installation prefix `/usr/local` has been used, this is the
 
 ```
 /usr/local/bin/emulationstation
-/usr/local/share/emulationstation/LICENSES
-/usr/local/share/emulationstation/resources
-/usr/local/share/emulationstation/themes
+/usr/local/share/applications/emulationstation.desktop
+/usr/local/share/emulationstation/LICENSE
+/usr/local/share/emulationstation/LICENSES/*
+/usr/local/share/emulationstation/resources/*
+/usr/local/share/emulationstation/themes/*
+/usr/local/share/pixmaps/emulationstation.svg
 ```
 
 ES will look in the following locations for the resources, in the listed order:
diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt
index e133a7113..67c51a23f 100644
--- a/es-app/CMakeLists.txt
+++ b/es-app/CMakeLists.txt
@@ -124,6 +124,12 @@ if(WIN32)
 else()
     install(TARGETS emulationstation RUNTIME
         DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+    install(FILES ${CMAKE_SOURCE_DIR}/LICENSE
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/emulationstation.desktop
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/emulationstation.svg
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
     install(DIRECTORY ${CMAKE_SOURCE_DIR}/LICENSES
         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
     install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes
diff --git a/es-app/src/emulationstation.desktop b/es-app/src/emulationstation.desktop
new file mode 100644
index 000000000..d6c8029b9
--- /dev/null
+++ b/es-app/src/emulationstation.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=EmulationStation Desktop Edition
+GenericName=EmulationStation
+Type=Application
+Comment=EmulationStation Emulator Front-end
+Icon=emulationstation
+Exec=emulationstation
+Terminal=false
+StartupNotify=true
+Hidden=false
+Keywords=emulator;front-end;frontend;
+Categories=Game;Emulator;
diff --git a/es-app/src/emulationstation.svg b/es-app/src/emulationstation.svg
new file mode 100644
index 000000000..52c043e26
--- /dev/null
+++ b/es-app/src/emulationstation.svg
@@ -0,0 +1,179 @@
+<?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"
+   width="128mm"
+   height="128mm"
+   viewBox="0 0 128 128"
+   version="1.1"
+   id="svg36"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   sodipodi:docname="es_icon.svg">
+  <defs
+     id="defs30">
+    <linearGradient
+       gradientTransform="matrix(0.30348265,0,0,0.30348265,-4.3978442,115.91624)"
+       y2="227.33839"
+       x2="323.80179"
+       y1="542.32233"
+       x1="118.3125"
+       gradientUnits="userSpaceOnUse"
+       id="SVGID_1_">
+      <stop
+         id="stop17"
+         style="stop-color:#004E73"
+         offset="0" />
+      <stop
+         id="stop19"
+         style="stop-color:#00A1B0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.30348265,0,0,0.30348265,-4.3978442,115.91624)"
+       y2="288.38571"
+       x2="399.80029"
+       y1="540.37299"
+       x1="144.813"
+       gradientUnits="userSpaceOnUse"
+       id="SVGID_2_">
+      <stop
+         id="stop26"
+         style="stop-color:#D3D3D3"
+         offset="0.3077" />
+      <stop
+         id="stop28"
+         style="stop-color:#FFFFFF"
+         offset="0.6752" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.30348265,0,0,0.30348265,-4.3978442,115.91624)"
+       y2="213.9668"
+       x2="326.25729"
+       y1="465.9541"
+       x1="71.269997"
+       gradientUnits="userSpaceOnUse"
+       id="SVGID_3_">
+      <stop
+         id="stop37"
+         style="stop-color:#D3D3D3"
+         offset="0.3077" />
+      <stop
+         id="stop39"
+         style="stop-color:#FFFFFF"
+         offset="0.6752" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="310.464"
+     inkscape:cy="234.13915"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1141"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid116" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata33">
+    <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>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-169)">
+    <path
+       style="fill:#c90012;stroke-width:0.30348265"
+       inkscape:connector-curvature="0"
+       id="path3"
+       d="M 126.56371,250.08499 Z" />
+    <path
+       style="fill:#c90012;stroke-width:0.30348265"
+       inkscape:connector-curvature="0"
+       id="path5"
+       d="M 126.56371,224.93208 Z" />
+    <path
+       style="fill:#c90012;stroke-width:0.30348265"
+       inkscape:connector-curvature="0"
+       id="path7"
+       d="M 126.56371,199.7703 Z" />
+    <path
+       style="fill:#c90012;stroke-width:0.30348265"
+       inkscape:connector-curvature="0"
+       id="path9"
+       d="M 126.56371,212.34876 Z" />
+    <path
+       style="fill:#c90012;stroke-width:0.30348265"
+       inkscape:connector-curvature="0"
+       id="path11"
+       d="M 126.56371,262.66349 Z" />
+    <path
+       style="fill:#c90012;stroke-width:0.30348265"
+       inkscape:connector-curvature="0"
+       id="path13"
+       d="M 126.56371,237.50412 Z" />
+    <path
+       style="fill:#c90012;stroke-width:0.30348265"
+       inkscape:connector-curvature="0"
+       id="path15"
+       d="M 126.56371,187.18671 Z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#SVGID_1_);stroke-width:0.30348265"
+       id="path22"
+       d="m 126.56371,190.55811 c 0,-1.85428 -1.51712,-3.3711 -3.37016,-3.3711 H 16.713302 c -1.854886,0 -4.444193,1.07249 -5.754946,2.38385 l -7.8131429,7.81318 c -1.3116588,1.31135 -2.38388359,3.90066 -2.38388359,5.75494 v 68.72914 c 0,1.85459 1.51711979,3.37137 3.37049649,3.37137 H 110.61174 c 1.85337,0 4.44423,-1.07287 5.75494,-2.38351 l 7.81198,-7.81046 c 1.31101,-1.30989 2.38354,-3.9007 2.38354,-5.75559 z" />
+    <path
+       style="opacity:0.2;stroke-width:0.30348265"
+       inkscape:connector-curvature="0"
+       id="path24"
+       d="m 111.59929,235.12088 -7.80831,-7.80827 c -1.31075,-1.31046 -3.900963,-2.38359 -5.754943,-2.38328 h -5.841429 c -1.854887,3e-4 -3.371705,3e-4 -3.371705,3e-4 0,0 1.071923,-1.07249 2.383582,-2.38385 l 20.392805,-20.3919 c 1.31106,-1.31136 0.86613,-2.38388 -0.98721,-2.38388 H 79.61585 c -1.854585,0 -4.443892,1.07252 -5.754947,2.38388 L 3.2322972,272.7743 c -0.553835,0.5527 -1.0673554,1.06644 -1.4782774,1.47673 0.6106453,0.61034 1.4524956,0.98906 2.3781082,0.98906 0.002,0 0.00298,0 0.00377,0 H 34.469919 85.45135 c 1.854584,0 3.375328,0 3.378687,-0.0113 0.0038,0 1.080077,-1.08095 2.391434,-2.3914 l 20.377069,-20.37346 c 1.31102,-1.30985 2.38354,-3.90066 2.38354,-5.75495 v -5.83746 c -6e-4,-1.85489 -1.07283,-4.44544 -2.38384,-5.75495 z"
+       enable-background="new    " />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#SVGID_2_);stroke-width:0.30348265"
+       id="path31"
+       d="m 79.613434,237.50627 c -1.853679,0 -4.443892,-1.07313 -5.754041,-2.38449 l -7.802535,-7.80495 c -1.311357,-1.31135 -2.384487,-3.90126 -2.386903,-5.75585 l -0.0038,-5.84082 c -0.003,-1.85428 1.069809,-4.44389 2.381128,-5.75525 l 7.811972,-7.81073 c 1.311357,-1.31135 3.900362,-2.38388 5.754909,-2.38388 h 30.997766 c 1.85337,0 2.29827,1.07253 0.98725,2.38388 l -7.81197,7.81073 c -1.31102,1.31136 -3.900363,2.38385 -5.754953,2.38385 H 79.614528 c -1.854886,0 -3.371704,1.51681 -3.371704,3.3711 v 5.84082 c 0,1.85428 1.516818,3.37106 3.370459,3.37046 l 18.422034,-0.002 c 1.85338,-6.1e-4 4.444193,1.07222 5.754953,2.38328 l 7.80831,7.80831 c 1.31101,1.3092 2.38354,3.90002 2.38354,5.75491 v 5.8375 c 0,1.85398 -1.07192,4.44479 -2.38354,5.7549 l -7.81167,7.81168 c -1.31136,1.30984 -3.900673,2.38358 -5.755253,2.38358 H 79.613924 c -1.854886,0 -4.443929,-1.07313 -5.754946,-2.38358 l -7.811972,-7.81168 c -1.311017,-1.3098 -0.86733,-2.38354 0.987255,-2.38354 h 30.997736 c 1.85485,0 3.371663,-1.51678 3.371663,-3.37106 v -5.83811 c 0,-1.85488 0,-3.37166 9.1e-4,-3.37166 9.1e-4,0 -1.515573,0 -3.369553,0 z" />
+    <g
+       transform="matrix(0.30348265,0,0,0.30348265,-4.3978441,115.91624)"
+       style="opacity:0.2"
+       id="g35">
+      <path
+         inkscape:connector-curvature="0"
+         id="path33"
+         d="m 17.008,370.877 c 0,-6.109 0,-11.238 0,-11.393 0,-0.155 3.532,-3.818 7.854,-8.138 L 92.047,284.16 c 4.321,-4.321 12.855,-7.855 18.963,-7.855 h 102.15 c 6.108,0 7.574,3.534 3.253,7.855 l -67.197,67.182 c -4.32,4.321 -7.853,7.855 -7.853,7.855 0,0 4.998,0.002 11.11,0.006 l 19.228,0.007 c 6.108,0.004 10.75,4.993 10.318,11.086 l -1.114,15.593 c -0.433,6.092 -1.707,11.997 -2.833,13.122 -1.125,1.125 -5.576,5.58 -9.896,9.896 l -25.201,25.201 c -4.32,4.315 -7.885,7.885 -7.922,7.918 -0.034,0.034 4.933,0.064 11.041,0.062 h 17.979 c 6.108,-0.004 14.784,3.379 19.281,7.519 l 26.836,24.694 c 4.497,4.137 8.181,7.623 8.058,7.75 -0.126,0.126 -3.766,3.762 -8.087,8.083 l -34.827,34.85 -147.212,0.002 c -6.107,0 -11.105,-4.998 -11.105,-11.11 z" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#SVGID_3_);stroke-width:0.30348265"
+       id="path42"
+       d="m 29.291758,250.08499 c -1.853376,0 -3.369892,-1.51678 -3.369892,-3.37106 v -5.8375 c 0,-1.85489 1.516818,-3.37171 3.369892,-3.37171 h 18.418373 c 1.853679,0 3.370459,-1.51678 3.370459,-3.37106 v -5.8287 c 0,-1.85489 -1.51678,-3.37167 -3.370459,-3.37167 H 29.291758 c -1.853376,0 -3.369892,-1.51682 -3.369892,-3.3711 v -5.84082 c 0,-1.85429 1.516818,-3.3711 3.369892,-3.3711 h 18.418373 c 1.853679,0 4.443891,-1.07249 5.75521,-2.38355 l 7.814389,-7.81193 c 1.311356,-1.31076 0.866461,-2.38324 -0.987217,-2.38324 H 29.291758 c -1.853376,0 -4.443891,1.07248 -5.754946,2.38384 l -7.810727,7.81012 c -1.311055,1.31136 -2.38445,3.90097 -2.38445,5.75525 v 30.99317 c 0,1.85428 1.073395,4.4448 2.38445,5.75491 l 7.810727,7.81167 c 1.311357,1.30984 3.901268,2.38358 5.754946,2.38358 h 30.998641 c 1.854886,0 2.298573,-1.07313 0.987217,-2.38388 l -7.811935,-7.81288 c -1.311055,-1.31132 -3.900965,-2.38445 -5.755248,-2.38445 z" />
+  </g>
+</svg>