diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 774f42267..3a5f4edab 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -9,7 +9,7 @@ if (BUILD_GUI)
     else()
         add_definitions(-DQT_DEBUG)
     endif()
-    
+
     include_directories(${PROJECT_SOURCE_DIR}/lib/)
     include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/)
 
@@ -20,7 +20,7 @@ if (BUILD_GUI)
     QT4_WRAP_UI(uis_hdrs ${uis})
     QT4_ADD_RESOURCES(resources "gui.qrc")
     QT4_ADD_TRANSLATION(qms ${tss})
-    
+
     add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:tinyxml_objs> $<TARGET_OBJECTS:simplecpp_objs>)
     target_link_libraries(cppcheck-gui ${QT_LIBRARIES})
     if (HAVE_RULES)
@@ -31,6 +31,12 @@ if (BUILD_GUI)
     install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
     install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
 
+    install(FILES cppcheck-gui.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+
+    # icons
+    install(FILES cppcheck-gui.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
+    install(FILES cppcheck-gui.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/64x64/apps)
+
     set(CMAKE_AUTOMOC OFF)
 
 endif()
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 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="gui.qrc">:/icon.png</pixmap>
+          <pixmap resource="gui.qrc">:/cppcheck-gui.png</pixmap>
          </property>
         </widget>
        </item>
diff --git a/gui/cppcheck-gui.desktop b/gui/cppcheck-gui.desktop
new file mode 100644
index 000000000..21e611f40
--- /dev/null
+++ b/gui/cppcheck-gui.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Cppcheck
+Comment=A tool for static C/C++ code analysis
+Exec=cppcheck-gui
+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/icon.svg b/gui/cppcheck-gui.svg
similarity index 65%
rename from gui/icon.svg
rename to gui/cppcheck-gui.svg
index 7f565752d..5c31942df 100644
--- a/gui/icon.svg
+++ b/gui/cppcheck-gui.svg
@@ -9,12 +9,12 @@
    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="744.09448819"
-   height="1052.3622047"
+   width="573.00116"
+   height="505.54184"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="icon.svg"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="cppcheck-gui.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    inkscape:export-filename="/home/daniel/cppcheck/logo.png"
    inkscape:export-xdpi="12.045081"
@@ -33,16 +33,20 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.59676231"
-     inkscape:cx="409.21617"
-     inkscape:cy="560.6768"
+     inkscape:cx="320.1211"
+     inkscape:cy="296.99526"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1440"
-     inkscape:window-height="900"
+     inkscape:window-height="891"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="0" />
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -51,15 +55,17 @@
         <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">
+     id="layer1"
+     transform="translate(-92.44649,-283.13881)">
     <path
-       style="fill:#88aa00;fill-rule:evenodd;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#88aa00;fill-rule:evenodd;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 174.07528,636.75382 93.83228,49.57527 193.83211,-159.94892 100.43557,52.9473 -288.40158,200.50224 -167.38943,-94.83028 67.69105,-48.24561 z"
        id="path2395"
        sodipodi:nodetypes="ccccccc"
@@ -68,7 +74,7 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-size:514.91314697px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#9797ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Serif;-inkscape-font-specification:Serif Bold"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:514.91314697px;font-family:Serif;-inkscape-font-specification:'Serif Bold';fill:#9797ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        x="83.791084"
        y="569.93414"
        id="text3351"
@@ -77,10 +83,10 @@
          id="tspan3353"
          x="83.791084"
          y="569.93414"
-         style="fill:#9797ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:15;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">c</tspan></text>
+         style="fill:#9797ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:15;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">c</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:263.74542236px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#9797ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:AlMothnna;-inkscape-font-specification:AlMothnna Bold"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:263.74542236px;font-family:AlMothnna;-inkscape-font-specification:'AlMothnna Bold';fill:#9797ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        x="496.65094"
        y="375.33548"
        id="text3347"
@@ -89,6 +95,6 @@
          id="tspan3349"
          x="496.65094"
          y="375.33548"
-         style="fill:#9797ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:15;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">++</tspan></text>
+         style="fill:#9797ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:15;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">++</tspan></text>
   </g>
 </svg>
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 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-    <file>icon.png</file>
+    <file>cppcheck-gui.png</file>
     <file>images/dialog-error.png</file>
     <file>images/dialog-information.png</file>
     <file>images/dialog-warning.png</file>
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>("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 @@
   <action name="mActionCheckDirectory">
    <property name="icon">
     <iconset resource="gui.qrc">
-     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+     <normaloff>:/cppcheck-gui.png</normaloff>:/cppcheck-gui.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Directory...</string>