diff --git a/CMakeLists.txt b/CMakeLists.txt
index 716c645024..ee87e496e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -872,6 +872,6 @@ configure_file(io.github.daid.EmptyEpsilon.metainfo.xml.in io.github.daid.EmptyE
 
 if(UNIX AND NOT APPLE AND NOT STEAMSDK)
   install(FILES io.github.daid.EmptyEpsilon.desktop DESTINATION "share/applications")
-  install(FILES logo512.png DESTINATION "share/icons/hicolor/512x512/apps" RENAME "io.github.daid.EmptyEpsilon.png")
+  install(FILES resources/logo512.png DESTINATION "share/icons/hicolor/512x512/apps" RENAME "io.github.daid.EmptyEpsilon.png")
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/io.github.daid.EmptyEpsilon.metainfo.xml DESTINATION "share/metainfo")
 endif()
diff --git a/logo512.png b/resources/logo_icon.png
similarity index 100%
rename from logo512.png
rename to resources/logo_icon.png
diff --git a/src/init/displaywindows.cpp b/src/init/displaywindows.cpp
index 96e494993a..756a3c833a 100644
--- a/src/init/displaywindows.cpp
+++ b/src/init/displaywindows.cpp
@@ -89,6 +89,7 @@ bool createDisplayWindows()
             window->setTitle("EmptyEpsilon - " + PreferencesManager::get("instance_name") + postfix);
         else
             window->setTitle("EmptyEpsilon" + postfix);
+        window->setIcon("logo_icon.png");
     }
 
     if (gl::isAvailable())