diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 01643e4a..b70d29b1 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -164,7 +164,6 @@ if(APPLE)
   set_source_files_properties(${OSX_ICON_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
   set( cockatrice_SOURCES ${cockatrice_SOURCES} ${OSX_ICON_FILES} )
 ENDIF(APPLE)
-
 SET(QT_USE_QTNETWORK TRUE)
 SET(QT_USE_QTSCRIPT TRUE)
 SET(QT_USE_QTMULTIMEDIA TRUE)
@@ -194,3 +193,9 @@ ADD_EXECUTABLE(cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} ${cockatrice
 TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY} ${PROTOBUF_LIBRARIES})
 
 INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cockatrice DESTINATION bin)
+if (NOT WIN32 AND NOT APPLE)
+	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION share/icons/hicolor/48x48/apps)
+	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION share/icons/hicolor/scalable/apps)
+	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION share/applications)
+ENDIF(NOT WIN32 AND NOT APPLE)
+
diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc
index 6866e778..dd7416de 100644
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -26,7 +26,7 @@
 	<file>resources/icon_clearsearch.svg</file>
         <file>resources/icon_update.png</file>
         <file>resources/hr.jpg</file>
-        <file>resources/appicon.svg</file>
+        <file alias="resources/appicon.svg">resources/cockatrice.svg</file>
         <file>resources/add_to_sideboard.svg</file>
         <file>resources/decrement.svg</file>
         <file>resources/increment.svg</file>
diff --git a/cockatrice/resources/cockatrice.png b/cockatrice/resources/cockatrice.png
new file mode 100644
index 00000000..ed79b88a
Binary files /dev/null and b/cockatrice/resources/cockatrice.png differ
diff --git a/cockatrice/resources/appicon.svg b/cockatrice/resources/cockatrice.svg
similarity index 100%
rename from cockatrice/resources/appicon.svg
rename to cockatrice/resources/cockatrice.svg
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index 05392f1a..4d82dff1 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -20,3 +20,6 @@ ADD_EXECUTABLE(oracle WIN32 MACOSX_BUNDLE ${oracle_SOURCES} ${oracle_HEADERS_MOC
 TARGET_LINK_LIBRARIES(oracle ${QT_LIBRARIES})
 
 INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/oracle DESTINATION bin)
+IF (NOT WIN32 AND NOT APPLE)
+	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION share/applications)
+ENDIF (NOT WIN32 AND NOT APPLE)
diff --git a/oracle/oracle.desktop b/oracle/oracle.desktop
new file mode 100644
index 00000000..db8d4b61
--- /dev/null
+++ b/oracle/oracle.desktop
@@ -0,0 +1,8 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Cockatrice Oracle downloader
+Exec=oracle
+Icon=cockatrice
+Categories=Game;CardGame;