diff --git a/720p/Settings.xml b/720p/Settings.xml
index aca3ade..a657450 100644
--- a/720p/Settings.xml
+++ b/720p/Settings.xml
@@ -85,12 +85,12 @@
 					<item>
 						<label>7</label>
 						<onclick>ActivateWindow(FileManager)</onclick>
-						<icon>FileManager.png</icon>
+						<icon>icons/settings/icon_FileManager.png</icon>
 					</item>
 					<item>
 						<label>24001</label>
 						<onclick>ActivateWindow(AddonBrowser)</onclick>
-						<icon>icon_addons.png</icon>
+						<icon>icons/settings/icon_Addons.png</icon>
 					</item>
 					<item>
 						<label>138</label>
@@ -100,37 +100,37 @@
 					<item>
 						<label>10050</label>
 						<onclick>ActivateWindow(Eventlog)</onclick>
-						<icon>unknown-user.png</icon>
+						<icon>icons/settings/icon_EventLog.png</icon>
 					</item>
 					<item>
-                                                <label>14036</label>
-                                                <onclick>ActivateWindow(servicesettings)</onclick>
-                                                <icon>unknown-user.png</icon>
+						<label>14036</label>
+						<onclick>ActivateWindow(servicesettings)</onclick>
+						<icon>unknown-user.png</icon>
 					</item> 
 					<item>
 						<label>13000</label>
 						<onclick>ActivateWindow(SystemSettings)</onclick>
-						<icon>icon_system.png</icon>
+						<icon>icons/settings/icon_System.png</icon>
 					</item>
 					<item>
 						<label>14206</label>
 						<onclick>ActivateWindow(AppearanceSettings)</onclick>
-						<icon>icon_appearence.png</icon>
+						<icon>icons/settings/icon_Appearence.png</icon>
 					</item>
 					<item>
 						<label>14200</label>
 						<onclick>ActivateWindow(PlayerSettings)</onclick>
-						<icon>unknown-user.png</icon>
+						<icon>icons/settings/icon_Player.png</icon>
 					</item>
 					<item>
 						<label>14211</label>
 						<onclick>ActivateWindow(MediaSettings)</onclick>
-						<icon>unknown-user.png</icon>
+						<icon>icons/settings/icon_Media.png</icon>
 					</item>
 					<item>
 						<label>14204</label>
 						<onclick>ActivateWindow(PVRSettings)</onclick>
-						<icon>unknown-user.png</icon>
+						<icon>icons/settings/icon_PVR.png</icon>
 					</item>
 					<item>
 						<label>15016</label>
diff --git a/media/icon_music.png b/media/icon_music.png
deleted file mode 100644
index 805c2a3..0000000
Binary files a/media/icon_music.png and /dev/null differ
diff --git a/media/icon_pics.png b/media/icon_pics.png
deleted file mode 100644
index 411cd1b..0000000
Binary files a/media/icon_pics.png and /dev/null differ
diff --git a/media/icon_video.png b/media/icon_video.png
deleted file mode 100644
index c408afe..0000000
Binary files a/media/icon_video.png and /dev/null differ
diff --git a/media/icon_weather.png b/media/icon_weather.png
deleted file mode 100644
index ac18bdb..0000000
Binary files a/media/icon_weather.png and /dev/null differ
diff --git a/media/icon_addons.png b/media/icons/settings/icon_Addons.png
similarity index 100%
rename from media/icon_addons.png
rename to media/icons/settings/icon_Addons.png
diff --git a/media/icon_appearence.png b/media/icons/settings/icon_Appearence.png
similarity index 100%
rename from media/icon_appearence.png
rename to media/icons/settings/icon_Appearence.png
diff --git a/media/icons/settings/icon_EventLog.png b/media/icons/settings/icon_EventLog.png
new file mode 100644
index 0000000..9f3e7de
Binary files /dev/null and b/media/icons/settings/icon_EventLog.png differ
diff --git a/media/FileManager.png b/media/icons/settings/icon_FileManager.png
similarity index 100%
rename from media/FileManager.png
rename to media/icons/settings/icon_FileManager.png
diff --git a/media/icons/settings/icon_Media.png b/media/icons/settings/icon_Media.png
new file mode 100644
index 0000000..5f6ac82
Binary files /dev/null and b/media/icons/settings/icon_Media.png differ
diff --git a/media/icon_tv.png b/media/icons/settings/icon_PVR.png
similarity index 100%
rename from media/icon_tv.png
rename to media/icons/settings/icon_PVR.png
diff --git a/media/icons/settings/icon_Player.png b/media/icons/settings/icon_Player.png
new file mode 100644
index 0000000..08763be
Binary files /dev/null and b/media/icons/settings/icon_Player.png differ
diff --git a/media/icon_system.png b/media/icons/settings/icon_System.png
similarity index 100%
rename from media/icon_system.png
rename to media/icons/settings/icon_System.png
diff --git a/media/icon_network.png b/media/icons/settings/icon_network.png
similarity index 100%
rename from media/icon_network.png
rename to media/icons/settings/icon_network.png