diff --git a/rtdata/icons/mime-types b/rtdata/icons/mime-types
new file mode 100644
index 000000000..6a70a2653
--- /dev/null
+++ b/rtdata/icons/mime-types
@@ -0,0 +1,32 @@
+# Add all image extensions supported by RT to this file, using the image/x- format.
+# Convert this human-readable list into a desktop file format using
+# tr -d '\n' < mime-types
+image/jpeg;
+image/png;
+image/tiff;
+image/x-adobe-dng;
+image/x-canon-cr2;
+image/x-canon-crf;
+image/x-canon-crw;
+image/x-fuji-raf;
+image/x-jpg;
+image/x-kodak-dcr;
+image/x-kodak-k25;
+image/x-kodak-kdc;
+image/x-mamiya-mef;
+image/x-minolta-mrw;
+image/x-nikon-nef;
+image/x-nikon-nrw;
+image/x-olympus-orf;
+image/x-panasonic-raw;
+image/x-panasonic-rw2;
+image/x-pentax-pef;
+image/x-pentax-raw;
+image/x-raw;
+image/x-rwz;
+image/x-samsung-srw;
+image/x-sony-arw;
+image/x-sony-sr2;
+image/x-sony-srf;
+image/x-tif;
+inode/directory;
diff --git a/rtdata/icons/rawtherapee.desktop.in b/rtdata/icons/rawtherapee.desktop.in
index be7acbf43..6a810edd9 100644
--- a/rtdata/icons/rawtherapee.desktop.in
+++ b/rtdata/icons/rawtherapee.desktop.in
@@ -1,16 +1,17 @@
 [Desktop Entry]
-Version=1.0
 Type=Application
+Version=1.0
 Name=RawTherapee
-GenericName=RAW image editor
-GenericName[cs]=Editor RAW obrázků
-GenericName[fr]=Éditeur d'images RAW
-Comment=The RAW converter and digital photo processing software. 
+GenericName=Raw photo editor
+GenericName[cs]=Editor raw obrázků
+GenericName[fr]=Éditeur d'images raw
+GenericName[pl]=Edytor zdjęć raw
+Comment=An advanced photo development program
 Comment[cs]=Program pro konverzi a zpracování digitálních RAW fotografií.
 Comment[fr]=Logiciel de conversion et de traitement de photos numériques de format RAW (but de capteur).
-Exec=${BINDIR}/rawtherapee
-Icon=rawtherapee.png
+Comment[pl]=Zaawansowany program do wywoływania zdjęć
+Icon=rawtherapee
+Exec=rawtherapee %f
 Terminal=false
