diff --git a/icons-dark/CMakeLists.txt b/icons-dark/CMakeLists.txt
index 82b181ee..043eb840 100644
--- a/icons-dark/CMakeLists.txt
+++ b/icons-dark/CMakeLists.txt
@@ -1,31 +1,32 @@
 if(BINARY_ICONS_RESOURCE)
     generate_binary_resource(icons-dark binary_resource)
 endif()
 
 ########### install files ###############
 
 set(breeze_icon_dark_dirs
     actions animations applets apps categories preferences devices emblems
     emotes mimetypes places status)
 
 set(BREEZE_INSTALL_DIR ${KDE_INSTALL_FULL_ICONDIR}/breeze-dark)
 
-if (NOT SKIP_INSTALL_ICONS)
-    install( DIRECTORY ${breeze_icon_dark_dirs} DESTINATION ${BREEZE_INSTALL_DIR} )
-    install( FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR})
-endif()
-
 # Auto-generate 24px monochrome icons from 22px versions
 if(NOT WIN32)
     find_program(BASH_EXE bash)
-    add_custom_target(breeze-generate-24px-versions ALL
-        COMMAND ${BASH_EXE} ${CMAKE_SOURCE_DIR}/generate-24px-versions.sh ${BREEZE_INSTALL_DIR}
+    add_custom_target(breeze-generate-24px-versions-dark ALL
+        COMMAND ${BASH_EXE} ${CMAKE_SOURCE_DIR}/generate-24px-versions.sh ${CMAKE_CURRENT_BINARY_DIR}/generated/
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     )
 endif()
 
+if (NOT SKIP_INSTALL_ICONS)
+    install( DIRECTORY ${breeze_icon_dark_dirs} DESTINATION ${BREEZE_INSTALL_DIR} )
+    install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/ DESTINATION ${BREEZE_INSTALL_DIR} )
+    install( FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR})
+endif()
+
 gtk_update_icon_cache(${BREEZE_INSTALL_DIR})
 
 if(BINARY_ICONS_RESOURCE)
     install( FILES ${binary_resource} DESTINATION ${BREEZE_INSTALL_DIR})
 endif()
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 83234af5..6acafb8f 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,31 +1,32 @@
 if(BINARY_ICONS_RESOURCE)
     generate_binary_resource(icons binary_resource)
 endif()
 
 ########### install files ###############
 
 set(breeze_icon_dirs
     actions animations applets apps categories preferences devices emblems
     emotes mimetypes places status)
 
 set(BREEZE_INSTALL_DIR ${KDE_INSTALL_FULL_ICONDIR}/breeze)
 
-if (NOT SKIP_INSTALL_ICONS)
-    install( DIRECTORY ${breeze_icon_dirs} DESTINATION ${BREEZE_INSTALL_DIR} )
-    install( FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR})
-endif()
-
 # Auto-generate 24px monochrome icons from 22px versions
 if(NOT WIN32)
-    find_program(SH_EXE sh)
-    add_custom_target(breeze-generate-24px-versions-dark ALL
-        COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/generate-24px-versions.sh ${BREEZE_INSTALL_DIR}
+    find_program(BASH_EXE bash)
+    add_custom_target(breeze-generate-24px-versions ALL
+        COMMAND ${BASH_EXE} ${CMAKE_SOURCE_DIR}/generate-24px-versions.sh ${CMAKE_CURRENT_BINARY_DIR}/generated/
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     )
 endif()
 
+if (NOT SKIP_INSTALL_ICONS)
+    install( DIRECTORY ${breeze_icon_dirs} DESTINATION ${BREEZE_INSTALL_DIR} )
+    install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/ DESTINATION ${BREEZE_INSTALL_DIR} )
+    install( FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR})
+endif()
+
 gtk_update_icon_cache(${BREEZE_INSTALL_DIR})
 
 if(BINARY_ICONS_RESOURCE)
     install( FILES ${binary_resource} DESTINATION ${BREEZE_INSTALL_DIR})
 endif()
diff --git a/validate_svg.sh b/validate_svg.sh
index 829e5696..426ccaec 100644
--- a/validate_svg.sh
+++ b/validate_svg.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-find . -name '*.svg' -exec xmllint --noout {} + 2> xmlerrors
+find . -type f -name '*.svg' -exec xmllint --noout {} + 2> xmlerrors
 if [ -s xmlerrors ]; then
     cat xmlerrors
     rm xmlerrors
     exit 1
 fi
 rm xmlerrors