diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5d54775f..edcfae943 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -364,11 +364,7 @@ endif()
 if(NOT DEFINED ICONSDIR)
     if(UNIX)
         if(BUILD_BUNDLE)
-            if(APPLE)
-                set(ICONSDIR "${DATADIR}/icons")
-            else()
-                set(ICONSDIR "${DATADIR}/share/icons")
-            endif()
+            set(ICONSDIR "${DATADIR}/icons")
         else()
             set(ICONSDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
         endif()
diff --git a/rtdata/CMakeLists.txt b/rtdata/CMakeLists.txt
index 5597f51b7..0f6c907fb 100644
--- a/rtdata/CMakeLists.txt
+++ b/rtdata/CMakeLists.txt
@@ -52,7 +52,7 @@ install(DIRECTORY "${THEMEDIR}" DESTINATION "${DATADIR}")
 
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/png/empty.png" DESTINATION "${ICONSDIR}/rawtherapee/24x24/apps")
 install(FILES ${IMG_SVG} DESTINATION "${ICONSDIR}/rawtherapee/scalable/apps")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/svg/Index.theme" DESTINATION "${ICONSDIR}/rawtherapee")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/svg/index.theme" DESTINATION "${ICONSDIR}/rawtherapee")
 install(FILES ${IMG_ICO} DESTINATION "${DATADIR}/images")
 
 if(APPLE)
diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
index 11d4087f3..1281c5c83 100755
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -112,7 +112,7 @@ RTWindow::RTWindow ()
         // Setting default theme and icon theme (bases for custom themes)
         Gtk::Settings::get_for_screen (screen)->property_gtk_theme_name() = "Adwaita";
         Gtk::Settings::get_for_screen (screen)->property_gtk_application_prefer_dark_theme() = true;
-        Gtk::Settings::get_for_screen (screen)->property_gtk_icon_theme_name() = "RawTherapee";
+        Gtk::Settings::get_for_screen (screen)->property_gtk_icon_theme_name() = "rawtherapee";
 
         // Initialize RTScalable for Hi-DPI support
         RTScalable::init(this);