diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 66dc9a37d..bd15fdfc6 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,6 +1,29 @@
 installdir = $(DATADIR)/neutrino/icons
 
-install_DATA = \
+locale = \
+	locale/deutsch.png \
+	locale/english.png
+
+locale_unmaintained = \
+	locale/unmaintained/bayrisch.png \
+	locale/unmaintained/bosanski.png \
+	locale/unmaintained/ch-baslerdeutsch.png \
+	locale/unmaintained/ch-berndeutsch.png \
+	locale/unmaintained/czech.png \
+	locale/unmaintained/francais.png \
+	locale/unmaintained/italiano.png \
+	locale/unmaintained/nederlands.png \
+	locale/unmaintained/polski.png \
+	locale/unmaintained/portugues.png \
+	locale/unmaintained/russkij.png \
+	locale/unmaintained/slovak.png \
+	locale/unmaintained/suomi.png \
+	locale/unmaintained/svenska.png
+
+install_DATA  = $(locale)
+install_DATA += $(locale_unmaintained)
+
+install_DATA += \
 	0.png \
 	1.png \
 	16_9.png \
@@ -16,7 +39,6 @@ install_DATA = \
 	ats.png \
 	ats_gray.png \
 	audio.png \
-	bayrisch.png \
 	biss_green.png \
 	biss_white.png \
 	biss_yellow.png \
@@ -24,15 +46,12 @@ install_DATA = \
 	bookmarkmanager.png \
 	border_lr.png \
 	border_ul.png \
-	bosanski.png \
 	btn_record_active.png \
 	btn_record_inactive.png \
 	btn_stop.png \
 	ca.png \
 	ca2.png \
 	ca2_gray.png \
-	ch-baslerdeutsch.png \
-	ch-berndeutsch.png \
 	colors.png \
 	conax_green.png \
 	conax_white.png \
@@ -40,7 +59,6 @@ install_DATA = \
 	cw_green.png \
 	cw_white.png \
 	cw_yellow.png \
-	czech.png \
 	d_green.png \
 	d_white.png \
 	d_yellow.png \
@@ -48,17 +66,13 @@ install_DATA = \
 	dd_avail.png \
 	dd_gray.png \
 	ddfill.png \
-	deutsch.png \
 	down.png \
 	dutch.png \
 	ellinika.png \
-	english.png \
 	error.png \
 	features.png \
 	file.png \
 	folder.png \
-	francais.png \
-	french.png \
 	games.png \
 	gelb.png \
 	gruen.png \
@@ -120,7 +134,6 @@ install_DATA = \
 	ird_green.png \
 	ird_white.png \
 	ird_yellow.png \
-	italiano.png \
 	keybinding.png \
 	language.png \
 	lcd.png \
@@ -157,7 +170,6 @@ install_DATA = \
 	nds_green.png \
 	nds_white.png \
 	nds_yellow.png \
-	nederlands.png \
 	network.png \
 	norsk.png \
 	not_mounted.png \
@@ -165,8 +177,6 @@ install_DATA = \
 	numericpad.png \
 	ok.png \
 	personalize.png \
-	polski.png \
-	portugues.png \
 	power.png \
 	powervu_green.png \
 	powervu_white.png \
@@ -210,7 +220,6 @@ install_DATA = \
 	right.png \
 	romania.png \
 	rot.png \
-	russkij.png \
 	scan.jpg \
 	seca_green.png \
 	seca_white.png \
@@ -218,14 +227,11 @@ install_DATA = \
 	settings.png \
 	shell.png \
 	shutdown.jpg \
-	slovak.png \
 	softupdate.png \
 	start.jpg \
 	streaming.png \
 	subt.png \
 	subt_gray.png \
-	suomi.png \
-	svenska.png \
 	timer.png \
 	tuner_1.png \
 	tuner_2.png \
