diff --git a/images/svg/CMakeLists.txt b/images/svg/CMakeLists.txt
index ff848a139e4b..b97f62b04c86 100644
--- a/images/svg/CMakeLists.txt
+++ b/images/svg/CMakeLists.txt
@@ -1,9 +1,11 @@
 
-SET (SVG_DIRS 
+SET (SVG_DIRS
  accommodation
  amenity
- biology
- biology  
+ arrows
+ backgrounds
+ components
+ crosses
  emergency
  entertainment
  food
@@ -13,7 +15,6 @@ SET (SVG_DIRS
  icon
  landmark
  money
- north_arrows
  religion
  services
  shopping
@@ -21,6 +22,7 @@ SET (SVG_DIRS
  symbol
  tourist
  transport
+ wind_roses
 )
   
 
diff --git a/images/svg/north_arrows/Arrow_01.svg b/images/svg/arrows/Arrow_01.svg
similarity index 100%
rename from images/svg/north_arrows/Arrow_01.svg
rename to images/svg/arrows/Arrow_01.svg
diff --git a/images/svg/north_arrows/Arrow_02.svg b/images/svg/arrows/Arrow_02.svg
similarity index 100%
rename from images/svg/north_arrows/Arrow_02.svg
rename to images/svg/arrows/Arrow_02.svg
diff --git a/images/svg/north_arrows/Arrow_03.svg b/images/svg/arrows/Arrow_03.svg
similarity index 100%
rename from images/svg/north_arrows/Arrow_03.svg
rename to images/svg/arrows/Arrow_03.svg
diff --git a/images/svg/north_arrows/Arrow_04.svg b/images/svg/arrows/Arrow_04.svg
similarity index 100%
rename from images/svg/north_arrows/Arrow_04.svg
rename to images/svg/arrows/Arrow_04.svg
diff --git a/images/svg/north_arrows/Arrow_05.svg b/images/svg/arrows/Arrow_05.svg
similarity index 100%
rename from images/svg/north_arrows/Arrow_05.svg
rename to images/svg/arrows/Arrow_05.svg
diff --git a/images/svg/north_arrows/Arrow_06.svg b/images/svg/arrows/Arrow_06.svg
similarity index 100%
rename from images/svg/north_arrows/Arrow_06.svg
rename to images/svg/arrows/Arrow_06.svg
diff --git a/images/svg/north_arrows/NorthArrow_01.svg b/images/svg/arrows/NorthArrow_01.svg
similarity index 100%
rename from images/svg/north_arrows/NorthArrow_01.svg
rename to images/svg/arrows/NorthArrow_01.svg
diff --git a/images/svg/north_arrows/WindRose_01.svg b/images/svg/wind_roses/WindRose_01.svg
similarity index 100%
rename from images/svg/north_arrows/WindRose_01.svg
rename to images/svg/wind_roses/WindRose_01.svg
diff --git a/images/svg/north_arrows/WindRose_02.svg b/images/svg/wind_roses/WindRose_02.svg
similarity index 100%
rename from images/svg/north_arrows/WindRose_02.svg
rename to images/svg/wind_roses/WindRose_02.svg