-Categories=Graphics;Photography;GTK;
-
-MimeType=image/jpeg;image/png;image/tiff;image/x-adobe-dng;image/x-canon-crw;image/x-canon-cr2;image/x-fuji-raf;image/x-kodak-dcr;image/x-kodak-kdc;image/x-kodak-k25;image/x-minolta-mrw;image/x-nikon-nef;image/x-olympus-orf;image/x-panasonic-raw;image/x-pentax-pef;image/x-sony-arw;image/x-sony-srf;image/x-sony-sr2;
+MimeType=image/jpeg;image/png;image/tiff;image/x-adobe-dng;image/x-canon-cr2;image/x-canon-crf;image/x-canon-crw;image/x-fuji-raf;image/x-jpg;image/x-kodak-dcr;image/x-kodak-k25;image/x-kodak-kdc;image/x-mamiya-mef;image/x-minolta-mrw;image/x-nikon-nef;image/x-nikon-nrw;image/x-olympus-orf;image/x-panasonic-raw;image/x-panasonic-rw2;image/x-pentax-pef;image/x-pentax-raw;image/x-raw;image/x-rwz;image/x-samsung-srw;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-tif;inode/directory;
+Categories=Photography;Graphics;2DGraphics;RasterGraphics;GTK;
diff --git a/rtinstaller.nsi b/rtinstaller.nsi
deleted file mode 100644
index 8a7227ed9..000000000
--- a/rtinstaller.nsi
+++ /dev/null
@@ -1,135 +0,0 @@
-;NSIS Modern User Interface
-;Start Menu Folder Selection Example Script
-;Written by Joost Verburg
-
-;--------------------------------
-;Include Modern UI
-
-  !include "MUI2.nsh"
-
-;--------------------------------
-;General
-  SetCompressor /SOLID lzma
-
-  ;Name and file
-  Name "Raw Therapee 3.0 alpha 1"
-  OutFile "rawtherapee30a1.exe"
-
-  ;Default installation folder
-  InstallDir "$PROGRAMFILES\Raw Therapee 3.0 A1"
-  
-  ;Get installation folder from registry if available
-  InstallDirRegKey HKCU "Software\Raw Therapee 3.0 A1" ""
-
-  ;Request application privileges for Windows Vista
-  RequestExecutionLevel admin
-
-;--------------------------------
-;Variables
-
-  Var StartMenuFolder
-
-;--------------------------------
-;Interface Settings
-
-  !define MUI_ABORTWARNING
-
-;--------------------------------
-;Pages
-
-#  !insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
-  !insertmacro MUI_PAGE_COMPONENTS
-  !insertmacro MUI_PAGE_DIRECTORY
-  
-  ;Start Menu Folder Page Configuration
-  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" 
-  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Raw Therapee 3.0 A1" 
-  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-  !define MUI_STARTMENUPAGE_DEFAULTFOLDER "Raw Therapee"
-
-  !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
-  
-  !insertmacro MUI_PAGE_INSTFILES
-  
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-
-;--------------------------------
-;Languages
- 
-  !insertmacro MUI_LANGUAGE "English"
-
-;--------------------------------
-;Installer Sections
-
-;First possible component
-Section "Binaries" Component1
-  SectionIn 1 RO
-  SetOutPath "$INSTDIR"
-  
-  ;ADD YOUR OWN FILES HERE...
-  AddSize 34553
-  File /r /x rtinstaller.nsi *.* 
-  
-  ;Store installation folder
-  WriteRegStr HKCU "Software\Raw Therapee" "" $INSTDIR
-  
-  ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-  
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-    ;Create shortcuts
-    CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Raw Therapee.lnk" "$INSTDIR\rt.exe"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-  !insertmacro MUI_STARTMENU_WRITE_END
-SectionEnd
-
-Section "Desktop Shortcut" Component2
-    ;Create Shortcut
-    CreateShortCut "$DESKTOP\Raw Therapee.lnk" "$INSTDIR\rt.exe"
-SectionEnd
-
-Section "Quicklaunch Shortcut" Component3
-    ;Create Shortcut
-    CreateShortCut "$QUICKLAUNCH\Raw Therapee.lnk" "$INSTDIR\rt.exe"
-SectionEnd
-;--------------------------------
-;Descriptions
-
-  ;Language strings
-  LangString DESC_Component1 ${LANG_ENGLISH} "Raw Therapee Binaries"
-  LangString DESC_Component2 ${LANG_ENGLISH} "Create Raw Therapee shortcut on desktop"
-  LangString DESC_Component3 ${LANG_ENGLISH} "Create Raw Therapee shortcut on quicklaunch bar"
-
-  ;Assign language strings to sections
-  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-    !insertmacro MUI_DESCRIPTION_TEXT ${Component1} $(DESC_Component1)
-    !insertmacro MUI_DESCRIPTION_TEXT ${Component2} $(DESC_Component2)
-    !insertmacro MUI_DESCRIPTION_TEXT ${Component3} $(DESC_Component3)
-  !insertmacro MUI_FUNCTION_DESCRIPTION_END
- 
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-
-  ;ADD YOUR OWN FILES HERE...
-
-  Delete "$INSTDIR\Uninstall.exe"
-
-  RMDir "$INSTDIR"
-  
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
-    
-  Delete "$SMPROGRAMS\$StartMenuFolder\Raw Therapee.lnk"
-  Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
-  Delete "$DESKTOP\Raw Therapee.lnk"
-  Delete "$QUICKLAUNCH\Raw Therapee.lnk"
-  RMDir /r "$INSTDIR"
-  RMDir "$SMPROGRAMS\$StartMenuFolder"
-  
-  DeleteRegKey HKCU "Software\Raw Therapee 3.0 A1"
-
-
-SectionEnd
\ No newline at end of file