diff --git a/data/icons/deutsch.png b/data/icons/locale/deutsch.png
similarity index 100%
rename from data/icons/deutsch.png
rename to data/icons/locale/deutsch.png
diff --git a/data/icons/english.png b/data/icons/locale/english.png
similarity index 100%
rename from data/icons/english.png
rename to data/icons/locale/english.png
diff --git a/data/icons/bayrisch.png b/data/icons/locale/unmaintained/bayrisch.png
similarity index 100%
rename from data/icons/bayrisch.png
rename to data/icons/locale/unmaintained/bayrisch.png
diff --git a/data/icons/bosanski.png b/data/icons/locale/unmaintained/bosanski.png
similarity index 100%
rename from data/icons/bosanski.png
rename to data/icons/locale/unmaintained/bosanski.png
diff --git a/data/icons/ch-baslerdeutsch.png b/data/icons/locale/unmaintained/ch-baslerdeutsch.png
similarity index 100%
rename from data/icons/ch-baslerdeutsch.png
rename to data/icons/locale/unmaintained/ch-baslerdeutsch.png
diff --git a/data/icons/ch-berndeutsch.png b/data/icons/locale/unmaintained/ch-berndeutsch.png
similarity index 100%
rename from data/icons/ch-berndeutsch.png
rename to data/icons/locale/unmaintained/ch-berndeutsch.png
diff --git a/data/icons/czech.png b/data/icons/locale/unmaintained/czech.png
similarity index 100%
rename from data/icons/czech.png
rename to data/icons/locale/unmaintained/czech.png
diff --git a/data/icons/dutch.png b/data/icons/locale/unmaintained/dutch.png
similarity index 100%
rename from data/icons/dutch.png
rename to data/icons/locale/unmaintained/dutch.png
diff --git a/data/icons/francais.png b/data/icons/locale/unmaintained/francais.png
similarity index 100%
rename from data/icons/francais.png
rename to data/icons/locale/unmaintained/francais.png
diff --git a/data/icons/french.png b/data/icons/locale/unmaintained/french.png
similarity index 100%
rename from data/icons/french.png
rename to data/icons/locale/unmaintained/french.png
diff --git a/data/icons/hungarian.png b/data/icons/locale/unmaintained/hungarian.png
similarity index 100%
rename from data/icons/hungarian.png
rename to data/icons/locale/unmaintained/hungarian.png
diff --git a/data/icons/italiano.png b/data/icons/locale/unmaintained/italiano.png
similarity index 100%
rename from data/icons/italiano.png
rename to data/icons/locale/unmaintained/italiano.png
diff --git a/data/icons/nederlands.png b/data/icons/locale/unmaintained/nederlands.png
similarity index 100%
rename from data/icons/nederlands.png
rename to data/icons/locale/unmaintained/nederlands.png
diff --git a/data/icons/polski.png b/data/icons/locale/unmaintained/polski.png
similarity index 100%
rename from data/icons/polski.png
rename to data/icons/locale/unmaintained/polski.png
diff --git a/data/icons/portugues.png b/data/icons/locale/unmaintained/portugues.png
similarity index 100%
rename from data/icons/portugues.png
rename to data/icons/locale/unmaintained/portugues.png
diff --git a/data/icons/russkij.png b/data/icons/locale/unmaintained/russkij.png
similarity index 100%
rename from data/icons/russkij.png
rename to data/icons/locale/unmaintained/russkij.png
diff --git a/data/icons/slovak.png b/data/icons/locale/unmaintained/slovak.png
similarity index 100%
rename from data/icons/slovak.png
rename to data/icons/locale/unmaintained/slovak.png
diff --git a/data/icons/suomi.png b/data/icons/locale/unmaintained/suomi.png
similarity index 100%
rename from data/icons/suomi.png
rename to data/icons/locale/unmaintained/suomi.png
diff --git a/data/icons/svenska.png b/data/icons/locale/unmaintained/svenska.png
similarity index 100%
rename from data/icons/svenska.png
rename to data/icons/locale/unmaintained/svenska.png