diff --git a/data/elementary/themes/img/O-arrow-left.svg b/data/elementary/themes/img/svg/O-arrow-left.svg
similarity index 100%
rename from data/elementary/themes/img/O-arrow-left.svg
rename to data/elementary/themes/img/svg/O-arrow-left.svg
diff --git a/data/elementary/themes/img/O-batt.svg b/data/elementary/themes/img/svg/O-batt.svg
similarity index 100%
rename from data/elementary/themes/img/O-batt.svg
rename to data/elementary/themes/img/svg/O-batt.svg
diff --git a/data/elementary/themes/img/O-bulb.svg b/data/elementary/themes/img/svg/O-bulb.svg
similarity index 100%
rename from data/elementary/themes/img/O-bulb.svg
rename to data/elementary/themes/img/svg/O-bulb.svg
diff --git a/data/elementary/themes/img/O-clockbase.svg b/data/elementary/themes/img/svg/O-clockbase.svg
similarity index 100%
rename from data/elementary/themes/img/O-clockbase.svg
rename to data/elementary/themes/img/svg/O-clockbase.svg
diff --git a/data/elementary/themes/img/O-cloudconn.svg b/data/elementary/themes/img/svg/O-cloudconn.svg
similarity index 100%
rename from data/elementary/themes/img/O-cloudconn.svg
rename to data/elementary/themes/img/svg/O-cloudconn.svg
diff --git a/data/elementary/themes/img/O-cpufreq-base.svg b/data/elementary/themes/img/svg/O-cpufreq-base.svg
similarity index 100%
rename from data/elementary/themes/img/O-cpufreq-base.svg
rename to data/elementary/themes/img/svg/O-cpufreq-base.svg
diff --git a/data/elementary/themes/img/O-cpufreq.svg b/data/elementary/themes/img/svg/O-cpufreq.svg
similarity index 100%
rename from data/elementary/themes/img/O-cpufreq.svg
rename to data/elementary/themes/img/svg/O-cpufreq.svg
diff --git a/data/elementary/themes/img/O-ether.svg b/data/elementary/themes/img/svg/O-ether.svg
similarity index 100%
rename from data/elementary/themes/img/O-ether.svg
rename to data/elementary/themes/img/svg/O-ether.svg
diff --git a/data/elementary/themes/img/O-evry.svg b/data/elementary/themes/img/svg/O-evry.svg
similarity index 100%
rename from data/elementary/themes/img/O-evry.svg
rename to data/elementary/themes/img/svg/O-evry.svg
diff --git a/data/elementary/themes/img/O-heart.svg b/data/elementary/themes/img/svg/O-heart.svg
similarity index 100%
rename from data/elementary/themes/img/O-heart.svg
rename to data/elementary/themes/img/svg/O-heart.svg
diff --git a/data/elementary/themes/img/O-reload.svg b/data/elementary/themes/img/svg/O-reload.svg
similarity index 100%
rename from data/elementary/themes/img/O-reload.svg
rename to data/elementary/themes/img/svg/O-reload.svg
diff --git a/data/elementary/themes/img/O-speakerbase.svg b/data/elementary/themes/img/svg/O-speakerbase.svg
similarity index 100%
rename from data/elementary/themes/img/O-speakerbase.svg
rename to data/elementary/themes/img/svg/O-speakerbase.svg
diff --git a/data/elementary/themes/img/O-speakerclip.svg b/data/elementary/themes/img/svg/O-speakerclip.svg
similarity index 100%
rename from data/elementary/themes/img/O-speakerclip.svg
rename to data/elementary/themes/img/svg/O-speakerclip.svg
diff --git a/data/elementary/themes/img/O-therm.svg b/data/elementary/themes/img/svg/O-therm.svg
similarity index 100%
rename from data/elementary/themes/img/O-therm.svg
rename to data/elementary/themes/img/svg/O-therm.svg
diff --git a/data/elementary/themes/img/O-tiling-f.svg b/data/elementary/themes/img/svg/O-tiling-f.svg
similarity index 100%
rename from data/elementary/themes/img/O-tiling-f.svg
rename to data/elementary/themes/img/svg/O-tiling-f.svg
diff --git a/data/elementary/themes/img/O-tiling-h.svg b/data/elementary/themes/img/svg/O-tiling-h.svg
similarity index 100%
rename from data/elementary/themes/img/O-tiling-h.svg
rename to data/elementary/themes/img/svg/O-tiling-h.svg
diff --git a/data/elementary/themes/img/O-tiling-v.svg b/data/elementary/themes/img/svg/O-tiling-v.svg
similarity index 100%
rename from data/elementary/themes/img/O-tiling-v.svg
rename to data/elementary/themes/img/svg/O-tiling-v.svg
diff --git a/data/elementary/themes/img/O-wifi.svg b/data/elementary/themes/img/svg/O-wifi.svg
similarity index 100%
rename from data/elementary/themes/img/O-wifi.svg
rename to data/elementary/themes/img/svg/O-wifi.svg
diff --git a/data/elementary/themes/img/about-flat-bg.svg b/data/elementary/themes/img/svg/about-flat-bg.svg
similarity index 100%
rename from data/elementary/themes/img/about-flat-bg.svg
rename to data/elementary/themes/img/svg/about-flat-bg.svg
diff --git a/data/elementary/themes/img/addressbook.svg b/data/elementary/themes/img/svg/addressbook.svg
similarity index 100%
rename from data/elementary/themes/img/addressbook.svg
rename to data/elementary/themes/img/svg/addressbook.svg
diff --git a/data/elementary/themes/img/app-window.svg b/data/elementary/themes/img/svg/app-window.svg
similarity index 100%
rename from data/elementary/themes/img/app-window.svg
rename to data/elementary/themes/img/svg/app-window.svg
diff --git a/data/elementary/themes/img/arrow-bottom.svg b/data/elementary/themes/img/svg/arrow-bottom.svg
similarity index 100%
rename from data/elementary/themes/img/arrow-bottom.svg
rename to data/elementary/themes/img/svg/arrow-bottom.svg
diff --git a/data/elementary/themes/img/arrow-diag.svg b/data/elementary/themes/img/svg/arrow-diag.svg
similarity index 100%
rename from data/elementary/themes/img/arrow-diag.svg
rename to data/elementary/themes/img/svg/arrow-diag.svg
diff --git a/data/elementary/themes/img/arrow-first.svg b/data/elementary/themes/img/svg/arrow-first.svg
similarity index 100%
rename from data/elementary/themes/img/arrow-first.svg
rename to data/elementary/themes/img/svg/arrow-first.svg
diff --git a/data/elementary/themes/img/arrow-h2.svg b/data/elementary/themes/img/svg/arrow-h2.svg
similarity index 100%
rename from data/elementary/themes/img/arrow-h2.svg
rename to data/elementary/themes/img/svg/arrow-h2.svg
diff --git a/data/elementary/themes/img/arrow-last.svg b/data/elementary/themes/img/svg/arrow-last.svg
similarity index 100%
rename from data/elementary/themes/img/arrow-last.svg
rename to data/elementary/themes/img/svg/arrow-last.svg
diff --git a/data/elementary/themes/img/arrow-top.svg b/data/elementary/themes/img/svg/arrow-top.svg
similarity index 100%
rename from data/elementary/themes/img/arrow-top.svg
rename to data/elementary/themes/img/svg/arrow-top.svg
diff --git a/data/elementary/themes/img/arrow-v2.svg b/data/elementary/themes/img/svg/arrow-v2.svg
similarity index 100%
rename from data/elementary/themes/img/arrow-v2.svg
rename to data/elementary/themes/img/svg/arrow-v2.svg
diff --git a/data/elementary/themes/img/arrow.svg b/data/elementary/themes/img/svg/arrow.svg
similarity index 100%
rename from data/elementary/themes/img/arrow.svg
rename to data/elementary/themes/img/svg/arrow.svg
diff --git a/data/elementary/themes/img/atom.svg b/data/elementary/themes/img/svg/atom.svg
similarity index 100%
rename from data/elementary/themes/img/atom.svg
rename to data/elementary/themes/img/svg/atom.svg
diff --git a/data/elementary/themes/img/badge-exclamation.svg b/data/elementary/themes/img/svg/badge-exclamation.svg
similarity index 100%
rename from data/elementary/themes/img/badge-exclamation.svg
rename to data/elementary/themes/img/svg/badge-exclamation.svg
diff --git a/data/elementary/themes/img/badge-tick.svg b/data/elementary/themes/img/svg/badge-tick.svg
similarity index 100%
rename from data/elementary/themes/img/badge-tick.svg
rename to data/elementary/themes/img/svg/badge-tick.svg
diff --git a/data/elementary/themes/img/battery-caution-charging.svg b/data/elementary/themes/img/svg/battery-caution-charging.svg
similarity index 100%
rename from data/elementary/themes/img/battery-caution-charging.svg
rename to data/elementary/themes/img/svg/battery-caution-charging.svg
diff --git a/data/elementary/themes/img/battery-caution.svg b/data/elementary/themes/img/svg/battery-caution.svg
similarity index 100%
rename from data/elementary/themes/img/battery-caution.svg
rename to data/elementary/themes/img/svg/battery-caution.svg
diff --git a/data/elementary/themes/img/battery-empty-charging.svg b/data/elementary/themes/img/svg/battery-empty-charging.svg
similarity index 100%
rename from data/elementary/themes/img/battery-empty-charging.svg
rename to data/elementary/themes/img/svg/battery-empty-charging.svg
diff --git a/data/elementary/themes/img/battery-empty.svg b/data/elementary/themes/img/svg/battery-empty.svg
similarity index 100%
rename from data/elementary/themes/img/battery-empty.svg
rename to data/elementary/themes/img/svg/battery-empty.svg
diff --git a/data/elementary/themes/img/battery-full-charging.svg b/data/elementary/themes/img/svg/battery-full-charging.svg
similarity index 100%
rename from data/elementary/themes/img/battery-full-charging.svg
rename to data/elementary/themes/img/svg/battery-full-charging.svg
diff --git a/data/elementary/themes/img/battery-full.svg b/data/elementary/themes/img/svg/battery-full.svg
similarity index 100%
rename from data/elementary/themes/img/battery-full.svg
rename to data/elementary/themes/img/svg/battery-full.svg
diff --git a/data/elementary/themes/img/battery-good-charging.svg b/data/elementary/themes/img/svg/battery-good-charging.svg
similarity index 100%
rename from data/elementary/themes/img/battery-good-charging.svg
rename to data/elementary/themes/img/svg/battery-good-charging.svg
diff --git a/data/elementary/themes/img/battery-good.svg b/data/elementary/themes/img/svg/battery-good.svg
similarity index 100%
rename from data/elementary/themes/img/battery-good.svg
rename to data/elementary/themes/img/svg/battery-good.svg
diff --git a/data/elementary/themes/img/battery-low-charging.svg b/data/elementary/themes/img/svg/battery-low-charging.svg
similarity index 100%
rename from data/elementary/themes/img/battery-low-charging.svg
rename to data/elementary/themes/img/svg/battery-low-charging.svg
diff --git a/data/elementary/themes/img/battery-low.svg b/data/elementary/themes/img/svg/battery-low.svg
similarity index 100%
rename from data/elementary/themes/img/battery-low.svg
rename to data/elementary/themes/img/svg/battery-low.svg
diff --git a/data/elementary/themes/img/battery.svg b/data/elementary/themes/img/svg/battery.svg
similarity index 100%
rename from data/elementary/themes/img/battery.svg
rename to data/elementary/themes/img/svg/battery.svg
diff --git a/data/elementary/themes/img/beaker.svg b/data/elementary/themes/img/svg/beaker.svg
similarity index 100%
rename from data/elementary/themes/img/beaker.svg
rename to data/elementary/themes/img/svg/beaker.svg
diff --git a/data/elementary/themes/img/bluetooth-active.svg b/data/elementary/themes/img/svg/bluetooth-active.svg
similarity index 100%
rename from data/elementary/themes/img/bluetooth-active.svg
rename to data/elementary/themes/img/svg/bluetooth-active.svg
diff --git a/data/elementary/themes/img/bluetooth-disabled.svg b/data/elementary/themes/img/svg/bluetooth-disabled.svg
similarity index 100%
rename from data/elementary/themes/img/bluetooth-disabled.svg
rename to data/elementary/themes/img/svg/bluetooth-disabled.svg
diff --git a/data/elementary/themes/img/bookmark-new.svg b/data/elementary/themes/img/svg/bookmark-new.svg
similarity index 100%
rename from data/elementary/themes/img/bookmark-new.svg
rename to data/elementary/themes/img/svg/bookmark-new.svg
diff --git a/data/elementary/themes/img/bookmark.svg b/data/elementary/themes/img/svg/bookmark.svg
similarity index 100%
rename from data/elementary/themes/img/bookmark.svg
rename to data/elementary/themes/img/svg/bookmark.svg
diff --git a/data/elementary/themes/img/border.svg b/data/elementary/themes/img/svg/border.svg
similarity index 100%
rename from data/elementary/themes/img/border.svg
rename to data/elementary/themes/img/svg/border.svg
diff --git a/data/elementary/themes/img/briefcase.svg b/data/elementary/themes/img/svg/briefcase.svg
similarity index 100%
rename from data/elementary/themes/img/briefcase.svg
rename to data/elementary/themes/img/svg/briefcase.svg
diff --git a/data/elementary/themes/img/bt-connect-off.svg b/data/elementary/themes/img/svg/bt-connect-off.svg
similarity index 100%
rename from data/elementary/themes/img/bt-connect-off.svg
rename to data/elementary/themes/img/svg/bt-connect-off.svg
diff --git a/data/elementary/themes/img/bt-connect-on.svg b/data/elementary/themes/img/svg/bt-connect-on.svg
similarity index 100%
rename from data/elementary/themes/img/bt-connect-on.svg
rename to data/elementary/themes/img/svg/bt-connect-on.svg
diff --git a/data/elementary/themes/img/bt-expand-left.svg b/data/elementary/themes/img/svg/bt-expand-left.svg
similarity index 100%
rename from data/elementary/themes/img/bt-expand-left.svg
rename to data/elementary/themes/img/svg/bt-expand-left.svg
diff --git a/data/elementary/themes/img/bt-expand-right.svg b/data/elementary/themes/img/svg/bt-expand-right.svg
similarity index 100%
rename from data/elementary/themes/img/bt-expand-right.svg
rename to data/elementary/themes/img/svg/bt-expand-right.svg
diff --git a/data/elementary/themes/img/bt-force-connect-off.svg b/data/elementary/themes/img/svg/bt-force-connect-off.svg
similarity index 100%
rename from data/elementary/themes/img/bt-force-connect-off.svg
rename to data/elementary/themes/img/svg/bt-force-connect-off.svg
diff --git a/data/elementary/themes/img/bt-force-connect-on.svg b/data/elementary/themes/img/svg/bt-force-connect-on.svg
similarity index 100%
rename from data/elementary/themes/img/bt-force-connect-on.svg
rename to data/elementary/themes/img/svg/bt-force-connect-on.svg
diff --git a/data/elementary/themes/img/bt-lock-device-off.svg b/data/elementary/themes/img/svg/bt-lock-device-off.svg
similarity index 100%
rename from data/elementary/themes/img/bt-lock-device-off.svg
rename to data/elementary/themes/img/svg/bt-lock-device-off.svg
diff --git a/data/elementary/themes/img/bt-lock-device-on.svg b/data/elementary/themes/img/svg/bt-lock-device-on.svg
similarity index 100%
rename from data/elementary/themes/img/bt-lock-device-on.svg
rename to data/elementary/themes/img/svg/bt-lock-device-on.svg
diff --git a/data/elementary/themes/img/bt-pair-off.svg b/data/elementary/themes/img/svg/bt-pair-off.svg
similarity index 100%
rename from data/elementary/themes/img/bt-pair-off.svg
rename to data/elementary/themes/img/svg/bt-pair-off.svg
diff --git a/data/elementary/themes/img/bt-pair-on.svg b/data/elementary/themes/img/svg/bt-pair-on.svg
similarity index 100%
rename from data/elementary/themes/img/bt-pair-on.svg
rename to data/elementary/themes/img/svg/bt-pair-on.svg
diff --git a/data/elementary/themes/img/bt.svg b/data/elementary/themes/img/svg/bt.svg
similarity index 100%
rename from data/elementary/themes/img/bt.svg
rename to data/elementary/themes/img/svg/bt.svg
diff --git a/data/elementary/themes/img/bt_none.svg b/data/elementary/themes/img/svg/bt_none.svg
similarity index 100%
rename from data/elementary/themes/img/bt_none.svg
rename to data/elementary/themes/img/svg/bt_none.svg
diff --git a/data/elementary/themes/img/bulb.svg b/data/elementary/themes/img/svg/bulb.svg
similarity index 100%
rename from data/elementary/themes/img/bulb.svg
rename to data/elementary/themes/img/svg/bulb.svg
diff --git a/data/elementary/themes/img/calendar-appointment-bad.svg b/data/elementary/themes/img/svg/calendar-appointment-bad.svg
similarity index 100%
rename from data/elementary/themes/img/calendar-appointment-bad.svg
rename to data/elementary/themes/img/svg/calendar-appointment-bad.svg
diff --git a/data/elementary/themes/img/calendar-appointment-good.svg b/data/elementary/themes/img/svg/calendar-appointment-good.svg
similarity index 100%
rename from data/elementary/themes/img/calendar-appointment-good.svg
rename to data/elementary/themes/img/svg/calendar-appointment-good.svg
diff --git a/data/elementary/themes/img/calendar-plus.svg b/data/elementary/themes/img/svg/calendar-plus.svg
similarity index 100%
rename from data/elementary/themes/img/calendar-plus.svg
rename to data/elementary/themes/img/svg/calendar-plus.svg
diff --git a/data/elementary/themes/img/call-start.svg b/data/elementary/themes/img/svg/call-start.svg
similarity index 100%
rename from data/elementary/themes/img/call-start.svg
rename to data/elementary/themes/img/svg/call-start.svg
diff --git a/data/elementary/themes/img/call-stop.svg b/data/elementary/themes/img/svg/call-stop.svg
similarity index 100%
rename from data/elementary/themes/img/call-stop.svg
rename to data/elementary/themes/img/svg/call-stop.svg
diff --git a/data/elementary/themes/img/camera.svg b/data/elementary/themes/img/svg/camera.svg
similarity index 100%
rename from data/elementary/themes/img/camera.svg
rename to data/elementary/themes/img/svg/camera.svg
diff --git a/data/elementary/themes/img/cd.svg b/data/elementary/themes/img/svg/cd.svg
similarity index 100%
rename from data/elementary/themes/img/cd.svg
rename to data/elementary/themes/img/svg/cd.svg
diff --git a/data/elementary/themes/img/cell-3g.svg b/data/elementary/themes/img/svg/cell-3g.svg
similarity index 100%
rename from data/elementary/themes/img/cell-3g.svg
rename to data/elementary/themes/img/svg/cell-3g.svg
diff --git a/data/elementary/themes/img/cell-4g.svg b/data/elementary/themes/img/svg/cell-4g.svg
similarity index 100%
rename from data/elementary/themes/img/cell-4g.svg
rename to data/elementary/themes/img/svg/cell-4g.svg
diff --git a/data/elementary/themes/img/cell-antenna.svg b/data/elementary/themes/img/svg/cell-antenna.svg
similarity index 100%
rename from data/elementary/themes/img/cell-antenna.svg
rename to data/elementary/themes/img/svg/cell-antenna.svg
diff --git a/data/elementary/themes/img/cell-edge.svg b/data/elementary/themes/img/svg/cell-edge.svg
similarity index 100%
rename from data/elementary/themes/img/cell-edge.svg
rename to data/elementary/themes/img/svg/cell-edge.svg
diff --git a/data/elementary/themes/img/cell-gprs.svg b/data/elementary/themes/img/svg/cell-gprs.svg
similarity index 100%
rename from data/elementary/themes/img/cell-gprs.svg
rename to data/elementary/themes/img/svg/cell-gprs.svg
diff --git a/data/elementary/themes/img/cell-sig-0.svg b/data/elementary/themes/img/svg/cell-sig-0.svg
similarity index 100%
rename from data/elementary/themes/img/cell-sig-0.svg
rename to data/elementary/themes/img/svg/cell-sig-0.svg
diff --git a/data/elementary/themes/img/cell-sig-1.svg b/data/elementary/themes/img/svg/cell-sig-1.svg
similarity index 100%
rename from data/elementary/themes/img/cell-sig-1.svg
rename to data/elementary/themes/img/svg/cell-sig-1.svg
diff --git a/data/elementary/themes/img/cell-sig-2.svg b/data/elementary/themes/img/svg/cell-sig-2.svg
similarity index 100%
rename from data/elementary/themes/img/cell-sig-2.svg
rename to data/elementary/themes/img/svg/cell-sig-2.svg
diff --git a/data/elementary/themes/img/cell-sig-3.svg b/data/elementary/themes/img/svg/cell-sig-3.svg
similarity index 100%
rename from data/elementary/themes/img/cell-sig-3.svg
rename to data/elementary/themes/img/svg/cell-sig-3.svg
diff --git a/data/elementary/themes/img/cell-sig-4.svg b/data/elementary/themes/img/svg/cell-sig-4.svg
similarity index 100%
rename from data/elementary/themes/img/cell-sig-4.svg
rename to data/elementary/themes/img/svg/cell-sig-4.svg
diff --git a/data/elementary/themes/img/cell-sig-disconn.svg b/data/elementary/themes/img/svg/cell-sig-disconn.svg
similarity index 100%
rename from data/elementary/themes/img/cell-sig-disconn.svg
rename to data/elementary/themes/img/svg/cell-sig-disconn.svg
diff --git a/data/elementary/themes/img/cell-sig.svg b/data/elementary/themes/img/svg/cell-sig.svg
similarity index 100%
rename from data/elementary/themes/img/cell-sig.svg
rename to data/elementary/themes/img/svg/cell-sig.svg
diff --git a/data/elementary/themes/img/cell-umts.svg b/data/elementary/themes/img/svg/cell-umts.svg
similarity index 100%
rename from data/elementary/themes/img/cell-umts.svg
rename to data/elementary/themes/img/svg/cell-umts.svg
diff --git a/data/elementary/themes/img/check.svg b/data/elementary/themes/img/svg/check.svg
similarity index 100%
rename from data/elementary/themes/img/check.svg
rename to data/elementary/themes/img/svg/check.svg
diff --git a/data/elementary/themes/img/clock.svg b/data/elementary/themes/img/svg/clock.svg
similarity index 100%
rename from data/elementary/themes/img/clock.svg
rename to data/elementary/themes/img/svg/clock.svg
diff --git a/data/elementary/themes/img/close.svg b/data/elementary/themes/img/svg/close.svg
similarity index 100%
rename from data/elementary/themes/img/close.svg
rename to data/elementary/themes/img/svg/close.svg
diff --git a/data/elementary/themes/img/cloud-fog.svg b/data/elementary/themes/img/svg/cloud-fog.svg
similarity index 100%
rename from data/elementary/themes/img/cloud-fog.svg
rename to data/elementary/themes/img/svg/cloud-fog.svg
diff --git a/data/elementary/themes/img/cloud-rain.svg b/data/elementary/themes/img/svg/cloud-rain.svg
similarity index 100%
rename from data/elementary/themes/img/cloud-rain.svg
rename to data/elementary/themes/img/svg/cloud-rain.svg
diff --git a/data/elementary/themes/img/cloud-severe-warn.svg b/data/elementary/themes/img/svg/cloud-severe-warn.svg
similarity index 100%
rename from data/elementary/themes/img/cloud-severe-warn.svg
rename to data/elementary/themes/img/svg/cloud-severe-warn.svg
diff --git a/data/elementary/themes/img/cloud-shower.svg b/data/elementary/themes/img/svg/cloud-shower.svg
similarity index 100%
rename from data/elementary/themes/img/cloud-shower.svg
rename to data/elementary/themes/img/svg/cloud-shower.svg
diff --git a/data/elementary/themes/img/cloud-snow.svg b/data/elementary/themes/img/svg/cloud-snow.svg
similarity index 100%
rename from data/elementary/themes/img/cloud-snow.svg
rename to data/elementary/themes/img/svg/cloud-snow.svg
diff --git a/data/elementary/themes/img/cloud-thunder.svg b/data/elementary/themes/img/svg/cloud-thunder.svg
similarity index 100%
rename from data/elementary/themes/img/cloud-thunder.svg
rename to data/elementary/themes/img/svg/cloud-thunder.svg
diff --git a/data/elementary/themes/img/clouds-few.svg b/data/elementary/themes/img/svg/clouds-few.svg
similarity index 100%
rename from data/elementary/themes/img/clouds-few.svg
rename to data/elementary/themes/img/svg/clouds-few.svg
diff --git a/data/elementary/themes/img/clouds-overcast.svg b/data/elementary/themes/img/svg/clouds-overcast.svg
similarity index 100%
rename from data/elementary/themes/img/clouds-overcast.svg
rename to data/elementary/themes/img/svg/clouds-overcast.svg
diff --git a/data/elementary/themes/img/clouds.svg b/data/elementary/themes/img/svg/clouds.svg
similarity index 100%
rename from data/elementary/themes/img/clouds.svg
rename to data/elementary/themes/img/svg/clouds.svg
diff --git a/data/elementary/themes/img/compositor.svg b/data/elementary/themes/img/svg/compositor.svg
similarity index 100%
rename from data/elementary/themes/img/compositor.svg
rename to data/elementary/themes/img/svg/compositor.svg
diff --git a/data/elementary/themes/img/copy.svg b/data/elementary/themes/img/svg/copy.svg
similarity index 100%
rename from data/elementary/themes/img/copy.svg
rename to data/elementary/themes/img/svg/copy.svg
diff --git a/data/elementary/themes/img/cpu-speed.svg b/data/elementary/themes/img/svg/cpu-speed.svg
similarity index 100%
rename from data/elementary/themes/img/cpu-speed.svg
rename to data/elementary/themes/img/svg/cpu-speed.svg
diff --git a/data/elementary/themes/img/cpu.svg b/data/elementary/themes/img/svg/cpu.svg
similarity index 100%
rename from data/elementary/themes/img/cpu.svg
rename to data/elementary/themes/img/svg/cpu.svg
diff --git a/data/elementary/themes/img/cube-plus.svg b/data/elementary/themes/img/svg/cube-plus.svg
similarity index 100%
rename from data/elementary/themes/img/cube-plus.svg
rename to data/elementary/themes/img/svg/cube-plus.svg
diff --git a/data/elementary/themes/img/cut.svg b/data/elementary/themes/img/svg/cut.svg
similarity index 100%
rename from data/elementary/themes/img/cut.svg
rename to data/elementary/themes/img/svg/cut.svg
diff --git a/data/elementary/themes/img/datatape.svg b/data/elementary/themes/img/svg/datatape.svg
similarity index 100%
rename from data/elementary/themes/img/datatape.svg
rename to data/elementary/themes/img/svg/datatape.svg
diff --git a/data/elementary/themes/img/desks.svg b/data/elementary/themes/img/svg/desks.svg
similarity index 100%
rename from data/elementary/themes/img/desks.svg
rename to data/elementary/themes/img/svg/desks.svg
diff --git a/data/elementary/themes/img/desktop-pc.svg b/data/elementary/themes/img/svg/desktop-pc.svg
similarity index 100%
rename from data/elementary/themes/img/desktop-pc.svg
rename to data/elementary/themes/img/svg/desktop-pc.svg
diff --git a/data/elementary/themes/img/desktop-settings.svg b/data/elementary/themes/img/svg/desktop-settings.svg
similarity index 100%
rename from data/elementary/themes/img/desktop-settings.svg
rename to data/elementary/themes/img/svg/desktop-settings.svg
diff --git a/data/elementary/themes/img/device-block.svg b/data/elementary/themes/img/svg/device-block.svg
similarity index 100%
rename from data/elementary/themes/img/device-block.svg
rename to data/elementary/themes/img/svg/device-block.svg
diff --git a/data/elementary/themes/img/device-char.svg b/data/elementary/themes/img/svg/device-char.svg
similarity index 100%
rename from data/elementary/themes/img/device-char.svg
rename to data/elementary/themes/img/svg/device-char.svg
diff --git a/data/elementary/themes/img/device-pipe.svg b/data/elementary/themes/img/svg/device-pipe.svg
similarity index 100%
rename from data/elementary/themes/img/device-pipe.svg
rename to data/elementary/themes/img/svg/device-pipe.svg
diff --git a/data/elementary/themes/img/device-socket.svg b/data/elementary/themes/img/svg/device-socket.svg
similarity index 100%
rename from data/elementary/themes/img/device-socket.svg
rename to data/elementary/themes/img/svg/device-socket.svg
diff --git a/data/elementary/themes/img/dialog.svg b/data/elementary/themes/img/svg/dialog.svg
similarity index 100%
rename from data/elementary/themes/img/dialog.svg
rename to data/elementary/themes/img/svg/dialog.svg
diff --git a/data/elementary/themes/img/doc-file-arrow-l.svg b/data/elementary/themes/img/svg/doc-file-arrow-l.svg
similarity index 100%
rename from data/elementary/themes/img/doc-file-arrow-l.svg
rename to data/elementary/themes/img/svg/doc-file-arrow-l.svg
diff --git a/data/elementary/themes/img/doc-file-arrow-r.svg b/data/elementary/themes/img/svg/doc-file-arrow-r.svg
similarity index 100%
rename from data/elementary/themes/img/doc-file-arrow-r.svg
rename to data/elementary/themes/img/svg/doc-file-arrow-r.svg
diff --git a/data/elementary/themes/img/doc-file-close.svg b/data/elementary/themes/img/svg/doc-file-close.svg
similarity index 100%
rename from data/elementary/themes/img/doc-file-close.svg
rename to data/elementary/themes/img/svg/doc-file-close.svg
diff --git a/data/elementary/themes/img/doc-file-open-clock.svg b/data/elementary/themes/img/svg/doc-file-open-clock.svg
similarity index 100%
rename from data/elementary/themes/img/doc-file-open-clock.svg
rename to data/elementary/themes/img/svg/doc-file-open-clock.svg
diff --git a/data/elementary/themes/img/doc-file-open.svg b/data/elementary/themes/img/svg/doc-file-open.svg
similarity index 100%
rename from data/elementary/themes/img/doc-file-open.svg
rename to data/elementary/themes/img/svg/doc-file-open.svg
diff --git a/data/elementary/themes/img/doc-file-page-setup.svg b/data/elementary/themes/img/svg/doc-file-page-setup.svg
similarity index 100%
rename from data/elementary/themes/img/doc-file-page-setup.svg
rename to data/elementary/themes/img/svg/doc-file-page-setup.svg
diff --git a/data/elementary/themes/img/doc-file-plus.svg b/data/elementary/themes/img/svg/doc-file-plus.svg
similarity index 100%
rename from data/elementary/themes/img/doc-file-plus.svg
rename to data/elementary/themes/img/svg/doc-file-plus.svg
diff --git a/data/elementary/themes/img/doc-file-undo.svg b/data/elementary/themes/img/svg/doc-file-undo.svg
similarity index 100%
rename from data/elementary/themes/img/doc-file-undo.svg
rename to data/elementary/themes/img/svg/doc-file-undo.svg
diff --git a/data/elementary/themes/img/doc-properties.svg b/data/elementary/themes/img/svg/doc-properties.svg
similarity index 100%
rename from data/elementary/themes/img/doc-properties.svg
rename to data/elementary/themes/img/svg/doc-properties.svg
diff --git a/data/elementary/themes/img/doc-send.svg b/data/elementary/themes/img/svg/doc-send.svg
similarity index 100%
rename from data/elementary/themes/img/doc-send.svg
rename to data/elementary/themes/img/svg/doc-send.svg
diff --git a/data/elementary/themes/img/download.svg b/data/elementary/themes/img/svg/download.svg
similarity index 100%
rename from data/elementary/themes/img/download.svg
rename to data/elementary/themes/img/svg/download.svg
diff --git a/data/elementary/themes/img/drawing-tablet.svg b/data/elementary/themes/img/svg/drawing-tablet.svg
similarity index 100%
rename from data/elementary/themes/img/drawing-tablet.svg
rename to data/elementary/themes/img/svg/drawing-tablet.svg
diff --git a/data/elementary/themes/img/drive-hdd-fw.svg b/data/elementary/themes/img/svg/drive-hdd-fw.svg
similarity index 100%
rename from data/elementary/themes/img/drive-hdd-fw.svg
rename to data/elementary/themes/img/svg/drive-hdd-fw.svg
diff --git a/data/elementary/themes/img/drive-hdd-usb.svg b/data/elementary/themes/img/svg/drive-hdd-usb.svg
similarity index 100%
rename from data/elementary/themes/img/drive-hdd-usb.svg
rename to data/elementary/themes/img/svg/drive-hdd-usb.svg
diff --git a/data/elementary/themes/img/edit.svg b/data/elementary/themes/img/svg/edit.svg
similarity index 100%
rename from data/elementary/themes/img/edit.svg
rename to data/elementary/themes/img/svg/edit.svg
diff --git a/data/elementary/themes/img/efm-c.svg b/data/elementary/themes/img/svg/efm-c.svg
similarity index 100%
rename from data/elementary/themes/img/efm-c.svg
rename to data/elementary/themes/img/svg/efm-c.svg
diff --git a/data/elementary/themes/img/efm-cad.svg b/data/elementary/themes/img/svg/efm-cad.svg
similarity index 100%
rename from data/elementary/themes/img/efm-cad.svg
rename to data/elementary/themes/img/svg/efm-cad.svg
diff --git a/data/elementary/themes/img/efm-code.svg b/data/elementary/themes/img/svg/efm-code.svg
similarity index 100%
rename from data/elementary/themes/img/efm-code.svg
rename to data/elementary/themes/img/svg/efm-code.svg
diff --git a/data/elementary/themes/img/efm-cpp.svg b/data/elementary/themes/img/svg/efm-cpp.svg
similarity index 100%
rename from data/elementary/themes/img/efm-cpp.svg
rename to data/elementary/themes/img/svg/efm-cpp.svg
diff --git a/data/elementary/themes/img/efm-db.svg b/data/elementary/themes/img/svg/efm-db.svg
similarity index 100%
rename from data/elementary/themes/img/efm-db.svg
rename to data/elementary/themes/img/svg/efm-db.svg
diff --git a/data/elementary/themes/img/efm-deb.svg b/data/elementary/themes/img/svg/efm-deb.svg
similarity index 100%
rename from data/elementary/themes/img/efm-deb.svg
rename to data/elementary/themes/img/svg/efm-deb.svg
diff --git a/data/elementary/themes/img/efm-doc.svg b/data/elementary/themes/img/svg/efm-doc.svg
similarity index 100%
rename from data/elementary/themes/img/efm-doc.svg
rename to data/elementary/themes/img/svg/efm-doc.svg
diff --git a/data/elementary/themes/img/efm-draw.svg b/data/elementary/themes/img/svg/efm-draw.svg
similarity index 100%
rename from data/elementary/themes/img/efm-draw.svg
rename to data/elementary/themes/img/svg/efm-draw.svg
diff --git a/data/elementary/themes/img/efm-efile.svg b/data/elementary/themes/img/svg/efm-efile.svg
similarity index 100%
rename from data/elementary/themes/img/efm-efile.svg
rename to data/elementary/themes/img/svg/efm-efile.svg
diff --git a/data/elementary/themes/img/efm-exe.svg b/data/elementary/themes/img/svg/efm-exe.svg
similarity index 100%
rename from data/elementary/themes/img/efm-exe.svg
rename to data/elementary/themes/img/svg/efm-exe.svg
diff --git a/data/elementary/themes/img/efm-formula.svg b/data/elementary/themes/img/svg/efm-formula.svg
similarity index 100%
rename from data/elementary/themes/img/efm-formula.svg
rename to data/elementary/themes/img/svg/efm-formula.svg
diff --git a/data/elementary/themes/img/efm-h.svg b/data/elementary/themes/img/svg/efm-h.svg
similarity index 100%
rename from data/elementary/themes/img/efm-h.svg
rename to data/elementary/themes/img/svg/efm-h.svg
diff --git a/data/elementary/themes/img/efm-hpp.svg b/data/elementary/themes/img/svg/efm-hpp.svg
similarity index 100%
rename from data/elementary/themes/img/efm-hpp.svg
rename to data/elementary/themes/img/svg/efm-hpp.svg
diff --git a/data/elementary/themes/img/efm-html.svg b/data/elementary/themes/img/svg/efm-html.svg
similarity index 100%
rename from data/elementary/themes/img/efm-html.svg
rename to data/elementary/themes/img/svg/efm-html.svg
diff --git a/data/elementary/themes/img/efm-install.svg b/data/elementary/themes/img/svg/efm-install.svg
similarity index 100%
rename from data/elementary/themes/img/efm-install.svg
rename to data/elementary/themes/img/svg/efm-install.svg
diff --git a/data/elementary/themes/img/efm-lua.svg b/data/elementary/themes/img/svg/efm-lua.svg
similarity index 100%
rename from data/elementary/themes/img/efm-lua.svg
rename to data/elementary/themes/img/svg/efm-lua.svg
diff --git a/data/elementary/themes/img/efm-o.svg b/data/elementary/themes/img/svg/efm-o.svg
similarity index 100%
rename from data/elementary/themes/img/efm-o.svg
rename to data/elementary/themes/img/svg/efm-o.svg
diff --git a/data/elementary/themes/img/efm-pdf.svg b/data/elementary/themes/img/svg/efm-pdf.svg
similarity index 100%
rename from data/elementary/themes/img/efm-pdf.svg
rename to data/elementary/themes/img/svg/efm-pdf.svg
diff --git a/data/elementary/themes/img/efm-php.svg b/data/elementary/themes/img/svg/efm-php.svg
similarity index 100%
rename from data/elementary/themes/img/efm-php.svg
rename to data/elementary/themes/img/svg/efm-php.svg
diff --git a/data/elementary/themes/img/efm-pl.svg b/data/elementary/themes/img/svg/efm-pl.svg
similarity index 100%
rename from data/elementary/themes/img/efm-pl.svg
rename to data/elementary/themes/img/svg/efm-pl.svg
diff --git a/data/elementary/themes/img/efm-present.svg b/data/elementary/themes/img/svg/efm-present.svg
similarity index 100%
rename from data/elementary/themes/img/efm-present.svg
rename to data/elementary/themes/img/svg/efm-present.svg
diff --git a/data/elementary/themes/img/efm-ps.svg b/data/elementary/themes/img/svg/efm-ps.svg
similarity index 100%
rename from data/elementary/themes/img/efm-ps.svg
rename to data/elementary/themes/img/svg/efm-ps.svg
diff --git a/data/elementary/themes/img/efm-py.svg b/data/elementary/themes/img/svg/efm-py.svg
similarity index 100%
rename from data/elementary/themes/img/efm-py.svg
rename to data/elementary/themes/img/svg/efm-py.svg
diff --git a/data/elementary/themes/img/efm-pyb.svg b/data/elementary/themes/img/svg/efm-pyb.svg
similarity index 100%
rename from data/elementary/themes/img/efm-pyb.svg
rename to data/elementary/themes/img/svg/efm-pyb.svg
diff --git a/data/elementary/themes/img/efm-rb.svg b/data/elementary/themes/img/svg/efm-rb.svg
similarity index 100%
rename from data/elementary/themes/img/efm-rb.svg
rename to data/elementary/themes/img/svg/efm-rb.svg
diff --git a/data/elementary/themes/img/efm-sh.svg b/data/elementary/themes/img/svg/efm-sh.svg
similarity index 100%
rename from data/elementary/themes/img/efm-sh.svg
rename to data/elementary/themes/img/svg/efm-sh.svg
diff --git a/data/elementary/themes/img/efm-so.svg b/data/elementary/themes/img/svg/efm-so.svg
similarity index 100%
rename from data/elementary/themes/img/efm-so.svg
rename to data/elementary/themes/img/svg/efm-so.svg
diff --git a/data/elementary/themes/img/efm-spreadsheet.svg b/data/elementary/themes/img/svg/efm-spreadsheet.svg
similarity index 100%
rename from data/elementary/themes/img/efm-spreadsheet.svg
rename to data/elementary/themes/img/svg/efm-spreadsheet.svg
diff --git a/data/elementary/themes/img/efm-template.svg b/data/elementary/themes/img/svg/efm-template.svg
similarity index 100%
rename from data/elementary/themes/img/efm-template.svg
rename to data/elementary/themes/img/svg/efm-template.svg
diff --git a/data/elementary/themes/img/efm-trash-full.svg b/data/elementary/themes/img/svg/efm-trash-full.svg
similarity index 100%
rename from data/elementary/themes/img/efm-trash-full.svg
rename to data/elementary/themes/img/svg/efm-trash-full.svg
diff --git a/data/elementary/themes/img/efm-trash.svg b/data/elementary/themes/img/svg/efm-trash.svg
similarity index 100%
rename from data/elementary/themes/img/efm-trash.svg
rename to data/elementary/themes/img/svg/efm-trash.svg
diff --git a/data/elementary/themes/img/efm-txt.svg b/data/elementary/themes/img/svg/efm-txt.svg
similarity index 100%
rename from data/elementary/themes/img/efm-txt.svg
rename to data/elementary/themes/img/svg/efm-txt.svg
diff --git a/data/elementary/themes/img/eject.svg b/data/elementary/themes/img/svg/eject.svg
similarity index 100%
rename from data/elementary/themes/img/eject.svg
rename to data/elementary/themes/img/svg/eject.svg
diff --git a/data/elementary/themes/img/emblem-default.svg b/data/elementary/themes/img/svg/emblem-default.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-default.svg
rename to data/elementary/themes/img/svg/emblem-default.svg
diff --git a/data/elementary/themes/img/emblem-documents.svg b/data/elementary/themes/img/svg/emblem-documents.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-documents.svg
rename to data/elementary/themes/img/svg/emblem-documents.svg
diff --git a/data/elementary/themes/img/emblem-downloads.svg b/data/elementary/themes/img/svg/emblem-downloads.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-downloads.svg
rename to data/elementary/themes/img/svg/emblem-downloads.svg
diff --git a/data/elementary/themes/img/emblem-favorite.svg b/data/elementary/themes/img/svg/emblem-favorite.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-favorite.svg
rename to data/elementary/themes/img/svg/emblem-favorite.svg
diff --git a/data/elementary/themes/img/emblem-important.svg b/data/elementary/themes/img/svg/emblem-important.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-important.svg
rename to data/elementary/themes/img/svg/emblem-important.svg
diff --git a/data/elementary/themes/img/emblem-mail.svg b/data/elementary/themes/img/svg/emblem-mail.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-mail.svg
rename to data/elementary/themes/img/svg/emblem-mail.svg
diff --git a/data/elementary/themes/img/emblem-photos.svg b/data/elementary/themes/img/svg/emblem-photos.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-photos.svg
rename to data/elementary/themes/img/svg/emblem-photos.svg
diff --git a/data/elementary/themes/img/emblem-readonly.svg b/data/elementary/themes/img/svg/emblem-readonly.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-readonly.svg
rename to data/elementary/themes/img/svg/emblem-readonly.svg
diff --git a/data/elementary/themes/img/emblem-shared.svg b/data/elementary/themes/img/svg/emblem-shared.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-shared.svg
rename to data/elementary/themes/img/svg/emblem-shared.svg
diff --git a/data/elementary/themes/img/emblem-symbolic-link.svg b/data/elementary/themes/img/svg/emblem-symbolic-link.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-symbolic-link.svg
rename to data/elementary/themes/img/svg/emblem-symbolic-link.svg
diff --git a/data/elementary/themes/img/emblem-synchronized.svg b/data/elementary/themes/img/svg/emblem-synchronized.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-synchronized.svg
rename to data/elementary/themes/img/svg/emblem-synchronized.svg
diff --git a/data/elementary/themes/img/emblem-synchronizing.svg b/data/elementary/themes/img/svg/emblem-synchronizing.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-synchronizing.svg
rename to data/elementary/themes/img/svg/emblem-synchronizing.svg
diff --git a/data/elementary/themes/img/emblem-system.svg b/data/elementary/themes/img/svg/emblem-system.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-system.svg
rename to data/elementary/themes/img/svg/emblem-system.svg
diff --git a/data/elementary/themes/img/emblem-unreadable.svg b/data/elementary/themes/img/svg/emblem-unreadable.svg
similarity index 100%
rename from data/elementary/themes/img/emblem-unreadable.svg
rename to data/elementary/themes/img/svg/emblem-unreadable.svg
diff --git a/data/elementary/themes/img/emo-angry-shout.svg b/data/elementary/themes/img/svg/emo-angry-shout.svg
similarity index 100%
rename from data/elementary/themes/img/emo-angry-shout.svg
rename to data/elementary/themes/img/svg/emo-angry-shout.svg
diff --git a/data/elementary/themes/img/emo-angry.svg b/data/elementary/themes/img/svg/emo-angry.svg
similarity index 100%
rename from data/elementary/themes/img/emo-angry.svg
rename to data/elementary/themes/img/svg/emo-angry.svg
diff --git a/data/elementary/themes/img/emo-crazy-laugh.svg b/data/elementary/themes/img/svg/emo-crazy-laugh.svg
similarity index 100%
rename from data/elementary/themes/img/emo-crazy-laugh.svg
rename to data/elementary/themes/img/svg/emo-crazy-laugh.svg
diff --git a/data/elementary/themes/img/emo-evil-laugh.svg b/data/elementary/themes/img/svg/emo-evil-laugh.svg
similarity index 100%
rename from data/elementary/themes/img/emo-evil-laugh.svg
rename to data/elementary/themes/img/svg/emo-evil-laugh.svg
diff --git a/data/elementary/themes/img/emo-evil.svg b/data/elementary/themes/img/svg/emo-evil.svg
similarity index 100%
rename from data/elementary/themes/img/emo-evil.svg
rename to data/elementary/themes/img/svg/emo-evil.svg
diff --git a/data/elementary/themes/img/emo-goggle-smile.svg b/data/elementary/themes/img/svg/emo-goggle-smile.svg
similarity index 100%
rename from data/elementary/themes/img/emo-goggle-smile.svg
rename to data/elementary/themes/img/svg/emo-goggle-smile.svg
diff --git a/data/elementary/themes/img/emo-grumpy-smile.svg b/data/elementary/themes/img/svg/emo-grumpy-smile.svg
similarity index 100%
rename from data/elementary/themes/img/emo-grumpy-smile.svg
rename to data/elementary/themes/img/svg/emo-grumpy-smile.svg
diff --git a/data/elementary/themes/img/emo-grumpy.svg b/data/elementary/themes/img/svg/emo-grumpy.svg
similarity index 100%
rename from data/elementary/themes/img/emo-grumpy.svg
rename to data/elementary/themes/img/svg/emo-grumpy.svg
diff --git a/data/elementary/themes/img/emo-guilty-smile.svg b/data/elementary/themes/img/svg/emo-guilty-smile.svg
similarity index 100%
rename from data/elementary/themes/img/emo-guilty-smile.svg
rename to data/elementary/themes/img/svg/emo-guilty-smile.svg
diff --git a/data/elementary/themes/img/emo-guilty.svg b/data/elementary/themes/img/svg/emo-guilty.svg
similarity index 100%
rename from data/elementary/themes/img/emo-guilty.svg
rename to data/elementary/themes/img/svg/emo-guilty.svg
diff --git a/data/elementary/themes/img/emo-haha.svg b/data/elementary/themes/img/svg/emo-haha.svg
similarity index 100%
rename from data/elementary/themes/img/emo-haha.svg
rename to data/elementary/themes/img/svg/emo-haha.svg
diff --git a/data/elementary/themes/img/emo-half-smile.svg b/data/elementary/themes/img/svg/emo-half-smile.svg
similarity index 100%
rename from data/elementary/themes/img/emo-half-smile.svg
rename to data/elementary/themes/img/svg/emo-half-smile.svg
diff --git a/data/elementary/themes/img/emo-happy-panting.svg b/data/elementary/themes/img/svg/emo-happy-panting.svg
similarity index 100%
rename from data/elementary/themes/img/emo-happy-panting.svg
rename to data/elementary/themes/img/svg/emo-happy-panting.svg
diff --git a/data/elementary/themes/img/emo-happy.svg b/data/elementary/themes/img/svg/emo-happy.svg
similarity index 100%
rename from data/elementary/themes/img/emo-happy.svg
rename to data/elementary/themes/img/svg/emo-happy.svg
diff --git a/data/elementary/themes/img/emo-indifferent.svg b/data/elementary/themes/img/svg/emo-indifferent.svg
similarity index 100%
rename from data/elementary/themes/img/emo-indifferent.svg
rename to data/elementary/themes/img/svg/emo-indifferent.svg
diff --git a/data/elementary/themes/img/emo-kiss.svg b/data/elementary/themes/img/svg/emo-kiss.svg
similarity index 100%
rename from data/elementary/themes/img/emo-kiss.svg
rename to data/elementary/themes/img/svg/emo-kiss.svg
diff --git a/data/elementary/themes/img/emo-knowing-grin.svg b/data/elementary/themes/img/svg/emo-knowing-grin.svg
similarity index 100%
rename from data/elementary/themes/img/emo-knowing-grin.svg
rename to data/elementary/themes/img/svg/emo-knowing-grin.svg
diff --git a/data/elementary/themes/img/emo-laugh.svg b/data/elementary/themes/img/svg/emo-laugh.svg
similarity index 100%
rename from data/elementary/themes/img/emo-laugh.svg
rename to data/elementary/themes/img/svg/emo-laugh.svg
diff --git a/data/elementary/themes/img/emo-little-bit-sorry.svg b/data/elementary/themes/img/svg/emo-little-bit-sorry.svg
similarity index 100%
rename from data/elementary/themes/img/emo-little-bit-sorry.svg
rename to data/elementary/themes/img/svg/emo-little-bit-sorry.svg
diff --git a/data/elementary/themes/img/emo-love-lots.svg b/data/elementary/themes/img/svg/emo-love-lots.svg
similarity index 100%
rename from data/elementary/themes/img/emo-love-lots.svg
rename to data/elementary/themes/img/svg/emo-love-lots.svg
diff --git a/data/elementary/themes/img/emo-love.svg b/data/elementary/themes/img/svg/emo-love.svg
similarity index 100%
rename from data/elementary/themes/img/emo-love.svg
rename to data/elementary/themes/img/svg/emo-love.svg
diff --git a/data/elementary/themes/img/emo-minimal-smile.svg b/data/elementary/themes/img/svg/emo-minimal-smile.svg
similarity index 100%
rename from data/elementary/themes/img/emo-minimal-smile.svg
rename to data/elementary/themes/img/svg/emo-minimal-smile.svg
diff --git a/data/elementary/themes/img/emo-not-happy.svg b/data/elementary/themes/img/svg/emo-not-happy.svg
similarity index 100%
rename from data/elementary/themes/img/emo-not-happy.svg
rename to data/elementary/themes/img/svg/emo-not-happy.svg
diff --git a/data/elementary/themes/img/emo-not-impressed.svg b/data/elementary/themes/img/svg/emo-not-impressed.svg
similarity index 100%
rename from data/elementary/themes/img/emo-not-impressed.svg
rename to data/elementary/themes/img/svg/emo-not-impressed.svg
diff --git a/data/elementary/themes/img/emo-omg.svg b/data/elementary/themes/img/svg/emo-omg.svg
similarity index 100%
rename from data/elementary/themes/img/emo-omg.svg
rename to data/elementary/themes/img/svg/emo-omg.svg
diff --git a/data/elementary/themes/img/emo-opensmile.svg b/data/elementary/themes/img/svg/emo-opensmile.svg
similarity index 100%
rename from data/elementary/themes/img/emo-opensmile.svg
rename to data/elementary/themes/img/svg/emo-opensmile.svg
diff --git a/data/elementary/themes/img/emo-smile.svg b/data/elementary/themes/img/svg/emo-smile.svg
similarity index 100%
rename from data/elementary/themes/img/emo-smile.svg
rename to data/elementary/themes/img/svg/emo-smile.svg
diff --git a/data/elementary/themes/img/emo-sorry.svg b/data/elementary/themes/img/svg/emo-sorry.svg
similarity index 100%
rename from data/elementary/themes/img/emo-sorry.svg
rename to data/elementary/themes/img/svg/emo-sorry.svg
diff --git a/data/elementary/themes/img/emo-squint-laugh.svg b/data/elementary/themes/img/svg/emo-squint-laugh.svg
similarity index 100%
rename from data/elementary/themes/img/emo-squint-laugh.svg
rename to data/elementary/themes/img/svg/emo-squint-laugh.svg
diff --git a/data/elementary/themes/img/emo-surprised.svg b/data/elementary/themes/img/svg/emo-surprised.svg
similarity index 100%
rename from data/elementary/themes/img/emo-surprised.svg
rename to data/elementary/themes/img/svg/emo-surprised.svg
diff --git a/data/elementary/themes/img/emo-suspicious.svg b/data/elementary/themes/img/svg/emo-suspicious.svg
similarity index 100%
rename from data/elementary/themes/img/emo-suspicious.svg
rename to data/elementary/themes/img/svg/emo-suspicious.svg
diff --git a/data/elementary/themes/img/emo-tongue-dangling.svg b/data/elementary/themes/img/svg/emo-tongue-dangling.svg
similarity index 100%
rename from data/elementary/themes/img/emo-tongue-dangling.svg
rename to data/elementary/themes/img/svg/emo-tongue-dangling.svg
diff --git a/data/elementary/themes/img/emo-tongue-poke.svg b/data/elementary/themes/img/svg/emo-tongue-poke.svg
similarity index 100%
rename from data/elementary/themes/img/emo-tongue-poke.svg
rename to data/elementary/themes/img/svg/emo-tongue-poke.svg
diff --git a/data/elementary/themes/img/emo-uh.svg b/data/elementary/themes/img/svg/emo-uh.svg
similarity index 100%
rename from data/elementary/themes/img/emo-uh.svg
rename to data/elementary/themes/img/svg/emo-uh.svg
diff --git a/data/elementary/themes/img/emo-unhappy.svg b/data/elementary/themes/img/svg/emo-unhappy.svg
similarity index 100%
rename from data/elementary/themes/img/emo-unhappy.svg
rename to data/elementary/themes/img/svg/emo-unhappy.svg
diff --git a/data/elementary/themes/img/emo-very-sorry.svg b/data/elementary/themes/img/svg/emo-very-sorry.svg
similarity index 100%
rename from data/elementary/themes/img/emo-very-sorry.svg
rename to data/elementary/themes/img/svg/emo-very-sorry.svg
diff --git a/data/elementary/themes/img/emo-what.svg b/data/elementary/themes/img/svg/emo-what.svg
similarity index 100%
rename from data/elementary/themes/img/emo-what.svg
rename to data/elementary/themes/img/svg/emo-what.svg
diff --git a/data/elementary/themes/img/emo-wink.svg b/data/elementary/themes/img/svg/emo-wink.svg
similarity index 100%
rename from data/elementary/themes/img/emo-wink.svg
rename to data/elementary/themes/img/svg/emo-wink.svg
diff --git a/data/elementary/themes/img/emo-worried.svg b/data/elementary/themes/img/svg/emo-worried.svg
similarity index 100%
rename from data/elementary/themes/img/emo-worried.svg
rename to data/elementary/themes/img/svg/emo-worried.svg
diff --git a/data/elementary/themes/img/emo-wtf.svg b/data/elementary/themes/img/svg/emo-wtf.svg
similarity index 100%
rename from data/elementary/themes/img/emo-wtf.svg
rename to data/elementary/themes/img/svg/emo-wtf.svg
diff --git a/data/elementary/themes/img/engine.svg b/data/elementary/themes/img/svg/engine.svg
similarity index 100%
rename from data/elementary/themes/img/engine.svg
rename to data/elementary/themes/img/svg/engine.svg
diff --git a/data/elementary/themes/img/enlightenment.svg b/data/elementary/themes/img/svg/enlightenment.svg
similarity index 100%
rename from data/elementary/themes/img/enlightenment.svg
rename to data/elementary/themes/img/svg/enlightenment.svg
diff --git a/data/elementary/themes/img/env-var.svg b/data/elementary/themes/img/svg/env-var.svg
similarity index 100%
rename from data/elementary/themes/img/env-var.svg
rename to data/elementary/themes/img/svg/env-var.svg
diff --git a/data/elementary/themes/img/ethernet.svg b/data/elementary/themes/img/svg/ethernet.svg
similarity index 100%
rename from data/elementary/themes/img/ethernet.svg
rename to data/elementary/themes/img/svg/ethernet.svg
diff --git a/data/elementary/themes/img/eye.svg b/data/elementary/themes/img/svg/eye.svg
similarity index 100%
rename from data/elementary/themes/img/eye.svg
rename to data/elementary/themes/img/svg/eye.svg
diff --git a/data/elementary/themes/img/face.svg b/data/elementary/themes/img/svg/face.svg
similarity index 100%
rename from data/elementary/themes/img/face.svg
rename to data/elementary/themes/img/svg/face.svg
diff --git a/data/elementary/themes/img/faq.svg b/data/elementary/themes/img/svg/faq.svg
similarity index 100%
rename from data/elementary/themes/img/faq.svg
rename to data/elementary/themes/img/svg/faq.svg
diff --git a/data/elementary/themes/img/file-properties.svg b/data/elementary/themes/img/svg/file-properties.svg
similarity index 100%
rename from data/elementary/themes/img/file-properties.svg
rename to data/elementary/themes/img/svg/file-properties.svg
diff --git a/data/elementary/themes/img/file.svg b/data/elementary/themes/img/svg/file.svg
similarity index 100%
rename from data/elementary/themes/img/file.svg
rename to data/elementary/themes/img/svg/file.svg
diff --git a/data/elementary/themes/img/file2.svg b/data/elementary/themes/img/svg/file2.svg
similarity index 100%
rename from data/elementary/themes/img/file2.svg
rename to data/elementary/themes/img/svg/file2.svg
diff --git a/data/elementary/themes/img/fill-center.svg b/data/elementary/themes/img/svg/fill-center.svg
similarity index 100%
rename from data/elementary/themes/img/fill-center.svg
rename to data/elementary/themes/img/svg/fill-center.svg
diff --git a/data/elementary/themes/img/fill-pan.svg b/data/elementary/themes/img/svg/fill-pan.svg
similarity index 100%
rename from data/elementary/themes/img/fill-pan.svg
rename to data/elementary/themes/img/svg/fill-pan.svg
diff --git a/data/elementary/themes/img/fill-stretch.svg b/data/elementary/themes/img/svg/fill-stretch.svg
similarity index 100%
rename from data/elementary/themes/img/fill-stretch.svg
rename to data/elementary/themes/img/svg/fill-stretch.svg
diff --git a/data/elementary/themes/img/fill-tile.svg b/data/elementary/themes/img/svg/fill-tile.svg
similarity index 100%
rename from data/elementary/themes/img/fill-tile.svg
rename to data/elementary/themes/img/svg/fill-tile.svg
diff --git a/data/elementary/themes/img/fill-within.svg b/data/elementary/themes/img/svg/fill-within.svg
similarity index 100%
rename from data/elementary/themes/img/fill-within.svg
rename to data/elementary/themes/img/svg/fill-within.svg
diff --git a/data/elementary/themes/img/film.svg b/data/elementary/themes/img/svg/film.svg
similarity index 100%
rename from data/elementary/themes/img/film.svg
rename to data/elementary/themes/img/svg/film.svg
diff --git a/data/elementary/themes/img/fingerprint.svg b/data/elementary/themes/img/svg/fingerprint.svg
similarity index 100%
rename from data/elementary/themes/img/fingerprint.svg
rename to data/elementary/themes/img/svg/fingerprint.svg
diff --git a/data/elementary/themes/img/floppy-blank.svg b/data/elementary/themes/img/svg/floppy-blank.svg
similarity index 100%
rename from data/elementary/themes/img/floppy-blank.svg
rename to data/elementary/themes/img/svg/floppy-blank.svg
diff --git a/data/elementary/themes/img/floppy-text.svg b/data/elementary/themes/img/svg/floppy-text.svg
similarity index 100%
rename from data/elementary/themes/img/floppy-text.svg
rename to data/elementary/themes/img/svg/floppy-text.svg
diff --git a/data/elementary/themes/img/floppy.svg b/data/elementary/themes/img/svg/floppy.svg
similarity index 100%
rename from data/elementary/themes/img/floppy.svg
rename to data/elementary/themes/img/svg/floppy.svg
diff --git a/data/elementary/themes/img/folder-copy.svg b/data/elementary/themes/img/svg/folder-copy.svg
similarity index 100%
rename from data/elementary/themes/img/folder-copy.svg
rename to data/elementary/themes/img/svg/folder-copy.svg
diff --git a/data/elementary/themes/img/folder-documents.svg b/data/elementary/themes/img/svg/folder-documents.svg
similarity index 100%
rename from data/elementary/themes/img/folder-documents.svg
rename to data/elementary/themes/img/svg/folder-documents.svg
diff --git a/data/elementary/themes/img/folder-download.svg b/data/elementary/themes/img/svg/folder-download.svg
similarity index 100%
rename from data/elementary/themes/img/folder-download.svg
rename to data/elementary/themes/img/svg/folder-download.svg
diff --git a/data/elementary/themes/img/folder-dropin.svg b/data/elementary/themes/img/svg/folder-dropin.svg
similarity index 100%
rename from data/elementary/themes/img/folder-dropin.svg
rename to data/elementary/themes/img/svg/folder-dropin.svg
diff --git a/data/elementary/themes/img/folder-home.svg b/data/elementary/themes/img/svg/folder-home.svg
similarity index 100%
rename from data/elementary/themes/img/folder-home.svg
rename to data/elementary/themes/img/svg/folder-home.svg
diff --git a/data/elementary/themes/img/folder-locked.svg b/data/elementary/themes/img/svg/folder-locked.svg
similarity index 100%
rename from data/elementary/themes/img/folder-locked.svg
rename to data/elementary/themes/img/svg/folder-locked.svg
diff --git a/data/elementary/themes/img/folder-move.svg b/data/elementary/themes/img/svg/folder-move.svg
similarity index 100%
rename from data/elementary/themes/img/folder-move.svg
rename to data/elementary/themes/img/svg/folder-move.svg
diff --git a/data/elementary/themes/img/folder-music.svg b/data/elementary/themes/img/svg/folder-music.svg
similarity index 100%
rename from data/elementary/themes/img/folder-music.svg
rename to data/elementary/themes/img/svg/folder-music.svg
diff --git a/data/elementary/themes/img/folder-open.svg b/data/elementary/themes/img/svg/folder-open.svg
similarity index 100%
rename from data/elementary/themes/img/folder-open.svg
rename to data/elementary/themes/img/svg/folder-open.svg
diff --git a/data/elementary/themes/img/folder-pictures.svg b/data/elementary/themes/img/svg/folder-pictures.svg
similarity index 100%
rename from data/elementary/themes/img/folder-pictures.svg
rename to data/elementary/themes/img/svg/folder-pictures.svg
diff --git a/data/elementary/themes/img/folder-plus.svg b/data/elementary/themes/img/svg/folder-plus.svg
similarity index 100%
rename from data/elementary/themes/img/folder-plus.svg
rename to data/elementary/themes/img/svg/folder-plus.svg
diff --git a/data/elementary/themes/img/folder-recent.svg b/data/elementary/themes/img/svg/folder-recent.svg
similarity index 100%
rename from data/elementary/themes/img/folder-recent.svg
rename to data/elementary/themes/img/svg/folder-recent.svg
diff --git a/data/elementary/themes/img/folder-search.svg b/data/elementary/themes/img/svg/folder-search.svg
similarity index 100%
rename from data/elementary/themes/img/folder-search.svg
rename to data/elementary/themes/img/svg/folder-search.svg
diff --git a/data/elementary/themes/img/folder-videos.svg b/data/elementary/themes/img/svg/folder-videos.svg
similarity index 100%
rename from data/elementary/themes/img/folder-videos.svg
rename to data/elementary/themes/img/svg/folder-videos.svg
diff --git a/data/elementary/themes/img/folder-visiting.svg b/data/elementary/themes/img/svg/folder-visiting.svg
similarity index 100%
rename from data/elementary/themes/img/folder-visiting.svg
rename to data/elementary/themes/img/svg/folder-visiting.svg
diff --git a/data/elementary/themes/img/folder-world.svg b/data/elementary/themes/img/svg/folder-world.svg
similarity index 100%
rename from data/elementary/themes/img/folder-world.svg
rename to data/elementary/themes/img/svg/folder-world.svg
diff --git a/data/elementary/themes/img/folder.svg b/data/elementary/themes/img/svg/folder.svg
similarity index 100%
rename from data/elementary/themes/img/folder.svg
rename to data/elementary/themes/img/svg/folder.svg
diff --git a/data/elementary/themes/img/font-file.svg b/data/elementary/themes/img/svg/font-file.svg
similarity index 100%
rename from data/elementary/themes/img/font-file.svg
rename to data/elementary/themes/img/svg/font-file.svg
diff --git a/data/elementary/themes/img/font.svg b/data/elementary/themes/img/svg/font.svg
similarity index 100%
rename from data/elementary/themes/img/font.svg
rename to data/elementary/themes/img/svg/font.svg
diff --git a/data/elementary/themes/img/format-bold.svg b/data/elementary/themes/img/svg/format-bold.svg
similarity index 100%
rename from data/elementary/themes/img/format-bold.svg
rename to data/elementary/themes/img/svg/format-bold.svg
diff --git a/data/elementary/themes/img/format-indent-less.svg b/data/elementary/themes/img/svg/format-indent-less.svg
similarity index 100%
rename from data/elementary/themes/img/format-indent-less.svg
rename to data/elementary/themes/img/svg/format-indent-less.svg
diff --git a/data/elementary/themes/img/format-indent-more.svg b/data/elementary/themes/img/svg/format-indent-more.svg
similarity index 100%
rename from data/elementary/themes/img/format-indent-more.svg
rename to data/elementary/themes/img/svg/format-indent-more.svg
diff --git a/data/elementary/themes/img/format-italic.svg b/data/elementary/themes/img/svg/format-italic.svg
similarity index 100%
rename from data/elementary/themes/img/format-italic.svg
rename to data/elementary/themes/img/svg/format-italic.svg
diff --git a/data/elementary/themes/img/format-justify-center.svg b/data/elementary/themes/img/svg/format-justify-center.svg
similarity index 100%
rename from data/elementary/themes/img/format-justify-center.svg
rename to data/elementary/themes/img/svg/format-justify-center.svg
diff --git a/data/elementary/themes/img/format-justify-fill.svg b/data/elementary/themes/img/svg/format-justify-fill.svg
similarity index 100%
rename from data/elementary/themes/img/format-justify-fill.svg
rename to data/elementary/themes/img/svg/format-justify-fill.svg
diff --git a/data/elementary/themes/img/format-justify-left.svg b/data/elementary/themes/img/svg/format-justify-left.svg
similarity index 100%
rename from data/elementary/themes/img/format-justify-left.svg
rename to data/elementary/themes/img/svg/format-justify-left.svg
diff --git a/data/elementary/themes/img/format-justify-right.svg b/data/elementary/themes/img/svg/format-justify-right.svg
similarity index 100%
rename from data/elementary/themes/img/format-justify-right.svg
rename to data/elementary/themes/img/svg/format-justify-right.svg
diff --git a/data/elementary/themes/img/format-strikethrough.svg b/data/elementary/themes/img/svg/format-strikethrough.svg
similarity index 100%
rename from data/elementary/themes/img/format-strikethrough.svg
rename to data/elementary/themes/img/svg/format-strikethrough.svg
diff --git a/data/elementary/themes/img/format-text-ltr.svg b/data/elementary/themes/img/svg/format-text-ltr.svg
similarity index 100%
rename from data/elementary/themes/img/format-text-ltr.svg
rename to data/elementary/themes/img/svg/format-text-ltr.svg
diff --git a/data/elementary/themes/img/format-text-rtl.svg b/data/elementary/themes/img/svg/format-text-rtl.svg
similarity index 100%
rename from data/elementary/themes/img/format-text-rtl.svg
rename to data/elementary/themes/img/svg/format-text-rtl.svg
diff --git a/data/elementary/themes/img/format-underline.svg b/data/elementary/themes/img/svg/format-underline.svg
similarity index 100%
rename from data/elementary/themes/img/format-underline.svg
rename to data/elementary/themes/img/svg/format-underline.svg
diff --git a/data/elementary/themes/img/fullscreen.svg b/data/elementary/themes/img/svg/fullscreen.svg
similarity index 100%
rename from data/elementary/themes/img/fullscreen.svg
rename to data/elementary/themes/img/svg/fullscreen.svg
diff --git a/data/elementary/themes/img/gamepad.svg b/data/elementary/themes/img/svg/gamepad.svg
similarity index 100%
rename from data/elementary/themes/img/gamepad.svg
rename to data/elementary/themes/img/svg/gamepad.svg
diff --git a/data/elementary/themes/img/gear-curly-braces.svg b/data/elementary/themes/img/svg/gear-curly-braces.svg
similarity index 100%
rename from data/elementary/themes/img/gear-curly-braces.svg
rename to data/elementary/themes/img/svg/gear-curly-braces.svg
diff --git a/data/elementary/themes/img/gear-dots.svg b/data/elementary/themes/img/svg/gear-dots.svg
similarity index 100%
rename from data/elementary/themes/img/gear-dots.svg
rename to data/elementary/themes/img/svg/gear-dots.svg
diff --git a/data/elementary/themes/img/gear-empty.svg b/data/elementary/themes/img/svg/gear-empty.svg
similarity index 100%
rename from data/elementary/themes/img/gear-empty.svg
rename to data/elementary/themes/img/svg/gear-empty.svg
diff --git a/data/elementary/themes/img/gear-person.svg b/data/elementary/themes/img/svg/gear-person.svg
similarity index 100%
rename from data/elementary/themes/img/gear-person.svg
rename to data/elementary/themes/img/svg/gear-person.svg
diff --git a/data/elementary/themes/img/gear-restart.svg b/data/elementary/themes/img/svg/gear-restart.svg
similarity index 100%
rename from data/elementary/themes/img/gear-restart.svg
rename to data/elementary/themes/img/svg/gear-restart.svg
diff --git a/data/elementary/themes/img/gear-spanner.svg b/data/elementary/themes/img/svg/gear-spanner.svg
similarity index 100%
rename from data/elementary/themes/img/gear-spanner.svg
rename to data/elementary/themes/img/svg/gear-spanner.svg
diff --git a/data/elementary/themes/img/gear-start.svg b/data/elementary/themes/img/svg/gear-start.svg
similarity index 100%
rename from data/elementary/themes/img/gear-start.svg
rename to data/elementary/themes/img/svg/gear-start.svg
diff --git a/data/elementary/themes/img/gear-x.svg b/data/elementary/themes/img/svg/gear-x.svg
similarity index 100%
rename from data/elementary/themes/img/gear-x.svg
rename to data/elementary/themes/img/svg/gear-x.svg
diff --git a/data/elementary/themes/img/gear.svg b/data/elementary/themes/img/svg/gear.svg
similarity index 100%
rename from data/elementary/themes/img/gear.svg
rename to data/elementary/themes/img/svg/gear.svg
diff --git a/data/elementary/themes/img/gesture.svg b/data/elementary/themes/img/svg/gesture.svg
similarity index 100%
rename from data/elementary/themes/img/gesture.svg
rename to data/elementary/themes/img/svg/gesture.svg
diff --git a/data/elementary/themes/img/globe-cloud.svg b/data/elementary/themes/img/svg/globe-cloud.svg
similarity index 100%
rename from data/elementary/themes/img/globe-cloud.svg
rename to data/elementary/themes/img/svg/globe-cloud.svg
diff --git a/data/elementary/themes/img/globe.svg b/data/elementary/themes/img/svg/globe.svg
similarity index 100%
rename from data/elementary/themes/img/globe.svg
rename to data/elementary/themes/img/svg/globe.svg
diff --git a/data/elementary/themes/img/gradient.svg b/data/elementary/themes/img/svg/gradient.svg
similarity index 100%
rename from data/elementary/themes/img/gradient.svg
rename to data/elementary/themes/img/svg/gradient.svg
diff --git a/data/elementary/themes/img/hamburger-menu.svg b/data/elementary/themes/img/svg/hamburger-menu.svg
similarity index 100%
rename from data/elementary/themes/img/hamburger-menu.svg
rename to data/elementary/themes/img/svg/hamburger-menu.svg
diff --git a/data/elementary/themes/img/handle_pick_up_left.svg b/data/elementary/themes/img/svg/handle_pick_up_left.svg
similarity index 100%
rename from data/elementary/themes/img/handle_pick_up_left.svg
rename to data/elementary/themes/img/svg/handle_pick_up_left.svg
diff --git a/data/elementary/themes/img/head.svg b/data/elementary/themes/img/svg/head.svg
similarity index 100%
rename from data/elementary/themes/img/head.svg
rename to data/elementary/themes/img/svg/head.svg
diff --git a/data/elementary/themes/img/heart.svg b/data/elementary/themes/img/svg/heart.svg
similarity index 100%
rename from data/elementary/themes/img/heart.svg
rename to data/elementary/themes/img/svg/heart.svg
diff --git a/data/elementary/themes/img/help-contents.svg b/data/elementary/themes/img/svg/help-contents.svg
similarity index 100%
rename from data/elementary/themes/img/help-contents.svg
rename to data/elementary/themes/img/svg/help-contents.svg
diff --git a/data/elementary/themes/img/help.svg b/data/elementary/themes/img/svg/help.svg
similarity index 100%
rename from data/elementary/themes/img/help.svg
rename to data/elementary/themes/img/svg/help.svg
diff --git a/data/elementary/themes/img/here.svg b/data/elementary/themes/img/svg/here.svg
similarity index 100%
rename from data/elementary/themes/img/here.svg
rename to data/elementary/themes/img/svg/here.svg
diff --git a/data/elementary/themes/img/home.svg b/data/elementary/themes/img/svg/home.svg
similarity index 100%
rename from data/elementary/themes/img/home.svg
rename to data/elementary/themes/img/svg/home.svg
diff --git a/data/elementary/themes/img/info.svg b/data/elementary/themes/img/svg/info.svg
similarity index 100%
rename from data/elementary/themes/img/info.svg
rename to data/elementary/themes/img/svg/info.svg
diff --git a/data/elementary/themes/img/input.svg b/data/elementary/themes/img/svg/input.svg
similarity index 100%
rename from data/elementary/themes/img/input.svg
rename to data/elementary/themes/img/svg/input.svg
diff --git a/data/elementary/themes/img/key.svg b/data/elementary/themes/img/svg/key.svg
similarity index 100%
rename from data/elementary/themes/img/key.svg
rename to data/elementary/themes/img/svg/key.svg
diff --git a/data/elementary/themes/img/keyboard-hand.svg b/data/elementary/themes/img/svg/keyboard-hand.svg
similarity index 100%
rename from data/elementary/themes/img/keyboard-hand.svg
rename to data/elementary/themes/img/svg/keyboard-hand.svg
diff --git a/data/elementary/themes/img/keyboard.svg b/data/elementary/themes/img/svg/keyboard.svg
similarity index 100%
rename from data/elementary/themes/img/keyboard.svg
rename to data/elementary/themes/img/svg/keyboard.svg
diff --git a/data/elementary/themes/img/kill.svg b/data/elementary/themes/img/svg/kill.svg
similarity index 100%
rename from data/elementary/themes/img/kill.svg
rename to data/elementary/themes/img/svg/kill.svg
diff --git a/data/elementary/themes/img/lang-blank.svg b/data/elementary/themes/img/svg/lang-blank.svg
similarity index 100%
rename from data/elementary/themes/img/lang-blank.svg
rename to data/elementary/themes/img/svg/lang-blank.svg
diff --git a/data/elementary/themes/img/lang-lock.svg b/data/elementary/themes/img/svg/lang-lock.svg
similarity index 100%
rename from data/elementary/themes/img/lang-lock.svg
rename to data/elementary/themes/img/svg/lang-lock.svg
diff --git a/data/elementary/themes/img/lang-unknown.svg b/data/elementary/themes/img/svg/lang-unknown.svg
similarity index 100%
rename from data/elementary/themes/img/lang-unknown.svg
rename to data/elementary/themes/img/svg/lang-unknown.svg
diff --git a/data/elementary/themes/img/lang.svg b/data/elementary/themes/img/svg/lang.svg
similarity index 100%
rename from data/elementary/themes/img/lang.svg
rename to data/elementary/themes/img/svg/lang.svg
diff --git a/data/elementary/themes/img/laptop-pc.svg b/data/elementary/themes/img/svg/laptop-pc.svg
similarity index 100%
rename from data/elementary/themes/img/laptop-pc.svg
rename to data/elementary/themes/img/svg/laptop-pc.svg
diff --git a/data/elementary/themes/img/link-plus.svg b/data/elementary/themes/img/svg/link-plus.svg
similarity index 100%
rename from data/elementary/themes/img/link-plus.svg
rename to data/elementary/themes/img/svg/link-plus.svg
diff --git a/data/elementary/themes/img/list-add.svg b/data/elementary/themes/img/svg/list-add.svg
similarity index 100%
rename from data/elementary/themes/img/list-add.svg
rename to data/elementary/themes/img/svg/list-add.svg
diff --git a/data/elementary/themes/img/list-compact.svg b/data/elementary/themes/img/svg/list-compact.svg
similarity index 100%
rename from data/elementary/themes/img/list-compact.svg
rename to data/elementary/themes/img/svg/list-compact.svg
diff --git a/data/elementary/themes/img/list-del.svg b/data/elementary/themes/img/svg/list-del.svg
similarity index 100%
rename from data/elementary/themes/img/list-del.svg
rename to data/elementary/themes/img/svg/list-del.svg
diff --git a/data/elementary/themes/img/list-details.svg b/data/elementary/themes/img/svg/list-details.svg
similarity index 100%
rename from data/elementary/themes/img/list-details.svg
rename to data/elementary/themes/img/svg/list-details.svg
diff --git a/data/elementary/themes/img/list-icons.svg b/data/elementary/themes/img/svg/list-icons.svg
similarity index 100%
rename from data/elementary/themes/img/list-icons.svg
rename to data/elementary/themes/img/svg/list-icons.svg
diff --git a/data/elementary/themes/img/lock-double.svg b/data/elementary/themes/img/svg/lock-double.svg
similarity index 100%
rename from data/elementary/themes/img/lock-double.svg
rename to data/elementary/themes/img/svg/lock-double.svg
diff --git a/data/elementary/themes/img/lock.svg b/data/elementary/themes/img/svg/lock.svg
similarity index 100%
rename from data/elementary/themes/img/lock.svg
rename to data/elementary/themes/img/svg/lock.svg
diff --git a/data/elementary/themes/img/mail-arrow-heads-l.svg b/data/elementary/themes/img/svg/mail-arrow-heads-l.svg
similarity index 100%
rename from data/elementary/themes/img/mail-arrow-heads-l.svg
rename to data/elementary/themes/img/svg/mail-arrow-heads-l.svg
diff --git a/data/elementary/themes/img/mail-arrow-in-d.svg b/data/elementary/themes/img/svg/mail-arrow-in-d.svg
similarity index 100%
rename from data/elementary/themes/img/mail-arrow-in-d.svg
rename to data/elementary/themes/img/svg/mail-arrow-in-d.svg
diff --git a/data/elementary/themes/img/mail-arrow-l.svg b/data/elementary/themes/img/svg/mail-arrow-l.svg
similarity index 100%
rename from data/elementary/themes/img/mail-arrow-l.svg
rename to data/elementary/themes/img/svg/mail-arrow-l.svg
diff --git a/data/elementary/themes/img/mail-arrow-r.svg b/data/elementary/themes/img/svg/mail-arrow-r.svg
similarity index 100%
rename from data/elementary/themes/img/mail-arrow-r.svg
rename to data/elementary/themes/img/svg/mail-arrow-r.svg
diff --git a/data/elementary/themes/img/mail-arrow-u.svg b/data/elementary/themes/img/svg/mail-arrow-u.svg
similarity index 100%
rename from data/elementary/themes/img/mail-arrow-u.svg
rename to data/elementary/themes/img/svg/mail-arrow-u.svg
diff --git a/data/elementary/themes/img/mail-attach.svg b/data/elementary/themes/img/svg/mail-attach.svg
similarity index 100%
rename from data/elementary/themes/img/mail-attach.svg
rename to data/elementary/themes/img/svg/mail-attach.svg
diff --git a/data/elementary/themes/img/mail-bug-no.svg b/data/elementary/themes/img/svg/mail-bug-no.svg
similarity index 100%
rename from data/elementary/themes/img/mail-bug-no.svg
rename to data/elementary/themes/img/svg/mail-bug-no.svg
diff --git a/data/elementary/themes/img/mail-bug.svg b/data/elementary/themes/img/svg/mail-bug.svg
similarity index 100%
rename from data/elementary/themes/img/mail-bug.svg
rename to data/elementary/themes/img/svg/mail-bug.svg
diff --git a/data/elementary/themes/img/mail-exclam.svg b/data/elementary/themes/img/svg/mail-exclam.svg
similarity index 100%
rename from data/elementary/themes/img/mail-exclam.svg
rename to data/elementary/themes/img/svg/mail-exclam.svg
diff --git a/data/elementary/themes/img/mail-opened.svg b/data/elementary/themes/img/svg/mail-opened.svg
similarity index 100%
rename from data/elementary/themes/img/mail-opened.svg
rename to data/elementary/themes/img/svg/mail-opened.svg
diff --git a/data/elementary/themes/img/mail-pencil.svg b/data/elementary/themes/img/svg/mail-pencil.svg
similarity index 100%
rename from data/elementary/themes/img/mail-pencil.svg
rename to data/elementary/themes/img/svg/mail-pencil.svg
diff --git a/data/elementary/themes/img/mail-reply.svg b/data/elementary/themes/img/svg/mail-reply.svg
similarity index 100%
rename from data/elementary/themes/img/mail-reply.svg
rename to data/elementary/themes/img/svg/mail-reply.svg
diff --git a/data/elementary/themes/img/mail-sign-verified.svg b/data/elementary/themes/img/svg/mail-sign-verified.svg
similarity index 100%
rename from data/elementary/themes/img/mail-sign-verified.svg
rename to data/elementary/themes/img/svg/mail-sign-verified.svg
diff --git a/data/elementary/themes/img/mail-sign.svg b/data/elementary/themes/img/svg/mail-sign.svg
similarity index 100%
rename from data/elementary/themes/img/mail-sign.svg
rename to data/elementary/themes/img/svg/mail-sign.svg
diff --git a/data/elementary/themes/img/mail.svg b/data/elementary/themes/img/svg/mail.svg
similarity index 100%
rename from data/elementary/themes/img/mail.svg
rename to data/elementary/themes/img/svg/mail.svg
diff --git a/data/elementary/themes/img/map_circle.svg b/data/elementary/themes/img/svg/map_circle.svg
similarity index 100%
rename from data/elementary/themes/img/map_circle.svg
rename to data/elementary/themes/img/svg/map_circle.svg
diff --git a/data/elementary/themes/img/map_marker.svg b/data/elementary/themes/img/svg/map_marker.svg
similarity index 100%
rename from data/elementary/themes/img/map_marker.svg
rename to data/elementary/themes/img/svg/map_marker.svg
diff --git a/data/elementary/themes/img/media-eject.svg b/data/elementary/themes/img/svg/media-eject.svg
similarity index 100%
rename from data/elementary/themes/img/media-eject.svg
rename to data/elementary/themes/img/svg/media-eject.svg
diff --git a/data/elementary/themes/img/media-ff.svg b/data/elementary/themes/img/svg/media-ff.svg
similarity index 100%
rename from data/elementary/themes/img/media-ff.svg
rename to data/elementary/themes/img/svg/media-ff.svg
diff --git a/data/elementary/themes/img/media-mute.svg b/data/elementary/themes/img/svg/media-mute.svg
similarity index 100%
rename from data/elementary/themes/img/media-mute.svg
rename to data/elementary/themes/img/svg/media-mute.svg
diff --git a/data/elementary/themes/img/media-next.svg b/data/elementary/themes/img/svg/media-next.svg
similarity index 100%
rename from data/elementary/themes/img/media-next.svg
rename to data/elementary/themes/img/svg/media-next.svg
diff --git a/data/elementary/themes/img/media-pause.svg b/data/elementary/themes/img/svg/media-pause.svg
similarity index 100%
rename from data/elementary/themes/img/media-pause.svg
rename to data/elementary/themes/img/svg/media-pause.svg
diff --git a/data/elementary/themes/img/media-player.svg b/data/elementary/themes/img/svg/media-player.svg
similarity index 100%
rename from data/elementary/themes/img/media-player.svg
rename to data/elementary/themes/img/svg/media-player.svg
diff --git a/data/elementary/themes/img/media-record.svg b/data/elementary/themes/img/svg/media-record.svg
similarity index 100%
rename from data/elementary/themes/img/media-record.svg
rename to data/elementary/themes/img/svg/media-record.svg
diff --git a/data/elementary/themes/img/media-repeat.svg b/data/elementary/themes/img/svg/media-repeat.svg
similarity index 100%
rename from data/elementary/themes/img/media-repeat.svg
rename to data/elementary/themes/img/svg/media-repeat.svg
diff --git a/data/elementary/themes/img/media-rw.svg b/data/elementary/themes/img/svg/media-rw.svg
similarity index 100%
rename from data/elementary/themes/img/media-rw.svg
rename to data/elementary/themes/img/svg/media-rw.svg
diff --git a/data/elementary/themes/img/media-shuffle.svg b/data/elementary/themes/img/svg/media-shuffle.svg
similarity index 100%
rename from data/elementary/themes/img/media-shuffle.svg
rename to data/elementary/themes/img/svg/media-shuffle.svg
diff --git a/data/elementary/themes/img/media-stop.svg b/data/elementary/themes/img/svg/media-stop.svg
similarity index 100%
rename from data/elementary/themes/img/media-stop.svg
rename to data/elementary/themes/img/svg/media-stop.svg
diff --git a/data/elementary/themes/img/media-volume.svg b/data/elementary/themes/img/svg/media-volume.svg
similarity index 100%
rename from data/elementary/themes/img/media-volume.svg
rename to data/elementary/themes/img/svg/media-volume.svg
diff --git a/data/elementary/themes/img/memory.svg b/data/elementary/themes/img/svg/memory.svg
similarity index 100%
rename from data/elementary/themes/img/memory.svg
rename to data/elementary/themes/img/svg/memory.svg
diff --git a/data/elementary/themes/img/menus-settings.svg b/data/elementary/themes/img/svg/menus-settings.svg
similarity index 100%
rename from data/elementary/themes/img/menus-settings.svg
rename to data/elementary/themes/img/svg/menus-settings.svg
diff --git a/data/elementary/themes/img/menus.svg b/data/elementary/themes/img/svg/menus.svg
similarity index 100%
rename from data/elementary/themes/img/menus.svg
rename to data/elementary/themes/img/svg/menus.svg
diff --git a/data/elementary/themes/img/microphone.svg b/data/elementary/themes/img/svg/microphone.svg
similarity index 100%
rename from data/elementary/themes/img/microphone.svg
rename to data/elementary/themes/img/svg/microphone.svg
diff --git a/data/elementary/themes/img/minus.svg b/data/elementary/themes/img/svg/minus.svg
similarity index 100%
rename from data/elementary/themes/img/minus.svg
rename to data/elementary/themes/img/svg/minus.svg
diff --git a/data/elementary/themes/img/mobile-phone.svg b/data/elementary/themes/img/svg/mobile-phone.svg
similarity index 100%
rename from data/elementary/themes/img/mobile-phone.svg
rename to data/elementary/themes/img/svg/mobile-phone.svg
diff --git a/data/elementary/themes/img/modem.svg b/data/elementary/themes/img/svg/modem.svg
similarity index 100%
rename from data/elementary/themes/img/modem.svg
rename to data/elementary/themes/img/svg/modem.svg
diff --git a/data/elementary/themes/img/modules.svg b/data/elementary/themes/img/svg/modules.svg
similarity index 100%
rename from data/elementary/themes/img/modules.svg
rename to data/elementary/themes/img/svg/modules.svg
diff --git a/data/elementary/themes/img/monitor-speakers.svg b/data/elementary/themes/img/svg/monitor-speakers.svg
similarity index 100%
rename from data/elementary/themes/img/monitor-speakers.svg
rename to data/elementary/themes/img/svg/monitor-speakers.svg
diff --git a/data/elementary/themes/img/moon-clouds.svg b/data/elementary/themes/img/svg/moon-clouds.svg
similarity index 100%
rename from data/elementary/themes/img/moon-clouds.svg
rename to data/elementary/themes/img/svg/moon-clouds.svg
diff --git a/data/elementary/themes/img/moon.svg b/data/elementary/themes/img/svg/moon.svg
similarity index 100%
rename from data/elementary/themes/img/moon.svg
rename to data/elementary/themes/img/svg/moon.svg
diff --git a/data/elementary/themes/img/mouse-extra.svg b/data/elementary/themes/img/svg/mouse-extra.svg
similarity index 100%
rename from data/elementary/themes/img/mouse-extra.svg
rename to data/elementary/themes/img/svg/mouse-extra.svg
diff --git a/data/elementary/themes/img/mouse-left.svg b/data/elementary/themes/img/svg/mouse-left.svg
similarity index 100%
rename from data/elementary/themes/img/mouse-left.svg
rename to data/elementary/themes/img/svg/mouse-left.svg
diff --git a/data/elementary/themes/img/mouse-middle.svg b/data/elementary/themes/img/svg/mouse-middle.svg
similarity index 100%
rename from data/elementary/themes/img/mouse-middle.svg
rename to data/elementary/themes/img/svg/mouse-middle.svg
diff --git a/data/elementary/themes/img/mouse-right.svg b/data/elementary/themes/img/svg/mouse-right.svg
similarity index 100%
rename from data/elementary/themes/img/mouse-right.svg
rename to data/elementary/themes/img/svg/mouse-right.svg
diff --git a/data/elementary/themes/img/mouse-wheel.svg b/data/elementary/themes/img/svg/mouse-wheel.svg
similarity index 100%
rename from data/elementary/themes/img/mouse-wheel.svg
rename to data/elementary/themes/img/svg/mouse-wheel.svg
diff --git a/data/elementary/themes/img/mouse.svg b/data/elementary/themes/img/svg/mouse.svg
similarity index 100%
rename from data/elementary/themes/img/mouse.svg
rename to data/elementary/themes/img/svg/mouse.svg
diff --git a/data/elementary/themes/img/move.svg b/data/elementary/themes/img/svg/move.svg
similarity index 100%
rename from data/elementary/themes/img/move.svg
rename to data/elementary/themes/img/svg/move.svg
diff --git a/data/elementary/themes/img/net-error.svg b/data/elementary/themes/img/svg/net-error.svg
similarity index 100%
rename from data/elementary/themes/img/net-error.svg
rename to data/elementary/themes/img/svg/net-error.svg
diff --git a/data/elementary/themes/img/net-idle.svg b/data/elementary/themes/img/svg/net-idle.svg
similarity index 100%
rename from data/elementary/themes/img/net-idle.svg
rename to data/elementary/themes/img/svg/net-idle.svg
diff --git a/data/elementary/themes/img/net-offline.svg b/data/elementary/themes/img/svg/net-offline.svg
similarity index 100%
rename from data/elementary/themes/img/net-offline.svg
rename to data/elementary/themes/img/svg/net-offline.svg
diff --git a/data/elementary/themes/img/net-receive.svg b/data/elementary/themes/img/svg/net-receive.svg
similarity index 100%
rename from data/elementary/themes/img/net-receive.svg
rename to data/elementary/themes/img/svg/net-receive.svg
diff --git a/data/elementary/themes/img/net-send-receive.svg b/data/elementary/themes/img/svg/net-send-receive.svg
similarity index 100%
rename from data/elementary/themes/img/net-send-receive.svg
rename to data/elementary/themes/img/svg/net-send-receive.svg
diff --git a/data/elementary/themes/img/net-send.svg b/data/elementary/themes/img/svg/net-send.svg
similarity index 100%
rename from data/elementary/themes/img/net-send.svg
rename to data/elementary/themes/img/svg/net-send.svg
diff --git a/data/elementary/themes/img/net-vpn-connecting.svg b/data/elementary/themes/img/svg/net-vpn-connecting.svg
similarity index 100%
rename from data/elementary/themes/img/net-vpn-connecting.svg
rename to data/elementary/themes/img/svg/net-vpn-connecting.svg
diff --git a/data/elementary/themes/img/net-vpn.svg b/data/elementary/themes/img/svg/net-vpn.svg
similarity index 100%
rename from data/elementary/themes/img/net-vpn.svg
rename to data/elementary/themes/img/svg/net-vpn.svg
diff --git a/data/elementary/themes/img/net-wifi-connecting.svg b/data/elementary/themes/img/svg/net-wifi-connecting.svg
similarity index 100%
rename from data/elementary/themes/img/net-wifi-connecting.svg
rename to data/elementary/themes/img/svg/net-wifi-connecting.svg
diff --git a/data/elementary/themes/img/net-wifi-encrypted.svg b/data/elementary/themes/img/svg/net-wifi-encrypted.svg
similarity index 100%
rename from data/elementary/themes/img/net-wifi-encrypted.svg
rename to data/elementary/themes/img/svg/net-wifi-encrypted.svg
diff --git a/data/elementary/themes/img/net-wifi-sig-0.svg b/data/elementary/themes/img/svg/net-wifi-sig-0.svg
similarity index 100%
rename from data/elementary/themes/img/net-wifi-sig-0.svg
rename to data/elementary/themes/img/svg/net-wifi-sig-0.svg
diff --git a/data/elementary/themes/img/net-wifi-sig-1.svg b/data/elementary/themes/img/svg/net-wifi-sig-1.svg
similarity index 100%
rename from data/elementary/themes/img/net-wifi-sig-1.svg
rename to data/elementary/themes/img/svg/net-wifi-sig-1.svg
diff --git a/data/elementary/themes/img/net-wifi-sig-2.svg b/data/elementary/themes/img/svg/net-wifi-sig-2.svg
similarity index 100%
rename from data/elementary/themes/img/net-wifi-sig-2.svg
rename to data/elementary/themes/img/svg/net-wifi-sig-2.svg
diff --git a/data/elementary/themes/img/net-wifi-sig-3.svg b/data/elementary/themes/img/svg/net-wifi-sig-3.svg
similarity index 100%
rename from data/elementary/themes/img/net-wifi-sig-3.svg
rename to data/elementary/themes/img/svg/net-wifi-sig-3.svg
diff --git a/data/elementary/themes/img/net-wifi-sig-4.svg b/data/elementary/themes/img/svg/net-wifi-sig-4.svg
similarity index 100%
rename from data/elementary/themes/img/net-wifi-sig-4.svg
rename to data/elementary/themes/img/svg/net-wifi-sig-4.svg
diff --git a/data/elementary/themes/img/net.svg b/data/elementary/themes/img/svg/net.svg
similarity index 100%
rename from data/elementary/themes/img/net.svg
rename to data/elementary/themes/img/svg/net.svg
diff --git a/data/elementary/themes/img/net2.svg b/data/elementary/themes/img/svg/net2.svg
similarity index 100%
rename from data/elementary/themes/img/net2.svg
rename to data/elementary/themes/img/svg/net2.svg
diff --git a/data/elementary/themes/img/network.svg b/data/elementary/themes/img/svg/network.svg
similarity index 100%
rename from data/elementary/themes/img/network.svg
rename to data/elementary/themes/img/svg/network.svg
diff --git a/data/elementary/themes/img/notification.svg b/data/elementary/themes/img/svg/notification.svg
similarity index 100%
rename from data/elementary/themes/img/notification.svg
rename to data/elementary/themes/img/svg/notification.svg
diff --git a/data/elementary/themes/img/package-error.svg b/data/elementary/themes/img/svg/package-error.svg
similarity index 100%
rename from data/elementary/themes/img/package-error.svg
rename to data/elementary/themes/img/svg/package-error.svg
diff --git a/data/elementary/themes/img/package-updated.svg b/data/elementary/themes/img/svg/package-updated.svg
similarity index 100%
rename from data/elementary/themes/img/package-updated.svg
rename to data/elementary/themes/img/svg/package-updated.svg
diff --git a/data/elementary/themes/img/package-working.svg b/data/elementary/themes/img/svg/package-working.svg
similarity index 100%
rename from data/elementary/themes/img/package-working.svg
rename to data/elementary/themes/img/svg/package-working.svg
diff --git a/data/elementary/themes/img/package.svg b/data/elementary/themes/img/svg/package.svg
similarity index 100%
rename from data/elementary/themes/img/package.svg
rename to data/elementary/themes/img/svg/package.svg
diff --git a/data/elementary/themes/img/padlock-lock.svg b/data/elementary/themes/img/svg/padlock-lock.svg
similarity index 100%
rename from data/elementary/themes/img/padlock-lock.svg
rename to data/elementary/themes/img/svg/padlock-lock.svg
diff --git a/data/elementary/themes/img/padlock-unlock.svg b/data/elementary/themes/img/svg/padlock-unlock.svg
similarity index 100%
rename from data/elementary/themes/img/padlock-unlock.svg
rename to data/elementary/themes/img/svg/padlock-unlock.svg
diff --git a/data/elementary/themes/img/pager.svg b/data/elementary/themes/img/svg/pager.svg
similarity index 100%
rename from data/elementary/themes/img/pager.svg
rename to data/elementary/themes/img/svg/pager.svg
diff --git a/data/elementary/themes/img/paint.svg b/data/elementary/themes/img/svg/paint.svg
similarity index 100%
rename from data/elementary/themes/img/paint.svg
rename to data/elementary/themes/img/svg/paint.svg
diff --git a/data/elementary/themes/img/paintbrush.svg b/data/elementary/themes/img/svg/paintbrush.svg
similarity index 100%
rename from data/elementary/themes/img/paintbrush.svg
rename to data/elementary/themes/img/svg/paintbrush.svg
diff --git a/data/elementary/themes/img/palette.svg b/data/elementary/themes/img/svg/palette.svg
similarity index 100%
rename from data/elementary/themes/img/palette.svg
rename to data/elementary/themes/img/svg/palette.svg
diff --git a/data/elementary/themes/img/password-sign-blue.svg b/data/elementary/themes/img/svg/password-sign-blue.svg
similarity index 100%
rename from data/elementary/themes/img/password-sign-blue.svg
rename to data/elementary/themes/img/svg/password-sign-blue.svg
diff --git a/data/elementary/themes/img/paste.svg b/data/elementary/themes/img/svg/paste.svg
similarity index 100%
rename from data/elementary/themes/img/paste.svg
rename to data/elementary/themes/img/svg/paste.svg
diff --git a/data/elementary/themes/img/pda.svg b/data/elementary/themes/img/svg/pda.svg
similarity index 100%
rename from data/elementary/themes/img/pda.svg
rename to data/elementary/themes/img/svg/pda.svg
diff --git a/data/elementary/themes/img/pencil-check.svg b/data/elementary/themes/img/svg/pencil-check.svg
similarity index 100%
rename from data/elementary/themes/img/pencil-check.svg
rename to data/elementary/themes/img/svg/pencil-check.svg
diff --git a/data/elementary/themes/img/pencil-cross.svg b/data/elementary/themes/img/svg/pencil-cross.svg
similarity index 100%
rename from data/elementary/themes/img/pencil-cross.svg
rename to data/elementary/themes/img/svg/pencil-cross.svg
diff --git a/data/elementary/themes/img/person-call.svg b/data/elementary/themes/img/svg/person-call.svg
similarity index 100%
rename from data/elementary/themes/img/person-call.svg
rename to data/elementary/themes/img/svg/person-call.svg
diff --git a/data/elementary/themes/img/person-invisible.svg b/data/elementary/themes/img/svg/person-invisible.svg
similarity index 100%
rename from data/elementary/themes/img/person-invisible.svg
rename to data/elementary/themes/img/svg/person-invisible.svg
diff --git a/data/elementary/themes/img/person-offline.svg b/data/elementary/themes/img/svg/person-offline.svg
similarity index 100%
rename from data/elementary/themes/img/person-offline.svg
rename to data/elementary/themes/img/svg/person-offline.svg
diff --git a/data/elementary/themes/img/person-plus.svg b/data/elementary/themes/img/svg/person-plus.svg
similarity index 100%
rename from data/elementary/themes/img/person-plus.svg
rename to data/elementary/themes/img/svg/person-plus.svg
diff --git a/data/elementary/themes/img/person-sleep.svg b/data/elementary/themes/img/svg/person-sleep.svg
similarity index 100%
rename from data/elementary/themes/img/person-sleep.svg
rename to data/elementary/themes/img/svg/person-sleep.svg
diff --git a/data/elementary/themes/img/person-smile.svg b/data/elementary/themes/img/svg/person-smile.svg
similarity index 100%
rename from data/elementary/themes/img/person-smile.svg
rename to data/elementary/themes/img/svg/person-smile.svg
diff --git a/data/elementary/themes/img/person.svg b/data/elementary/themes/img/svg/person.svg
similarity index 100%
rename from data/elementary/themes/img/person.svg
rename to data/elementary/themes/img/svg/person.svg
diff --git a/data/elementary/themes/img/phone.svg b/data/elementary/themes/img/svg/phone.svg
similarity index 100%
rename from data/elementary/themes/img/phone.svg
rename to data/elementary/themes/img/svg/phone.svg
diff --git a/data/elementary/themes/img/photo.svg b/data/elementary/themes/img/svg/photo.svg
similarity index 100%
rename from data/elementary/themes/img/photo.svg
rename to data/elementary/themes/img/svg/photo.svg
diff --git a/data/elementary/themes/img/picture-landscape-plus.svg b/data/elementary/themes/img/svg/picture-landscape-plus.svg
similarity index 100%
rename from data/elementary/themes/img/picture-landscape-plus.svg
rename to data/elementary/themes/img/svg/picture-landscape-plus.svg
diff --git a/data/elementary/themes/img/picture-landscape.svg b/data/elementary/themes/img/svg/picture-landscape.svg
similarity index 100%
rename from data/elementary/themes/img/picture-landscape.svg
rename to data/elementary/themes/img/svg/picture-landscape.svg
diff --git a/data/elementary/themes/img/pin.svg b/data/elementary/themes/img/svg/pin.svg
similarity index 100%
rename from data/elementary/themes/img/pin.svg
rename to data/elementary/themes/img/svg/pin.svg
diff --git a/data/elementary/themes/img/pkg-bug.svg b/data/elementary/themes/img/svg/pkg-bug.svg
similarity index 100%
rename from data/elementary/themes/img/pkg-bug.svg
rename to data/elementary/themes/img/svg/pkg-bug.svg
diff --git a/data/elementary/themes/img/pkg-enhance.svg b/data/elementary/themes/img/svg/pkg-enhance.svg
similarity index 100%
rename from data/elementary/themes/img/pkg-enhance.svg
rename to data/elementary/themes/img/svg/pkg-enhance.svg
diff --git a/data/elementary/themes/img/pkg-important.svg b/data/elementary/themes/img/svg/pkg-important.svg
similarity index 100%
rename from data/elementary/themes/img/pkg-important.svg
rename to data/elementary/themes/img/svg/pkg-important.svg
diff --git a/data/elementary/themes/img/pkg-low.svg b/data/elementary/themes/img/svg/pkg-low.svg
similarity index 100%
rename from data/elementary/themes/img/pkg-low.svg
rename to data/elementary/themes/img/svg/pkg-low.svg
diff --git a/data/elementary/themes/img/pkg-normal.svg b/data/elementary/themes/img/svg/pkg-normal.svg
similarity index 100%
rename from data/elementary/themes/img/pkg-normal.svg
rename to data/elementary/themes/img/svg/pkg-normal.svg
diff --git a/data/elementary/themes/img/pkg-security.svg b/data/elementary/themes/img/svg/pkg-security.svg
similarity index 100%
rename from data/elementary/themes/img/pkg-security.svg
rename to data/elementary/themes/img/svg/pkg-security.svg
diff --git a/data/elementary/themes/img/plus.svg b/data/elementary/themes/img/svg/plus.svg
similarity index 100%
rename from data/elementary/themes/img/plus.svg
rename to data/elementary/themes/img/svg/plus.svg
diff --git a/data/elementary/themes/img/power-plug.svg b/data/elementary/themes/img/svg/power-plug.svg
similarity index 100%
rename from data/elementary/themes/img/power-plug.svg
rename to data/elementary/themes/img/svg/power-plug.svg
diff --git a/data/elementary/themes/img/print-doc-content.svg b/data/elementary/themes/img/svg/print-doc-content.svg
similarity index 100%
rename from data/elementary/themes/img/print-doc-content.svg
rename to data/elementary/themes/img/svg/print-doc-content.svg
diff --git a/data/elementary/themes/img/print-doc.svg b/data/elementary/themes/img/svg/print-doc.svg
similarity index 100%
rename from data/elementary/themes/img/print-doc.svg
rename to data/elementary/themes/img/svg/print-doc.svg
diff --git a/data/elementary/themes/img/printer-error.svg b/data/elementary/themes/img/svg/printer-error.svg
similarity index 100%
rename from data/elementary/themes/img/printer-error.svg
rename to data/elementary/themes/img/svg/printer-error.svg
diff --git a/data/elementary/themes/img/printer-warning.svg b/data/elementary/themes/img/svg/printer-warning.svg
similarity index 100%
rename from data/elementary/themes/img/printer-warning.svg
rename to data/elementary/themes/img/svg/printer-warning.svg
diff --git a/data/elementary/themes/img/printer.svg b/data/elementary/themes/img/svg/printer.svg
similarity index 100%
rename from data/elementary/themes/img/printer.svg
rename to data/elementary/themes/img/svg/printer.svg
diff --git a/data/elementary/themes/img/properties.svg b/data/elementary/themes/img/svg/properties.svg
similarity index 100%
rename from data/elementary/themes/img/properties.svg
rename to data/elementary/themes/img/svg/properties.svg
diff --git a/data/elementary/themes/img/puzzle.svg b/data/elementary/themes/img/svg/puzzle.svg
similarity index 100%
rename from data/elementary/themes/img/puzzle.svg
rename to data/elementary/themes/img/svg/puzzle.svg
diff --git a/data/elementary/themes/img/question-sign-green.svg b/data/elementary/themes/img/svg/question-sign-green.svg
similarity index 100%
rename from data/elementary/themes/img/question-sign-green.svg
rename to data/elementary/themes/img/svg/question-sign-green.svg
diff --git a/data/elementary/themes/img/radio.svg b/data/elementary/themes/img/svg/radio.svg
similarity index 100%
rename from data/elementary/themes/img/radio.svg
rename to data/elementary/themes/img/svg/radio.svg
diff --git a/data/elementary/themes/img/redo.svg b/data/elementary/themes/img/svg/redo.svg
similarity index 100%
rename from data/elementary/themes/img/redo.svg
rename to data/elementary/themes/img/svg/redo.svg
diff --git a/data/elementary/themes/img/refresh.svg b/data/elementary/themes/img/svg/refresh.svg
similarity index 100%
rename from data/elementary/themes/img/refresh.svg
rename to data/elementary/themes/img/svg/refresh.svg
diff --git a/data/elementary/themes/img/rename.svg b/data/elementary/themes/img/svg/rename.svg
similarity index 100%
rename from data/elementary/themes/img/rename.svg
rename to data/elementary/themes/img/svg/rename.svg
diff --git a/data/elementary/themes/img/resize.svg b/data/elementary/themes/img/svg/resize.svg
similarity index 100%
rename from data/elementary/themes/img/resize.svg
rename to data/elementary/themes/img/svg/resize.svg
diff --git a/data/elementary/themes/img/rocket.svg b/data/elementary/themes/img/svg/rocket.svg
similarity index 100%
rename from data/elementary/themes/img/rocket.svg
rename to data/elementary/themes/img/svg/rocket.svg
diff --git a/data/elementary/themes/img/scaling.svg b/data/elementary/themes/img/svg/scaling.svg
similarity index 100%
rename from data/elementary/themes/img/scaling.svg
rename to data/elementary/themes/img/svg/scaling.svg
diff --git a/data/elementary/themes/img/scanner.svg b/data/elementary/themes/img/svg/scanner.svg
similarity index 100%
rename from data/elementary/themes/img/scanner.svg
rename to data/elementary/themes/img/svg/scanner.svg
diff --git a/data/elementary/themes/img/scissor-rule.svg b/data/elementary/themes/img/svg/scissor-rule.svg
similarity index 100%
rename from data/elementary/themes/img/scissor-rule.svg
rename to data/elementary/themes/img/svg/scissor-rule.svg
diff --git a/data/elementary/themes/img/screen-around.svg b/data/elementary/themes/img/svg/screen-around.svg
similarity index 100%
rename from data/elementary/themes/img/screen-around.svg
rename to data/elementary/themes/img/svg/screen-around.svg
diff --git a/data/elementary/themes/img/screen-edges.svg b/data/elementary/themes/img/svg/screen-edges.svg
similarity index 100%
rename from data/elementary/themes/img/screen-edges.svg
rename to data/elementary/themes/img/svg/screen-edges.svg
diff --git a/data/elementary/themes/img/screen-hflip.svg b/data/elementary/themes/img/svg/screen-hflip.svg
similarity index 100%
rename from data/elementary/themes/img/screen-hflip.svg
rename to data/elementary/themes/img/svg/screen-hflip.svg
diff --git a/data/elementary/themes/img/screen-left.svg b/data/elementary/themes/img/svg/screen-left.svg
similarity index 100%
rename from data/elementary/themes/img/screen-left.svg
rename to data/elementary/themes/img/svg/screen-left.svg
diff --git a/data/elementary/themes/img/screen-lock.svg b/data/elementary/themes/img/svg/screen-lock.svg
similarity index 100%
rename from data/elementary/themes/img/screen-lock.svg
rename to data/elementary/themes/img/svg/screen-lock.svg
diff --git a/data/elementary/themes/img/screen-resolution.svg b/data/elementary/themes/img/svg/screen-resolution.svg
similarity index 100%
rename from data/elementary/themes/img/screen-resolution.svg
rename to data/elementary/themes/img/svg/screen-resolution.svg
diff --git a/data/elementary/themes/img/screen-right.svg b/data/elementary/themes/img/svg/screen-right.svg
similarity index 100%
rename from data/elementary/themes/img/screen-right.svg
rename to data/elementary/themes/img/svg/screen-right.svg
diff --git a/data/elementary/themes/img/screen-vflip.svg b/data/elementary/themes/img/svg/screen-vflip.svg
similarity index 100%
rename from data/elementary/themes/img/screen-vflip.svg
rename to data/elementary/themes/img/svg/screen-vflip.svg
diff --git a/data/elementary/themes/img/screen.svg b/data/elementary/themes/img/svg/screen.svg
similarity index 100%
rename from data/elementary/themes/img/screen.svg
rename to data/elementary/themes/img/svg/screen.svg
diff --git a/data/elementary/themes/img/search-edit.svg b/data/elementary/themes/img/svg/search-edit.svg
similarity index 100%
rename from data/elementary/themes/img/search-edit.svg
rename to data/elementary/themes/img/svg/search-edit.svg
diff --git a/data/elementary/themes/img/search.svg b/data/elementary/themes/img/svg/search.svg
similarity index 100%
rename from data/elementary/themes/img/search.svg
rename to data/elementary/themes/img/svg/search.svg
diff --git a/data/elementary/themes/img/select-all.svg b/data/elementary/themes/img/svg/select-all.svg
similarity index 100%
rename from data/elementary/themes/img/select-all.svg
rename to data/elementary/themes/img/svg/select-all.svg
diff --git a/data/elementary/themes/img/sendto.svg b/data/elementary/themes/img/svg/sendto.svg
similarity index 100%
rename from data/elementary/themes/img/sendto.svg
rename to data/elementary/themes/img/svg/sendto.svg
diff --git a/data/elementary/themes/img/server-group.svg b/data/elementary/themes/img/svg/server-group.svg
similarity index 100%
rename from data/elementary/themes/img/server-group.svg
rename to data/elementary/themes/img/svg/server-group.svg
diff --git a/data/elementary/themes/img/server.svg b/data/elementary/themes/img/svg/server.svg
similarity index 100%
rename from data/elementary/themes/img/server.svg
rename to data/elementary/themes/img/svg/server.svg
diff --git a/data/elementary/themes/img/shade.svg b/data/elementary/themes/img/svg/shade.svg
similarity index 100%
rename from data/elementary/themes/img/shade.svg
rename to data/elementary/themes/img/svg/shade.svg
diff --git a/data/elementary/themes/img/shelf-bc.svg b/data/elementary/themes/img/svg/shelf-bc.svg
similarity index 100%
rename from data/elementary/themes/img/shelf-bc.svg
rename to data/elementary/themes/img/svg/shelf-bc.svg
diff --git a/data/elementary/themes/img/shelf-bl.svg b/data/elementary/themes/img/svg/shelf-bl.svg
similarity index 100%
rename from data/elementary/themes/img/shelf-bl.svg
rename to data/elementary/themes/img/svg/shelf-bl.svg
diff --git a/data/elementary/themes/img/shelf-br.svg b/data/elementary/themes/img/svg/shelf-br.svg
similarity index 100%
rename from data/elementary/themes/img/shelf-br.svg
rename to data/elementary/themes/img/svg/shelf-br.svg
diff --git a/data/elementary/themes/img/shelf-lb.svg b/data/elementary/themes/img/svg/shelf-lb.svg
similarity index 100%
rename from data/elementary/themes/img/shelf-lb.svg
rename to data/elementary/themes/img/svg/shelf-lb.svg
diff --git a/data/elementary/themes/img/shelf-lc.svg b/data/elementary/themes/img/svg/shelf-lc.svg
similarity index 100%
rename from data/elementary/themes/img/shelf-lc.svg
rename to data/elementary/themes/img/svg/shelf-lc.svg
diff --git a/data/elementary/themes/img/shelf-lt.svg b/data/elementary/themes/img/svg/shelf-lt.svg
similarity index 100%
rename from data/elementary/themes/img/shelf-lt.svg
rename to data/elementary/themes/img/svg/shelf-lt.svg
diff --git a/data/elementary/themes/img/shelf-rb.svg b/data/elementary/themes/img/svg/shelf-rb.svg
similarity index 100%
rename from data/elementary/themes/img/shelf-rb.svg
rename to data/elementary/themes/img/svg/shelf-rb.svg
diff --git a/data/elementary/themes/img/shelf-rt.svg b/data/elementary/themes/img/svg/shelf-rt.svg
similarity index 100%
rename from data/elementary/themes/img/shelf-rt.svg
rename to data/elementary/themes/img/svg/shelf-rt.svg
diff --git a/data/elementary/themes/img/shelf-tc.svg b/data/elementary/themes/img/svg/shelf-tc.svg
similarity index 100%
rename from data/elementary/themes/img/shelf-tc.svg
rename to data/elementary/themes/img/svg/shelf-tc.svg
diff --git a/data/elementary/themes/img/shelf-tl.svg b/data/elementary/themes/img/svg/shelf-tl.svg
similarity index 100%
rename from data/elementary/themes/img/shelf-tl.svg
rename to data/elementary/themes/img/svg/shelf-tl.svg
diff --git a/data/elementary/themes/img/shelf-tr.svg b/data/elementary/themes/img/svg/shelf-tr.svg
similarity index 100%
rename from data/elementary/themes/img/shelf-tr.svg
rename to data/elementary/themes/img/svg/shelf-tr.svg
diff --git a/data/elementary/themes/img/shelf.svg b/data/elementary/themes/img/svg/shelf.svg
similarity index 100%
rename from data/elementary/themes/img/shelf.svg
rename to data/elementary/themes/img/svg/shelf.svg
diff --git a/data/elementary/themes/img/shield-empty.svg b/data/elementary/themes/img/svg/shield-empty.svg
similarity index 100%
rename from data/elementary/themes/img/shield-empty.svg
rename to data/elementary/themes/img/svg/shield-empty.svg
diff --git a/data/elementary/themes/img/shield-gold.svg b/data/elementary/themes/img/svg/shield-gold.svg
similarity index 100%
rename from data/elementary/themes/img/shield-gold.svg
rename to data/elementary/themes/img/svg/shield-gold.svg
diff --git a/data/elementary/themes/img/shield-silver.svg b/data/elementary/themes/img/svg/shield-silver.svg
similarity index 100%
rename from data/elementary/themes/img/shield-silver.svg
rename to data/elementary/themes/img/svg/shield-silver.svg
diff --git a/data/elementary/themes/img/shield-up.svg b/data/elementary/themes/img/svg/shield-up.svg
similarity index 100%
rename from data/elementary/themes/img/shield-up.svg
rename to data/elementary/themes/img/svg/shield-up.svg
diff --git a/data/elementary/themes/img/signal-binding.svg b/data/elementary/themes/img/svg/signal-binding.svg
similarity index 100%
rename from data/elementary/themes/img/signal-binding.svg
rename to data/elementary/themes/img/svg/signal-binding.svg
diff --git a/data/elementary/themes/img/skip-pager.svg b/data/elementary/themes/img/svg/skip-pager.svg
similarity index 100%
rename from data/elementary/themes/img/skip-pager.svg
rename to data/elementary/themes/img/svg/skip-pager.svg
diff --git a/data/elementary/themes/img/skip-taskbar.svg b/data/elementary/themes/img/svg/skip-taskbar.svg
similarity index 100%
rename from data/elementary/themes/img/skip-taskbar.svg
rename to data/elementary/themes/img/svg/skip-taskbar.svg
diff --git a/data/elementary/themes/img/skip-winlist.svg b/data/elementary/themes/img/svg/skip-winlist.svg
similarity index 100%
rename from data/elementary/themes/img/skip-winlist.svg
rename to data/elementary/themes/img/svg/skip-winlist.svg
diff --git a/data/elementary/themes/img/skip.svg b/data/elementary/themes/img/svg/skip.svg
similarity index 100%
rename from data/elementary/themes/img/skip.svg
rename to data/elementary/themes/img/svg/skip.svg
diff --git a/data/elementary/themes/img/sort.svg b/data/elementary/themes/img/svg/sort.svg
similarity index 100%
rename from data/elementary/themes/img/sort.svg
rename to data/elementary/themes/img/svg/sort.svg
diff --git a/data/elementary/themes/img/sound-card.svg b/data/elementary/themes/img/svg/sound-card.svg
similarity index 100%
rename from data/elementary/themes/img/sound-card.svg
rename to data/elementary/themes/img/svg/sound-card.svg
diff --git a/data/elementary/themes/img/sound.svg b/data/elementary/themes/img/svg/sound.svg
similarity index 100%
rename from data/elementary/themes/img/sound.svg
rename to data/elementary/themes/img/svg/sound.svg
diff --git a/data/elementary/themes/img/spanner.svg b/data/elementary/themes/img/svg/spanner.svg
similarity index 100%
rename from data/elementary/themes/img/spanner.svg
rename to data/elementary/themes/img/svg/spanner.svg
diff --git a/data/elementary/themes/img/speaker-volume-high.svg b/data/elementary/themes/img/svg/speaker-volume-high.svg
similarity index 100%
rename from data/elementary/themes/img/speaker-volume-high.svg
rename to data/elementary/themes/img/svg/speaker-volume-high.svg
diff --git a/data/elementary/themes/img/speaker-volume-low.svg b/data/elementary/themes/img/svg/speaker-volume-low.svg
similarity index 100%
rename from data/elementary/themes/img/speaker-volume-low.svg
rename to data/elementary/themes/img/svg/speaker-volume-low.svg
diff --git a/data/elementary/themes/img/speaker-volume-medium.svg b/data/elementary/themes/img/svg/speaker-volume-medium.svg
similarity index 100%
rename from data/elementary/themes/img/speaker-volume-medium.svg
rename to data/elementary/themes/img/svg/speaker-volume-medium.svg
diff --git a/data/elementary/themes/img/speaker-volume-mute.svg b/data/elementary/themes/img/svg/speaker-volume-mute.svg
similarity index 100%
rename from data/elementary/themes/img/speaker-volume-mute.svg
rename to data/elementary/themes/img/svg/speaker-volume-mute.svg
diff --git a/data/elementary/themes/img/speaker-volume.svg b/data/elementary/themes/img/svg/speaker-volume.svg
similarity index 100%
rename from data/elementary/themes/img/speaker-volume.svg
rename to data/elementary/themes/img/svg/speaker-volume.svg
diff --git a/data/elementary/themes/img/speaker.svg b/data/elementary/themes/img/svg/speaker.svg
similarity index 100%
rename from data/elementary/themes/img/speaker.svg
rename to data/elementary/themes/img/svg/speaker.svg
diff --git a/data/elementary/themes/img/spelling.svg b/data/elementary/themes/img/svg/spelling.svg
similarity index 100%
rename from data/elementary/themes/img/spelling.svg
rename to data/elementary/themes/img/svg/spelling.svg
diff --git a/data/elementary/themes/img/stacking-bottom.svg b/data/elementary/themes/img/svg/stacking-bottom.svg
similarity index 100%
rename from data/elementary/themes/img/stacking-bottom.svg
rename to data/elementary/themes/img/svg/stacking-bottom.svg
diff --git a/data/elementary/themes/img/stacking-normal.svg b/data/elementary/themes/img/svg/stacking-normal.svg
similarity index 100%
rename from data/elementary/themes/img/stacking-normal.svg
rename to data/elementary/themes/img/svg/stacking-normal.svg
diff --git a/data/elementary/themes/img/stacking-top.svg b/data/elementary/themes/img/svg/stacking-top.svg
similarity index 100%
rename from data/elementary/themes/img/stacking-top.svg
rename to data/elementary/themes/img/svg/stacking-top.svg
diff --git a/data/elementary/themes/img/stacking.svg b/data/elementary/themes/img/svg/stacking.svg
similarity index 100%
rename from data/elementary/themes/img/stacking.svg
rename to data/elementary/themes/img/svg/stacking.svg
diff --git a/data/elementary/themes/img/star-off.svg b/data/elementary/themes/img/svg/star-off.svg
similarity index 100%
rename from data/elementary/themes/img/star-off.svg
rename to data/elementary/themes/img/svg/star-off.svg
diff --git a/data/elementary/themes/img/star.svg b/data/elementary/themes/img/svg/star.svg
similarity index 100%
rename from data/elementary/themes/img/star.svg
rename to data/elementary/themes/img/svg/star.svg
diff --git a/data/elementary/themes/img/stick-man.svg b/data/elementary/themes/img/svg/stick-man.svg
similarity index 100%
rename from data/elementary/themes/img/stick-man.svg
rename to data/elementary/themes/img/svg/stick-man.svg
diff --git a/data/elementary/themes/img/sun.svg b/data/elementary/themes/img/svg/sun.svg
similarity index 100%
rename from data/elementary/themes/img/sun.svg
rename to data/elementary/themes/img/svg/sun.svg
diff --git a/data/elementary/themes/img/swap.svg b/data/elementary/themes/img/svg/swap.svg
similarity index 100%
rename from data/elementary/themes/img/swap.svg
rename to data/elementary/themes/img/svg/swap.svg
diff --git a/data/elementary/themes/img/symlink.svg b/data/elementary/themes/img/svg/symlink.svg
similarity index 100%
rename from data/elementary/themes/img/symlink.svg
rename to data/elementary/themes/img/svg/symlink.svg
diff --git a/data/elementary/themes/img/system-lock.svg b/data/elementary/themes/img/svg/system-lock.svg
similarity index 100%
rename from data/elementary/themes/img/system-lock.svg
rename to data/elementary/themes/img/svg/system-lock.svg
diff --git a/data/elementary/themes/img/system-logout.svg b/data/elementary/themes/img/svg/system-logout.svg
similarity index 100%
rename from data/elementary/themes/img/system-logout.svg
rename to data/elementary/themes/img/svg/system-logout.svg
diff --git a/data/elementary/themes/img/system-restart.svg b/data/elementary/themes/img/svg/system-restart.svg
similarity index 100%
rename from data/elementary/themes/img/system-restart.svg
rename to data/elementary/themes/img/svg/system-restart.svg
diff --git a/data/elementary/themes/img/system-run.svg b/data/elementary/themes/img/svg/system-run.svg
similarity index 100%
rename from data/elementary/themes/img/system-run.svg
rename to data/elementary/themes/img/svg/system-run.svg
diff --git a/data/elementary/themes/img/system-shutdown.svg b/data/elementary/themes/img/svg/system-shutdown.svg
similarity index 100%
rename from data/elementary/themes/img/system-shutdown.svg
rename to data/elementary/themes/img/svg/system-shutdown.svg
diff --git a/data/elementary/themes/img/system-suspend-hibernate.svg b/data/elementary/themes/img/svg/system-suspend-hibernate.svg
similarity index 100%
rename from data/elementary/themes/img/system-suspend-hibernate.svg
rename to data/elementary/themes/img/svg/system-suspend-hibernate.svg
diff --git a/data/elementary/themes/img/system-suspend.svg b/data/elementary/themes/img/svg/system-suspend.svg
similarity index 100%
rename from data/elementary/themes/img/system-suspend.svg
rename to data/elementary/themes/img/svg/system-suspend.svg
diff --git a/data/elementary/themes/img/system.svg b/data/elementary/themes/img/svg/system.svg
similarity index 100%
rename from data/elementary/themes/img/system.svg
rename to data/elementary/themes/img/svg/system.svg
diff --git a/data/elementary/themes/img/tablet.svg b/data/elementary/themes/img/svg/tablet.svg
similarity index 100%
rename from data/elementary/themes/img/tablet.svg
rename to data/elementary/themes/img/svg/tablet.svg
diff --git a/data/elementary/themes/img/tacho.svg b/data/elementary/themes/img/svg/tacho.svg
similarity index 100%
rename from data/elementary/themes/img/tacho.svg
rename to data/elementary/themes/img/svg/tacho.svg
diff --git a/data/elementary/themes/img/task-due.svg b/data/elementary/themes/img/svg/task-due.svg
similarity index 100%
rename from data/elementary/themes/img/task-due.svg
rename to data/elementary/themes/img/svg/task-due.svg
diff --git a/data/elementary/themes/img/task-past-due.svg b/data/elementary/themes/img/svg/task-past-due.svg
similarity index 100%
rename from data/elementary/themes/img/task-past-due.svg
rename to data/elementary/themes/img/svg/task-past-due.svg
diff --git a/data/elementary/themes/img/tech.svg b/data/elementary/themes/img/svg/tech.svg
similarity index 100%
rename from data/elementary/themes/img/tech.svg
rename to data/elementary/themes/img/svg/tech.svg
diff --git a/data/elementary/themes/img/termprompt.svg b/data/elementary/themes/img/svg/termprompt.svg
similarity index 100%
rename from data/elementary/themes/img/termprompt.svg
rename to data/elementary/themes/img/svg/termprompt.svg
diff --git a/data/elementary/themes/img/text-plus.svg b/data/elementary/themes/img/svg/text-plus.svg
similarity index 100%
rename from data/elementary/themes/img/text-plus.svg
rename to data/elementary/themes/img/svg/text-plus.svg
diff --git a/data/elementary/themes/img/toolbar.svg b/data/elementary/themes/img/svg/toolbar.svg
similarity index 100%
rename from data/elementary/themes/img/toolbar.svg
rename to data/elementary/themes/img/svg/toolbar.svg
diff --git a/data/elementary/themes/img/tools.svg b/data/elementary/themes/img/svg/tools.svg
similarity index 100%
rename from data/elementary/themes/img/tools.svg
rename to data/elementary/themes/img/svg/tools.svg
diff --git a/data/elementary/themes/img/tooltip_corner.svg b/data/elementary/themes/img/svg/tooltip_corner.svg
similarity index 100%
rename from data/elementary/themes/img/tooltip_corner.svg
rename to data/elementary/themes/img/svg/tooltip_corner.svg
diff --git a/data/elementary/themes/img/transition.svg b/data/elementary/themes/img/svg/transition.svg
similarity index 100%
rename from data/elementary/themes/img/transition.svg
rename to data/elementary/themes/img/svg/transition.svg
diff --git a/data/elementary/themes/img/trash.svg b/data/elementary/themes/img/svg/trash.svg
similarity index 100%
rename from data/elementary/themes/img/trash.svg
rename to data/elementary/themes/img/svg/trash.svg
diff --git a/data/elementary/themes/img/undo.svg b/data/elementary/themes/img/svg/undo.svg
similarity index 100%
rename from data/elementary/themes/img/undo.svg
rename to data/elementary/themes/img/svg/undo.svg
diff --git a/data/elementary/themes/img/unlock.svg b/data/elementary/themes/img/svg/unlock.svg
similarity index 100%
rename from data/elementary/themes/img/unlock.svg
rename to data/elementary/themes/img/svg/unlock.svg
diff --git a/data/elementary/themes/img/utilities.svg b/data/elementary/themes/img/svg/utilities.svg
similarity index 100%
rename from data/elementary/themes/img/utilities.svg
rename to data/elementary/themes/img/svg/utilities.svg
diff --git a/data/elementary/themes/img/video-camera.svg b/data/elementary/themes/img/svg/video-camera.svg
similarity index 100%
rename from data/elementary/themes/img/video-camera.svg
rename to data/elementary/themes/img/svg/video-camera.svg
diff --git a/data/elementary/themes/img/view-hidden-files.svg b/data/elementary/themes/img/svg/view-hidden-files.svg
similarity index 100%
rename from data/elementary/themes/img/view-hidden-files.svg
rename to data/elementary/themes/img/svg/view-hidden-files.svg
diff --git a/data/elementary/themes/img/view-reset.svg b/data/elementary/themes/img/svg/view-reset.svg
similarity index 100%
rename from data/elementary/themes/img/view-reset.svg
rename to data/elementary/themes/img/svg/view-reset.svg
diff --git a/data/elementary/themes/img/view-sort-ascending.svg b/data/elementary/themes/img/svg/view-sort-ascending.svg
similarity index 100%
rename from data/elementary/themes/img/view-sort-ascending.svg
rename to data/elementary/themes/img/svg/view-sort-ascending.svg
diff --git a/data/elementary/themes/img/view-sort-descending.svg b/data/elementary/themes/img/svg/view-sort-descending.svg
similarity index 100%
rename from data/elementary/themes/img/view-sort-descending.svg
rename to data/elementary/themes/img/svg/view-sort-descending.svg
diff --git a/data/elementary/themes/img/warn-sign-orange-red.svg b/data/elementary/themes/img/svg/warn-sign-orange-red.svg
similarity index 100%
rename from data/elementary/themes/img/warn-sign-orange-red.svg
rename to data/elementary/themes/img/svg/warn-sign-orange-red.svg
diff --git a/data/elementary/themes/img/warn-sign-orange.svg b/data/elementary/themes/img/svg/warn-sign-orange.svg
similarity index 100%
rename from data/elementary/themes/img/warn-sign-orange.svg
rename to data/elementary/themes/img/svg/warn-sign-orange.svg
diff --git a/data/elementary/themes/img/warn-sign-red.svg b/data/elementary/themes/img/svg/warn-sign-red.svg
similarity index 100%
rename from data/elementary/themes/img/warn-sign-red.svg
rename to data/elementary/themes/img/svg/warn-sign-red.svg
diff --git a/data/elementary/themes/img/warning-red.svg b/data/elementary/themes/img/svg/warning-red.svg
similarity index 100%
rename from data/elementary/themes/img/warning-red.svg
rename to data/elementary/themes/img/svg/warning-red.svg
diff --git a/data/elementary/themes/img/warning.svg b/data/elementary/themes/img/svg/warning.svg
similarity index 100%
rename from data/elementary/themes/img/warning.svg
rename to data/elementary/themes/img/svg/warning.svg
diff --git a/data/elementary/themes/img/webcam.svg b/data/elementary/themes/img/svg/webcam.svg
similarity index 100%
rename from data/elementary/themes/img/webcam.svg
rename to data/elementary/themes/img/svg/webcam.svg
diff --git a/data/elementary/themes/img/wifi.svg b/data/elementary/themes/img/svg/wifi.svg
similarity index 100%
rename from data/elementary/themes/img/wifi.svg
rename to data/elementary/themes/img/svg/wifi.svg
diff --git a/data/elementary/themes/img/win-nest.svg b/data/elementary/themes/img/svg/win-nest.svg
similarity index 100%
rename from data/elementary/themes/img/win-nest.svg
rename to data/elementary/themes/img/svg/win-nest.svg
diff --git a/data/elementary/themes/img/window-focus.svg b/data/elementary/themes/img/svg/window-focus.svg
similarity index 100%
rename from data/elementary/themes/img/window-focus.svg
rename to data/elementary/themes/img/svg/window-focus.svg
diff --git a/data/elementary/themes/img/window-geometry.svg b/data/elementary/themes/img/svg/window-geometry.svg
similarity index 100%
rename from data/elementary/themes/img/window-geometry.svg
rename to data/elementary/themes/img/svg/window-geometry.svg
diff --git a/data/elementary/themes/img/window-lost.svg b/data/elementary/themes/img/svg/window-lost.svg
similarity index 100%
rename from data/elementary/themes/img/window-lost.svg
rename to data/elementary/themes/img/svg/window-lost.svg
diff --git a/data/elementary/themes/img/window-maximize.svg b/data/elementary/themes/img/svg/window-maximize.svg
similarity index 100%
rename from data/elementary/themes/img/window-maximize.svg
rename to data/elementary/themes/img/svg/window-maximize.svg
diff --git a/data/elementary/themes/img/window-plus.svg b/data/elementary/themes/img/svg/window-plus.svg
similarity index 100%
rename from data/elementary/themes/img/window-plus.svg
rename to data/elementary/themes/img/svg/window-plus.svg
diff --git a/data/elementary/themes/img/window-process.svg b/data/elementary/themes/img/svg/window-process.svg
similarity index 100%
rename from data/elementary/themes/img/window-process.svg
rename to data/elementary/themes/img/svg/window-process.svg
diff --git a/data/elementary/themes/img/window-remember.svg b/data/elementary/themes/img/svg/window-remember.svg
similarity index 100%
rename from data/elementary/themes/img/window-remember.svg
rename to data/elementary/themes/img/svg/window-remember.svg
diff --git a/data/elementary/themes/img/window-stacking.svg b/data/elementary/themes/img/svg/window-stacking.svg
similarity index 100%
rename from data/elementary/themes/img/window-stacking.svg
rename to data/elementary/themes/img/svg/window-stacking.svg
diff --git a/data/elementary/themes/img/window-winlist.svg b/data/elementary/themes/img/svg/window-winlist.svg
similarity index 100%
rename from data/elementary/themes/img/window-winlist.svg
rename to data/elementary/themes/img/svg/window-winlist.svg
diff --git a/data/elementary/themes/img/window.svg b/data/elementary/themes/img/svg/window.svg
similarity index 100%
rename from data/elementary/themes/img/window.svg
rename to data/elementary/themes/img/svg/window.svg
diff --git a/data/elementary/themes/img/zip.svg b/data/elementary/themes/img/svg/zip.svg
similarity index 100%
rename from data/elementary/themes/img/zip.svg
rename to data/elementary/themes/img/svg/zip.svg
diff --git a/data/elementary/themes/img/zipdisk.svg b/data/elementary/themes/img/svg/zipdisk.svg
similarity index 100%
rename from data/elementary/themes/img/zipdisk.svg
rename to data/elementary/themes/img/svg/zipdisk.svg
diff --git a/data/elementary/themes/img/zoom-fill.svg b/data/elementary/themes/img/svg/zoom-fill.svg
similarity index 100%
rename from data/elementary/themes/img/zoom-fill.svg
rename to data/elementary/themes/img/svg/zoom-fill.svg
diff --git a/data/elementary/themes/img/zoom-fit-best.svg b/data/elementary/themes/img/svg/zoom-fit-best.svg
similarity index 100%
rename from data/elementary/themes/img/zoom-fit-best.svg
rename to data/elementary/themes/img/svg/zoom-fit-best.svg
diff --git a/data/elementary/themes/img/zoom-fit.svg b/data/elementary/themes/img/svg/zoom-fit.svg
similarity index 100%
rename from data/elementary/themes/img/zoom-fit.svg
rename to data/elementary/themes/img/svg/zoom-fit.svg
diff --git a/data/elementary/themes/img/zoom-in.svg b/data/elementary/themes/img/svg/zoom-in.svg
similarity index 100%
rename from data/elementary/themes/img/zoom-in.svg
rename to data/elementary/themes/img/svg/zoom-in.svg
diff --git a/data/elementary/themes/img/zoom-out.svg b/data/elementary/themes/img/svg/zoom-out.svg
similarity index 100%
rename from data/elementary/themes/img/zoom-out.svg
rename to data/elementary/themes/img/svg/zoom-out.svg
diff --git a/data/elementary/themes/img/zoom-reset.svg b/data/elementary/themes/img/svg/zoom-reset.svg
similarity index 100%
rename from data/elementary/themes/img/zoom-reset.svg
rename to data/elementary/themes/img/svg/zoom-reset.svg