diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 7ceb9c60f..acf7e026c 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -35,7 +35,7 @@ if (BUILD_GUI)
# icons
install(FILES icon.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
- install(FILES icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps)
+ install(FILES cppcheck-gui.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps)
set(CMAKE_AUTOMOC OFF)
diff --git a/gui/about.ui b/gui/about.ui
index 03b2d390a..13cd19bf6 100644
--- a/gui/about.ui
+++ b/gui/about.ui
@@ -24,7 +24,7 @@
- :/icon.png
+ :/cppcheck-gui.png
diff --git a/gui/cppcheck-gui.desktop b/gui/cppcheck-gui.desktop
index 844d5153f..21e611f40 100644
--- a/gui/cppcheck-gui.desktop
+++ b/gui/cppcheck-gui.desktop
@@ -4,5 +4,5 @@ Type=Application
Name=Cppcheck
Comment=A tool for static C/C++ code analysis
Exec=cppcheck-gui
-Icon=icon
+Icon=cppcheck-gui
Categories=Development;Debugger;Qt;
diff --git a/gui/icon.png b/gui/cppcheck-gui.png
similarity index 100%
rename from gui/icon.png
rename to gui/cppcheck-gui.png
diff --git a/gui/gui.qrc b/gui/gui.qrc
index 12eb6312b..076b12f6a 100644
--- a/gui/gui.qrc
+++ b/gui/gui.qrc
@@ -1,6 +1,6 @@
- icon.png
+ cppcheck-gui.png
images/dialog-error.png
images/dialog-information.png
images/dialog-warning.png
diff --git a/gui/main.cpp b/gui/main.cpp
index a02cfb13c..254bdd1c9 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
if (!CheckArgs(app.arguments()))
return 0;
- app.setWindowIcon(QIcon(":icon.png"));
+ app.setWindowIcon(QIcon(":cppcheck-gui.png"));
// Register this metatype that is used to transfer error info
qRegisterMetaType("ErrorItem");
diff --git a/gui/main.ui b/gui/main.ui
index a6daa7f0a..09c4ecc97 100644
--- a/gui/main.ui
+++ b/gui/main.ui
@@ -260,7 +260,7 @@
- :/icon.png:/icon.png
+ :/cppcheck-gui.png:/cppcheck-gui.png
&Directory...