diff --git a/icons/buses.png b/icons/buses.png
deleted file mode 100644
index 1794b34..0000000
Binary files a/icons/buses.png and /dev/null differ
diff --git a/icons/metros.png b/icons/metros.png
deleted file mode 100644
index 9ac8785..0000000
Binary files a/icons/metros.png and /dev/null differ
diff --git a/icons/rers.png b/icons/rers.png
deleted file mode 100644
index 1a5ba05..0000000
Binary files a/icons/rers.png and /dev/null differ
diff --git a/icons/sncf.png b/icons/sncf.png
deleted file mode 100644
index 54b6750..0000000
Binary files a/icons/sncf.png and /dev/null differ
diff --git a/icons/tramways.png b/icons/tramways.png
deleted file mode 100644
index 917cdf4..0000000
Binary files a/icons/tramways.png and /dev/null differ
diff --git a/icons/wi-alien.png b/icons/weather/wi-alien.png
similarity index 100%
rename from icons/wi-alien.png
rename to icons/weather/wi-alien.png
diff --git a/icons/wi-barometer.png b/icons/weather/wi-barometer.png
similarity index 100%
rename from icons/wi-barometer.png
rename to icons/weather/wi-barometer.png
diff --git a/icons/wi-celsius.png b/icons/weather/wi-celsius.png
similarity index 100%
rename from icons/wi-celsius.png
rename to icons/weather/wi-celsius.png
diff --git a/icons/wi-cloud-down.png b/icons/weather/wi-cloud-down.png
similarity index 100%
rename from icons/wi-cloud-down.png
rename to icons/weather/wi-cloud-down.png
diff --git a/icons/wi-cloud-refresh.png b/icons/weather/wi-cloud-refresh.png
similarity index 100%
rename from icons/wi-cloud-refresh.png
rename to icons/weather/wi-cloud-refresh.png
diff --git a/icons/wi-cloud-up.png b/icons/weather/wi-cloud-up.png
similarity index 100%
rename from icons/wi-cloud-up.png
rename to icons/weather/wi-cloud-up.png
diff --git a/icons/wi-cloud.png b/icons/weather/wi-cloud.png
similarity index 100%
rename from icons/wi-cloud.png
rename to icons/weather/wi-cloud.png
diff --git a/icons/wi-cloudy-gusts.png b/icons/weather/wi-cloudy-gusts.png
similarity index 100%
rename from icons/wi-cloudy-gusts.png
rename to icons/weather/wi-cloudy-gusts.png
diff --git a/icons/wi-cloudy-windy.png b/icons/weather/wi-cloudy-windy.png
similarity index 100%
rename from icons/wi-cloudy-windy.png
rename to icons/weather/wi-cloudy-windy.png
diff --git a/icons/wi-cloudy.png b/icons/weather/wi-cloudy.png
similarity index 100%
rename from icons/wi-cloudy.png
rename to icons/weather/wi-cloudy.png
diff --git a/icons/wi-day-cloudy-gusts.png b/icons/weather/wi-day-cloudy-gusts.png
similarity index 100%
rename from icons/wi-day-cloudy-gusts.png
rename to icons/weather/wi-day-cloudy-gusts.png
diff --git a/icons/wi-day-cloudy-high.png b/icons/weather/wi-day-cloudy-high.png
similarity index 100%
rename from icons/wi-day-cloudy-high.png
rename to icons/weather/wi-day-cloudy-high.png
diff --git a/icons/wi-day-cloudy-windy.png b/icons/weather/wi-day-cloudy-windy.png
similarity index 100%
rename from icons/wi-day-cloudy-windy.png
rename to icons/weather/wi-day-cloudy-windy.png
diff --git a/icons/wi-day-cloudy.png b/icons/weather/wi-day-cloudy.png
similarity index 100%
rename from icons/wi-day-cloudy.png
rename to icons/weather/wi-day-cloudy.png
diff --git a/icons/wi-day-fog.png b/icons/weather/wi-day-fog.png
similarity index 100%
rename from icons/wi-day-fog.png
rename to icons/weather/wi-day-fog.png
diff --git a/icons/wi-day-hail.png b/icons/weather/wi-day-hail.png
similarity index 100%
rename from icons/wi-day-hail.png
rename to icons/weather/wi-day-hail.png
diff --git a/icons/wi-day-haze.png b/icons/weather/wi-day-haze.png
similarity index 100%
rename from icons/wi-day-haze.png
rename to icons/weather/wi-day-haze.png
diff --git a/icons/wi-day-light-wind.png b/icons/weather/wi-day-light-wind.png
similarity index 100%
rename from icons/wi-day-light-wind.png
rename to icons/weather/wi-day-light-wind.png
diff --git a/icons/wi-day-lightning.png b/icons/weather/wi-day-lightning.png
similarity index 100%
rename from icons/wi-day-lightning.png
rename to icons/weather/wi-day-lightning.png
diff --git a/icons/wi-day-rain-mix.png b/icons/weather/wi-day-rain-mix.png
similarity index 100%
rename from icons/wi-day-rain-mix.png
rename to icons/weather/wi-day-rain-mix.png
diff --git a/icons/wi-day-rain-wind.png b/icons/weather/wi-day-rain-wind.png
similarity index 100%
rename from icons/wi-day-rain-wind.png
rename to icons/weather/wi-day-rain-wind.png
diff --git a/icons/wi-day-rain.png b/icons/weather/wi-day-rain.png
similarity index 100%
rename from icons/wi-day-rain.png
rename to icons/weather/wi-day-rain.png
diff --git a/icons/wi-day-showers.png b/icons/weather/wi-day-showers.png
similarity index 100%
rename from icons/wi-day-showers.png
rename to icons/weather/wi-day-showers.png
diff --git a/icons/wi-day-sleet-storm.png b/icons/weather/wi-day-sleet-storm.png
similarity index 100%
rename from icons/wi-day-sleet-storm.png
rename to icons/weather/wi-day-sleet-storm.png
diff --git a/icons/wi-day-sleet.png b/icons/weather/wi-day-sleet.png
similarity index 100%
rename from icons/wi-day-sleet.png
rename to icons/weather/wi-day-sleet.png
diff --git a/icons/wi-day-snow-thunderstorm.png b/icons/weather/wi-day-snow-thunderstorm.png
similarity index 100%
rename from icons/wi-day-snow-thunderstorm.png
rename to icons/weather/wi-day-snow-thunderstorm.png
diff --git a/icons/wi-day-snow-wind.png b/icons/weather/wi-day-snow-wind.png
similarity index 100%
rename from icons/wi-day-snow-wind.png
rename to icons/weather/wi-day-snow-wind.png
diff --git a/icons/wi-day-snow.png b/icons/weather/wi-day-snow.png
similarity index 100%
rename from icons/wi-day-snow.png
rename to icons/weather/wi-day-snow.png
diff --git a/icons/wi-day-sprinkle.png b/icons/weather/wi-day-sprinkle.png
similarity index 100%
rename from icons/wi-day-sprinkle.png
rename to icons/weather/wi-day-sprinkle.png
diff --git a/icons/wi-day-storm-showers.png b/icons/weather/wi-day-storm-showers.png
similarity index 100%
rename from icons/wi-day-storm-showers.png
rename to icons/weather/wi-day-storm-showers.png
diff --git a/icons/wi-day-sunny-overcast.png b/icons/weather/wi-day-sunny-overcast.png
similarity index 100%
rename from icons/wi-day-sunny-overcast.png
rename to icons/weather/wi-day-sunny-overcast.png
diff --git a/icons/wi-day-sunny.png b/icons/weather/wi-day-sunny.png
similarity index 100%
rename from icons/wi-day-sunny.png
rename to icons/weather/wi-day-sunny.png
diff --git a/icons/wi-day-thunderstorm.png b/icons/weather/wi-day-thunderstorm.png
similarity index 100%
rename from icons/wi-day-thunderstorm.png
rename to icons/weather/wi-day-thunderstorm.png
diff --git a/icons/wi-day-windy.png b/icons/weather/wi-day-windy.png
similarity index 100%
rename from icons/wi-day-windy.png
rename to icons/weather/wi-day-windy.png
diff --git a/icons/wi-degrees.png b/icons/weather/wi-degrees.png
similarity index 100%
rename from icons/wi-degrees.png
rename to icons/weather/wi-degrees.png
diff --git a/icons/wi-direction-down-left.png b/icons/weather/wi-direction-down-left.png
similarity index 100%
rename from icons/wi-direction-down-left.png
rename to icons/weather/wi-direction-down-left.png
diff --git a/icons/wi-direction-down-right.png b/icons/weather/wi-direction-down-right.png
similarity index 100%
rename from icons/wi-direction-down-right.png
rename to icons/weather/wi-direction-down-right.png
diff --git a/icons/wi-direction-down.png b/icons/weather/wi-direction-down.png
similarity index 100%
rename from icons/wi-direction-down.png
rename to icons/weather/wi-direction-down.png
diff --git a/icons/wi-direction-left.png b/icons/weather/wi-direction-left.png
similarity index 100%
rename from icons/wi-direction-left.png
rename to icons/weather/wi-direction-left.png
diff --git a/icons/wi-direction-right.png b/icons/weather/wi-direction-right.png
similarity index 100%
rename from icons/wi-direction-right.png
rename to icons/weather/wi-direction-right.png
diff --git a/icons/wi-direction-up-left.png b/icons/weather/wi-direction-up-left.png
similarity index 100%
rename from icons/wi-direction-up-left.png
rename to icons/weather/wi-direction-up-left.png
diff --git a/icons/wi-direction-up-right.png b/icons/weather/wi-direction-up-right.png
similarity index 100%
rename from icons/wi-direction-up-right.png
rename to icons/weather/wi-direction-up-right.png
diff --git a/icons/wi-direction-up.png b/icons/weather/wi-direction-up.png
similarity index 100%
rename from icons/wi-direction-up.png
rename to icons/weather/wi-direction-up.png
diff --git a/icons/wi-dust.png b/icons/weather/wi-dust.png
similarity index 100%
rename from icons/wi-dust.png
rename to icons/weather/wi-dust.png
diff --git a/icons/wi-earthquake.png b/icons/weather/wi-earthquake.png
similarity index 100%
rename from icons/wi-earthquake.png
rename to icons/weather/wi-earthquake.png
diff --git a/icons/wi-fahrenheit.png b/icons/weather/wi-fahrenheit.png
similarity index 100%
rename from icons/wi-fahrenheit.png
rename to icons/weather/wi-fahrenheit.png
diff --git a/icons/wi-fire.png b/icons/weather/wi-fire.png
similarity index 100%
rename from icons/wi-fire.png
rename to icons/weather/wi-fire.png
diff --git a/icons/wi-flood.png b/icons/weather/wi-flood.png
similarity index 100%
rename from icons/wi-flood.png
rename to icons/weather/wi-flood.png
diff --git a/icons/wi-fog.png b/icons/weather/wi-fog.png
similarity index 100%
rename from icons/wi-fog.png
rename to icons/weather/wi-fog.png
diff --git a/icons/wi-gale-warning.png b/icons/weather/wi-gale-warning.png
similarity index 100%
rename from icons/wi-gale-warning.png
rename to icons/weather/wi-gale-warning.png
diff --git a/icons/wi-hail.png b/icons/weather/wi-hail.png
similarity index 100%
rename from icons/wi-hail.png
rename to icons/weather/wi-hail.png
diff --git a/icons/wi-horizon-alt.png b/icons/weather/wi-horizon-alt.png
similarity index 100%
rename from icons/wi-horizon-alt.png
rename to icons/weather/wi-horizon-alt.png
diff --git a/icons/wi-horizon.png b/icons/weather/wi-horizon.png
similarity index 100%
rename from icons/wi-horizon.png
rename to icons/weather/wi-horizon.png
diff --git a/icons/wi-hot.png b/icons/weather/wi-hot.png
similarity index 100%
rename from icons/wi-hot.png
rename to icons/weather/wi-hot.png
diff --git a/icons/wi-humidity.png b/icons/weather/wi-humidity.png
similarity index 100%
rename from icons/wi-humidity.png
rename to icons/weather/wi-humidity.png
diff --git a/icons/wi-hurricane-warning.png b/icons/weather/wi-hurricane-warning.png
similarity index 100%
rename from icons/wi-hurricane-warning.png
rename to icons/weather/wi-hurricane-warning.png
diff --git a/icons/wi-hurricane.png b/icons/weather/wi-hurricane.png
similarity index 100%
rename from icons/wi-hurricane.png
rename to icons/weather/wi-hurricane.png
diff --git a/icons/wi-lightning.png b/icons/weather/wi-lightning.png
similarity index 100%
rename from icons/wi-lightning.png
rename to icons/weather/wi-lightning.png
diff --git a/icons/wi-lunar-eclipse.png b/icons/weather/wi-lunar-eclipse.png
similarity index 100%
rename from icons/wi-lunar-eclipse.png
rename to icons/weather/wi-lunar-eclipse.png
diff --git a/icons/wi-meteor.png b/icons/weather/wi-meteor.png
similarity index 100%
rename from icons/wi-meteor.png
rename to icons/weather/wi-meteor.png
diff --git a/icons/wi-moon-alt-first-quarter.png b/icons/weather/wi-moon-alt-first-quarter.png
similarity index 100%
rename from icons/wi-moon-alt-first-quarter.png
rename to icons/weather/wi-moon-alt-first-quarter.png
diff --git a/icons/wi-moon-alt-full.png b/icons/weather/wi-moon-alt-full.png
similarity index 100%
rename from icons/wi-moon-alt-full.png
rename to icons/weather/wi-moon-alt-full.png
diff --git a/icons/wi-moon-alt-new.png b/icons/weather/wi-moon-alt-new.png
similarity index 100%
rename from icons/wi-moon-alt-new.png
rename to icons/weather/wi-moon-alt-new.png
diff --git a/icons/wi-moon-alt-third-quarter.png b/icons/weather/wi-moon-alt-third-quarter.png
similarity index 100%
rename from icons/wi-moon-alt-third-quarter.png
rename to icons/weather/wi-moon-alt-third-quarter.png
diff --git a/icons/wi-moon-alt-waning-crescent-1.png b/icons/weather/wi-moon-alt-waning-crescent-1.png
similarity index 100%
rename from icons/wi-moon-alt-waning-crescent-1.png
rename to icons/weather/wi-moon-alt-waning-crescent-1.png
diff --git a/icons/wi-moon-alt-waning-crescent-2.png b/icons/weather/wi-moon-alt-waning-crescent-2.png
similarity index 100%
rename from icons/wi-moon-alt-waning-crescent-2.png
rename to icons/weather/wi-moon-alt-waning-crescent-2.png
diff --git a/icons/wi-moon-alt-waning-crescent-3.png b/icons/weather/wi-moon-alt-waning-crescent-3.png
similarity index 100%
rename from icons/wi-moon-alt-waning-crescent-3.png
rename to icons/weather/wi-moon-alt-waning-crescent-3.png
diff --git a/icons/wi-moon-alt-waning-crescent-4.png b/icons/weather/wi-moon-alt-waning-crescent-4.png
similarity index 100%
rename from icons/wi-moon-alt-waning-crescent-4.png
rename to icons/weather/wi-moon-alt-waning-crescent-4.png
diff --git a/icons/wi-moon-alt-waning-crescent-5.png b/icons/weather/wi-moon-alt-waning-crescent-5.png
similarity index 100%
rename from icons/wi-moon-alt-waning-crescent-5.png
rename to icons/weather/wi-moon-alt-waning-crescent-5.png
diff --git a/icons/wi-moon-alt-waning-crescent-6.png b/icons/weather/wi-moon-alt-waning-crescent-6.png
similarity index 100%
rename from icons/wi-moon-alt-waning-crescent-6.png
rename to icons/weather/wi-moon-alt-waning-crescent-6.png
diff --git a/icons/wi-moon-alt-waning-gibbous-1.png b/icons/weather/wi-moon-alt-waning-gibbous-1.png
similarity index 100%
rename from icons/wi-moon-alt-waning-gibbous-1.png
rename to icons/weather/wi-moon-alt-waning-gibbous-1.png
diff --git a/icons/wi-moon-alt-waning-gibbous-2.png b/icons/weather/wi-moon-alt-waning-gibbous-2.png
similarity index 100%
rename from icons/wi-moon-alt-waning-gibbous-2.png
rename to icons/weather/wi-moon-alt-waning-gibbous-2.png
diff --git a/icons/wi-moon-alt-waning-gibbous-3.png b/icons/weather/wi-moon-alt-waning-gibbous-3.png
similarity index 100%
rename from icons/wi-moon-alt-waning-gibbous-3.png
rename to icons/weather/wi-moon-alt-waning-gibbous-3.png
diff --git a/icons/wi-moon-alt-waning-gibbous-4.png b/icons/weather/wi-moon-alt-waning-gibbous-4.png
similarity index 100%
rename from icons/wi-moon-alt-waning-gibbous-4.png
rename to icons/weather/wi-moon-alt-waning-gibbous-4.png
diff --git a/icons/wi-moon-alt-waning-gibbous-5.png b/icons/weather/wi-moon-alt-waning-gibbous-5.png
similarity index 100%
rename from icons/wi-moon-alt-waning-gibbous-5.png
rename to icons/weather/wi-moon-alt-waning-gibbous-5.png
diff --git a/icons/wi-moon-alt-waning-gibbous-6.png b/icons/weather/wi-moon-alt-waning-gibbous-6.png
similarity index 100%
rename from icons/wi-moon-alt-waning-gibbous-6.png
rename to icons/weather/wi-moon-alt-waning-gibbous-6.png
diff --git a/icons/wi-moon-alt-waxing-crescent-1.png b/icons/weather/wi-moon-alt-waxing-crescent-1.png
similarity index 100%
rename from icons/wi-moon-alt-waxing-crescent-1.png
rename to icons/weather/wi-moon-alt-waxing-crescent-1.png
diff --git a/icons/wi-moon-alt-waxing-crescent-2.png b/icons/weather/wi-moon-alt-waxing-crescent-2.png
similarity index 100%
rename from icons/wi-moon-alt-waxing-crescent-2.png
rename to icons/weather/wi-moon-alt-waxing-crescent-2.png
diff --git a/icons/wi-moon-alt-waxing-crescent-3.png b/icons/weather/wi-moon-alt-waxing-crescent-3.png
similarity index 100%
rename from icons/wi-moon-alt-waxing-crescent-3.png
rename to icons/weather/wi-moon-alt-waxing-crescent-3.png
diff --git a/icons/wi-moon-alt-waxing-crescent-4.png b/icons/weather/wi-moon-alt-waxing-crescent-4.png
similarity index 100%
rename from icons/wi-moon-alt-waxing-crescent-4.png
rename to icons/weather/wi-moon-alt-waxing-crescent-4.png
diff --git a/icons/wi-moon-alt-waxing-crescent-5.png b/icons/weather/wi-moon-alt-waxing-crescent-5.png
similarity index 100%
rename from icons/wi-moon-alt-waxing-crescent-5.png
rename to icons/weather/wi-moon-alt-waxing-crescent-5.png
diff --git a/icons/wi-moon-alt-waxing-crescent-6.png b/icons/weather/wi-moon-alt-waxing-crescent-6.png
similarity index 100%
rename from icons/wi-moon-alt-waxing-crescent-6.png
rename to icons/weather/wi-moon-alt-waxing-crescent-6.png
diff --git a/icons/wi-moon-alt-waxing-gibbous-1.png b/icons/weather/wi-moon-alt-waxing-gibbous-1.png
similarity index 100%
rename from icons/wi-moon-alt-waxing-gibbous-1.png
rename to icons/weather/wi-moon-alt-waxing-gibbous-1.png
diff --git a/icons/wi-moon-alt-waxing-gibbous-2.png b/icons/weather/wi-moon-alt-waxing-gibbous-2.png
similarity index 100%
rename from icons/wi-moon-alt-waxing-gibbous-2.png
rename to icons/weather/wi-moon-alt-waxing-gibbous-2.png
diff --git a/icons/wi-moon-alt-waxing-gibbous-3.png b/icons/weather/wi-moon-alt-waxing-gibbous-3.png
similarity index 100%
rename from icons/wi-moon-alt-waxing-gibbous-3.png
rename to icons/weather/wi-moon-alt-waxing-gibbous-3.png
diff --git a/icons/wi-moon-alt-waxing-gibbous-4.png b/icons/weather/wi-moon-alt-waxing-gibbous-4.png
similarity index 100%
rename from icons/wi-moon-alt-waxing-gibbous-4.png
rename to icons/weather/wi-moon-alt-waxing-gibbous-4.png
diff --git a/icons/wi-moon-alt-waxing-gibbous-5.png b/icons/weather/wi-moon-alt-waxing-gibbous-5.png
similarity index 100%
rename from icons/wi-moon-alt-waxing-gibbous-5.png
rename to icons/weather/wi-moon-alt-waxing-gibbous-5.png
diff --git a/icons/wi-moon-alt-waxing-gibbous-6.png b/icons/weather/wi-moon-alt-waxing-gibbous-6.png
similarity index 100%
rename from icons/wi-moon-alt-waxing-gibbous-6.png
rename to icons/weather/wi-moon-alt-waxing-gibbous-6.png
diff --git a/icons/wi-moon-first-quarter.png b/icons/weather/wi-moon-first-quarter.png
similarity index 100%
rename from icons/wi-moon-first-quarter.png
rename to icons/weather/wi-moon-first-quarter.png
diff --git a/icons/wi-moon-full.png b/icons/weather/wi-moon-full.png
similarity index 100%
rename from icons/wi-moon-full.png
rename to icons/weather/wi-moon-full.png
diff --git a/icons/wi-moon-new.png b/icons/weather/wi-moon-new.png
similarity index 100%
rename from icons/wi-moon-new.png
rename to icons/weather/wi-moon-new.png
diff --git a/icons/wi-moon-third-quarter.png b/icons/weather/wi-moon-third-quarter.png
similarity index 100%
rename from icons/wi-moon-third-quarter.png
rename to icons/weather/wi-moon-third-quarter.png
diff --git a/icons/wi-moon-waning-crescent-1.png b/icons/weather/wi-moon-waning-crescent-1.png
similarity index 100%
rename from icons/wi-moon-waning-crescent-1.png
rename to icons/weather/wi-moon-waning-crescent-1.png
diff --git a/icons/wi-moon-waning-crescent-2.png b/icons/weather/wi-moon-waning-crescent-2.png
similarity index 100%
rename from icons/wi-moon-waning-crescent-2.png
rename to icons/weather/wi-moon-waning-crescent-2.png
diff --git a/icons/wi-moon-waning-crescent-3.png b/icons/weather/wi-moon-waning-crescent-3.png
similarity index 100%
rename from icons/wi-moon-waning-crescent-3.png
rename to icons/weather/wi-moon-waning-crescent-3.png
diff --git a/icons/wi-moon-waning-crescent-4.png b/icons/weather/wi-moon-waning-crescent-4.png
similarity index 100%
rename from icons/wi-moon-waning-crescent-4.png
rename to icons/weather/wi-moon-waning-crescent-4.png
diff --git a/icons/wi-moon-waning-crescent-5.png b/icons/weather/wi-moon-waning-crescent-5.png
similarity index 100%
rename from icons/wi-moon-waning-crescent-5.png
rename to icons/weather/wi-moon-waning-crescent-5.png
diff --git a/icons/wi-moon-waning-crescent-6.png b/icons/weather/wi-moon-waning-crescent-6.png
similarity index 100%
rename from icons/wi-moon-waning-crescent-6.png
rename to icons/weather/wi-moon-waning-crescent-6.png
diff --git a/icons/wi-moon-waning-gibbous-1.png b/icons/weather/wi-moon-waning-gibbous-1.png
similarity index 100%
rename from icons/wi-moon-waning-gibbous-1.png
rename to icons/weather/wi-moon-waning-gibbous-1.png
diff --git a/icons/wi-moon-waning-gibbous-2.png b/icons/weather/wi-moon-waning-gibbous-2.png
similarity index 100%
rename from icons/wi-moon-waning-gibbous-2.png
rename to icons/weather/wi-moon-waning-gibbous-2.png
diff --git a/icons/wi-moon-waning-gibbous-3.png b/icons/weather/wi-moon-waning-gibbous-3.png
similarity index 100%
rename from icons/wi-moon-waning-gibbous-3.png
rename to icons/weather/wi-moon-waning-gibbous-3.png
diff --git a/icons/wi-moon-waning-gibbous-4.png b/icons/weather/wi-moon-waning-gibbous-4.png
similarity index 100%
rename from icons/wi-moon-waning-gibbous-4.png
rename to icons/weather/wi-moon-waning-gibbous-4.png
diff --git a/icons/wi-moon-waning-gibbous-5.png b/icons/weather/wi-moon-waning-gibbous-5.png
similarity index 100%
rename from icons/wi-moon-waning-gibbous-5.png
rename to icons/weather/wi-moon-waning-gibbous-5.png
diff --git a/icons/wi-moon-waning-gibbous-6.png b/icons/weather/wi-moon-waning-gibbous-6.png
similarity index 100%
rename from icons/wi-moon-waning-gibbous-6.png
rename to icons/weather/wi-moon-waning-gibbous-6.png
diff --git a/icons/wi-moon-waxing-6.png b/icons/weather/wi-moon-waxing-6.png
similarity index 100%
rename from icons/wi-moon-waxing-6.png
rename to icons/weather/wi-moon-waxing-6.png
diff --git a/icons/wi-moon-waxing-crescent-1.png b/icons/weather/wi-moon-waxing-crescent-1.png
similarity index 100%
rename from icons/wi-moon-waxing-crescent-1.png
rename to icons/weather/wi-moon-waxing-crescent-1.png
diff --git a/icons/wi-moon-waxing-crescent-2.png b/icons/weather/wi-moon-waxing-crescent-2.png
similarity index 100%
rename from icons/wi-moon-waxing-crescent-2.png
rename to icons/weather/wi-moon-waxing-crescent-2.png
diff --git a/icons/wi-moon-waxing-crescent-3.png b/icons/weather/wi-moon-waxing-crescent-3.png
similarity index 100%
rename from icons/wi-moon-waxing-crescent-3.png
rename to icons/weather/wi-moon-waxing-crescent-3.png
diff --git a/icons/wi-moon-waxing-crescent-4.png b/icons/weather/wi-moon-waxing-crescent-4.png
similarity index 100%
rename from icons/wi-moon-waxing-crescent-4.png
rename to icons/weather/wi-moon-waxing-crescent-4.png
diff --git a/icons/wi-moon-waxing-crescent-5.png b/icons/weather/wi-moon-waxing-crescent-5.png
similarity index 100%
rename from icons/wi-moon-waxing-crescent-5.png
rename to icons/weather/wi-moon-waxing-crescent-5.png
diff --git a/icons/wi-moon-waxing-gibbous-1.png b/icons/weather/wi-moon-waxing-gibbous-1.png
similarity index 100%
rename from icons/wi-moon-waxing-gibbous-1.png
rename to icons/weather/wi-moon-waxing-gibbous-1.png
diff --git a/icons/wi-moon-waxing-gibbous-2.png b/icons/weather/wi-moon-waxing-gibbous-2.png
similarity index 100%
rename from icons/wi-moon-waxing-gibbous-2.png
rename to icons/weather/wi-moon-waxing-gibbous-2.png
diff --git a/icons/wi-moon-waxing-gibbous-3.png b/icons/weather/wi-moon-waxing-gibbous-3.png
similarity index 100%
rename from icons/wi-moon-waxing-gibbous-3.png
rename to icons/weather/wi-moon-waxing-gibbous-3.png
diff --git a/icons/wi-moon-waxing-gibbous-4.png b/icons/weather/wi-moon-waxing-gibbous-4.png
similarity index 100%
rename from icons/wi-moon-waxing-gibbous-4.png
rename to icons/weather/wi-moon-waxing-gibbous-4.png
diff --git a/icons/wi-moon-waxing-gibbous-5.png b/icons/weather/wi-moon-waxing-gibbous-5.png
similarity index 100%
rename from icons/wi-moon-waxing-gibbous-5.png
rename to icons/weather/wi-moon-waxing-gibbous-5.png
diff --git a/icons/wi-moon-waxing-gibbous-6.png b/icons/weather/wi-moon-waxing-gibbous-6.png
similarity index 100%
rename from icons/wi-moon-waxing-gibbous-6.png
rename to icons/weather/wi-moon-waxing-gibbous-6.png
diff --git a/icons/wi-moonrise.png b/icons/weather/wi-moonrise.png
similarity index 100%
rename from icons/wi-moonrise.png
rename to icons/weather/wi-moonrise.png
diff --git a/icons/wi-moonset.png b/icons/weather/wi-moonset.png
similarity index 100%
rename from icons/wi-moonset.png
rename to icons/weather/wi-moonset.png
diff --git a/icons/wi-na.png b/icons/weather/wi-na.png
similarity index 100%
rename from icons/wi-na.png
rename to icons/weather/wi-na.png
diff --git a/icons/wi-night-alt-cloudy-gusts.png b/icons/weather/wi-night-alt-cloudy-gusts.png
similarity index 100%
rename from icons/wi-night-alt-cloudy-gusts.png
rename to icons/weather/wi-night-alt-cloudy-gusts.png
diff --git a/icons/wi-night-alt-cloudy-high.png b/icons/weather/wi-night-alt-cloudy-high.png
similarity index 100%
rename from icons/wi-night-alt-cloudy-high.png
rename to icons/weather/wi-night-alt-cloudy-high.png
diff --git a/icons/wi-night-alt-cloudy-windy.png b/icons/weather/wi-night-alt-cloudy-windy.png
similarity index 100%
rename from icons/wi-night-alt-cloudy-windy.png
rename to icons/weather/wi-night-alt-cloudy-windy.png
diff --git a/icons/wi-night-alt-cloudy.png b/icons/weather/wi-night-alt-cloudy.png
similarity index 100%
rename from icons/wi-night-alt-cloudy.png
rename to icons/weather/wi-night-alt-cloudy.png
diff --git a/icons/wi-night-alt-hail.png b/icons/weather/wi-night-alt-hail.png
similarity index 100%
rename from icons/wi-night-alt-hail.png
rename to icons/weather/wi-night-alt-hail.png
diff --git a/icons/wi-night-alt-lightning.png b/icons/weather/wi-night-alt-lightning.png
similarity index 100%
rename from icons/wi-night-alt-lightning.png
rename to icons/weather/wi-night-alt-lightning.png
diff --git a/icons/wi-night-alt-partly-cloudy.png b/icons/weather/wi-night-alt-partly-cloudy.png
similarity index 100%
rename from icons/wi-night-alt-partly-cloudy.png
rename to icons/weather/wi-night-alt-partly-cloudy.png
diff --git a/icons/wi-night-alt-rain-mix.png b/icons/weather/wi-night-alt-rain-mix.png
similarity index 100%
rename from icons/wi-night-alt-rain-mix.png
rename to icons/weather/wi-night-alt-rain-mix.png
diff --git a/icons/wi-night-alt-rain-wind.png b/icons/weather/wi-night-alt-rain-wind.png
similarity index 100%
rename from icons/wi-night-alt-rain-wind.png
rename to icons/weather/wi-night-alt-rain-wind.png
diff --git a/icons/wi-night-alt-rain.png b/icons/weather/wi-night-alt-rain.png
similarity index 100%
rename from icons/wi-night-alt-rain.png
rename to icons/weather/wi-night-alt-rain.png
diff --git a/icons/wi-night-alt-showers.png b/icons/weather/wi-night-alt-showers.png
similarity index 100%
rename from icons/wi-night-alt-showers.png
rename to icons/weather/wi-night-alt-showers.png
diff --git a/icons/wi-night-alt-sleet-storm.png b/icons/weather/wi-night-alt-sleet-storm.png
similarity index 100%
rename from icons/wi-night-alt-sleet-storm.png
rename to icons/weather/wi-night-alt-sleet-storm.png
diff --git a/icons/wi-night-alt-sleet.png b/icons/weather/wi-night-alt-sleet.png
similarity index 100%
rename from icons/wi-night-alt-sleet.png
rename to icons/weather/wi-night-alt-sleet.png
diff --git a/icons/wi-night-alt-snow-thunderstorm.png b/icons/weather/wi-night-alt-snow-thunderstorm.png
similarity index 100%
rename from icons/wi-night-alt-snow-thunderstorm.png
rename to icons/weather/wi-night-alt-snow-thunderstorm.png
diff --git a/icons/wi-night-alt-snow-wind.png b/icons/weather/wi-night-alt-snow-wind.png
similarity index 100%
rename from icons/wi-night-alt-snow-wind.png
rename to icons/weather/wi-night-alt-snow-wind.png
diff --git a/icons/wi-night-alt-snow.png b/icons/weather/wi-night-alt-snow.png
similarity index 100%
rename from icons/wi-night-alt-snow.png
rename to icons/weather/wi-night-alt-snow.png
diff --git a/icons/wi-night-alt-sprinkle.png b/icons/weather/wi-night-alt-sprinkle.png
similarity index 100%
rename from icons/wi-night-alt-sprinkle.png
rename to icons/weather/wi-night-alt-sprinkle.png
diff --git a/icons/wi-night-alt-storm-showers.png b/icons/weather/wi-night-alt-storm-showers.png
similarity index 100%
rename from icons/wi-night-alt-storm-showers.png
rename to icons/weather/wi-night-alt-storm-showers.png
diff --git a/icons/wi-night-alt-thunderstorm.png b/icons/weather/wi-night-alt-thunderstorm.png
similarity index 100%
rename from icons/wi-night-alt-thunderstorm.png
rename to icons/weather/wi-night-alt-thunderstorm.png
diff --git a/icons/wi-night-clear.png b/icons/weather/wi-night-clear.png
similarity index 100%
rename from icons/wi-night-clear.png
rename to icons/weather/wi-night-clear.png
diff --git a/icons/wi-night-cloudy-gusts.png b/icons/weather/wi-night-cloudy-gusts.png
similarity index 100%
rename from icons/wi-night-cloudy-gusts.png
rename to icons/weather/wi-night-cloudy-gusts.png
diff --git a/icons/wi-night-cloudy-high.png b/icons/weather/wi-night-cloudy-high.png
similarity index 100%
rename from icons/wi-night-cloudy-high.png
rename to icons/weather/wi-night-cloudy-high.png
diff --git a/icons/wi-night-cloudy-windy.png b/icons/weather/wi-night-cloudy-windy.png
similarity index 100%
rename from icons/wi-night-cloudy-windy.png
rename to icons/weather/wi-night-cloudy-windy.png
diff --git a/icons/wi-night-cloudy.png b/icons/weather/wi-night-cloudy.png
similarity index 100%
rename from icons/wi-night-cloudy.png
rename to icons/weather/wi-night-cloudy.png
diff --git a/icons/wi-night-fog.png b/icons/weather/wi-night-fog.png
similarity index 100%
rename from icons/wi-night-fog.png
rename to icons/weather/wi-night-fog.png
diff --git a/icons/wi-night-hail.png b/icons/weather/wi-night-hail.png
similarity index 100%
rename from icons/wi-night-hail.png
rename to icons/weather/wi-night-hail.png
diff --git a/icons/wi-night-lightning.png b/icons/weather/wi-night-lightning.png
similarity index 100%
rename from icons/wi-night-lightning.png
rename to icons/weather/wi-night-lightning.png
diff --git a/icons/wi-night-partly-cloudy.png b/icons/weather/wi-night-partly-cloudy.png
similarity index 100%
rename from icons/wi-night-partly-cloudy.png
rename to icons/weather/wi-night-partly-cloudy.png
diff --git a/icons/wi-night-rain-mix.png b/icons/weather/wi-night-rain-mix.png
similarity index 100%
rename from icons/wi-night-rain-mix.png
rename to icons/weather/wi-night-rain-mix.png
diff --git a/icons/wi-night-rain-wind.png b/icons/weather/wi-night-rain-wind.png
similarity index 100%
rename from icons/wi-night-rain-wind.png
rename to icons/weather/wi-night-rain-wind.png
diff --git a/icons/wi-night-rain.png b/icons/weather/wi-night-rain.png
similarity index 100%
rename from icons/wi-night-rain.png
rename to icons/weather/wi-night-rain.png
diff --git a/icons/wi-night-showers.png b/icons/weather/wi-night-showers.png
similarity index 100%
rename from icons/wi-night-showers.png
rename to icons/weather/wi-night-showers.png
diff --git a/icons/wi-night-sleet-storm.png b/icons/weather/wi-night-sleet-storm.png
similarity index 100%
rename from icons/wi-night-sleet-storm.png
rename to icons/weather/wi-night-sleet-storm.png
diff --git a/icons/wi-night-sleet.png b/icons/weather/wi-night-sleet.png
similarity index 100%
rename from icons/wi-night-sleet.png
rename to icons/weather/wi-night-sleet.png
diff --git a/icons/wi-night-snow-thunderstorm.png b/icons/weather/wi-night-snow-thunderstorm.png
similarity index 100%
rename from icons/wi-night-snow-thunderstorm.png
rename to icons/weather/wi-night-snow-thunderstorm.png
diff --git a/icons/wi-night-snow-wind.png b/icons/weather/wi-night-snow-wind.png
similarity index 100%
rename from icons/wi-night-snow-wind.png
rename to icons/weather/wi-night-snow-wind.png
diff --git a/icons/wi-night-snow.png b/icons/weather/wi-night-snow.png
similarity index 100%
rename from icons/wi-night-snow.png
rename to icons/weather/wi-night-snow.png
diff --git a/icons/wi-night-sprinkle.png b/icons/weather/wi-night-sprinkle.png
similarity index 100%
rename from icons/wi-night-sprinkle.png
rename to icons/weather/wi-night-sprinkle.png
diff --git a/icons/wi-night-storm-showers.png b/icons/weather/wi-night-storm-showers.png
similarity index 100%
rename from icons/wi-night-storm-showers.png
rename to icons/weather/wi-night-storm-showers.png
diff --git a/icons/wi-night-thunderstorm.png b/icons/weather/wi-night-thunderstorm.png
similarity index 100%
rename from icons/wi-night-thunderstorm.png
rename to icons/weather/wi-night-thunderstorm.png
diff --git a/icons/wi-rain-mix.png b/icons/weather/wi-rain-mix.png
similarity index 100%
rename from icons/wi-rain-mix.png
rename to icons/weather/wi-rain-mix.png
diff --git a/icons/wi-rain-wind.png b/icons/weather/wi-rain-wind.png
similarity index 100%
rename from icons/wi-rain-wind.png
rename to icons/weather/wi-rain-wind.png
diff --git a/icons/wi-rain.png b/icons/weather/wi-rain.png
similarity index 100%
rename from icons/wi-rain.png
rename to icons/weather/wi-rain.png
diff --git a/icons/wi-raindrop.png b/icons/weather/wi-raindrop.png
similarity index 100%
rename from icons/wi-raindrop.png
rename to icons/weather/wi-raindrop.png
diff --git a/icons/wi-raindrops.png b/icons/weather/wi-raindrops.png
similarity index 100%
rename from icons/wi-raindrops.png
rename to icons/weather/wi-raindrops.png
diff --git a/icons/wi-refresh-alt.png b/icons/weather/wi-refresh-alt.png
similarity index 100%
rename from icons/wi-refresh-alt.png
rename to icons/weather/wi-refresh-alt.png
diff --git a/icons/wi-refresh.png b/icons/weather/wi-refresh.png
similarity index 100%
rename from icons/wi-refresh.png
rename to icons/weather/wi-refresh.png
diff --git a/icons/wi-sandstorm.png b/icons/weather/wi-sandstorm.png
similarity index 100%
rename from icons/wi-sandstorm.png
rename to icons/weather/wi-sandstorm.png
diff --git a/icons/wi-showers.png b/icons/weather/wi-showers.png
similarity index 100%
rename from icons/wi-showers.png
rename to icons/weather/wi-showers.png
diff --git a/icons/wi-sleet.png b/icons/weather/wi-sleet.png
similarity index 100%
rename from icons/wi-sleet.png
rename to icons/weather/wi-sleet.png
diff --git a/icons/wi-small-craft-advisory.png b/icons/weather/wi-small-craft-advisory.png
similarity index 100%
rename from icons/wi-small-craft-advisory.png
rename to icons/weather/wi-small-craft-advisory.png
diff --git a/icons/wi-smog.png b/icons/weather/wi-smog.png
similarity index 100%
rename from icons/wi-smog.png
rename to icons/weather/wi-smog.png
diff --git a/icons/wi-smoke.png b/icons/weather/wi-smoke.png
similarity index 100%
rename from icons/wi-smoke.png
rename to icons/weather/wi-smoke.png
diff --git a/icons/wi-snow-wind.png b/icons/weather/wi-snow-wind.png
similarity index 100%
rename from icons/wi-snow-wind.png
rename to icons/weather/wi-snow-wind.png
diff --git a/icons/wi-snow.png b/icons/weather/wi-snow.png
similarity index 100%
rename from icons/wi-snow.png
rename to icons/weather/wi-snow.png
diff --git a/icons/wi-snowflake-cold.png b/icons/weather/wi-snowflake-cold.png
similarity index 100%
rename from icons/wi-snowflake-cold.png
rename to icons/weather/wi-snowflake-cold.png
diff --git a/icons/wi-solar-eclipse.png b/icons/weather/wi-solar-eclipse.png
similarity index 100%
rename from icons/wi-solar-eclipse.png
rename to icons/weather/wi-solar-eclipse.png
diff --git a/icons/wi-sprinkle.png b/icons/weather/wi-sprinkle.png
similarity index 100%
rename from icons/wi-sprinkle.png
rename to icons/weather/wi-sprinkle.png
diff --git a/icons/wi-stars.png b/icons/weather/wi-stars.png
similarity index 100%
rename from icons/wi-stars.png
rename to icons/weather/wi-stars.png
diff --git a/icons/wi-storm-showers.png b/icons/weather/wi-storm-showers.png
similarity index 100%
rename from icons/wi-storm-showers.png
rename to icons/weather/wi-storm-showers.png
diff --git a/icons/wi-storm-warning.png b/icons/weather/wi-storm-warning.png
similarity index 100%
rename from icons/wi-storm-warning.png
rename to icons/weather/wi-storm-warning.png
diff --git a/icons/wi-strong-wind.png b/icons/weather/wi-strong-wind.png
similarity index 100%
rename from icons/wi-strong-wind.png
rename to icons/weather/wi-strong-wind.png
diff --git a/icons/wi-sunrise.png b/icons/weather/wi-sunrise.png
similarity index 100%
rename from icons/wi-sunrise.png
rename to icons/weather/wi-sunrise.png
diff --git a/icons/wi-sunset.png b/icons/weather/wi-sunset.png
similarity index 100%
rename from icons/wi-sunset.png
rename to icons/weather/wi-sunset.png
diff --git a/icons/wi-thermometer-exterior.png b/icons/weather/wi-thermometer-exterior.png
similarity index 100%
rename from icons/wi-thermometer-exterior.png
rename to icons/weather/wi-thermometer-exterior.png
diff --git a/icons/wi-thermometer-internal.png b/icons/weather/wi-thermometer-internal.png
similarity index 100%
rename from icons/wi-thermometer-internal.png
rename to icons/weather/wi-thermometer-internal.png
diff --git a/icons/wi-thermometer.png b/icons/weather/wi-thermometer.png
similarity index 100%
rename from icons/wi-thermometer.png
rename to icons/weather/wi-thermometer.png
diff --git a/icons/wi-thunderstorm.png b/icons/weather/wi-thunderstorm.png
similarity index 100%
rename from icons/wi-thunderstorm.png
rename to icons/weather/wi-thunderstorm.png
diff --git a/icons/wi-time-1.png b/icons/weather/wi-time-1.png
similarity index 100%
rename from icons/wi-time-1.png
rename to icons/weather/wi-time-1.png
diff --git a/icons/wi-time-10.png b/icons/weather/wi-time-10.png
similarity index 100%
rename from icons/wi-time-10.png
rename to icons/weather/wi-time-10.png
diff --git a/icons/wi-time-11.png b/icons/weather/wi-time-11.png
similarity index 100%
rename from icons/wi-time-11.png
rename to icons/weather/wi-time-11.png
diff --git a/icons/wi-time-12.png b/icons/weather/wi-time-12.png
similarity index 100%
rename from icons/wi-time-12.png
rename to icons/weather/wi-time-12.png
diff --git a/icons/wi-time-2.png b/icons/weather/wi-time-2.png
similarity index 100%
rename from icons/wi-time-2.png
rename to icons/weather/wi-time-2.png
diff --git a/icons/wi-time-3.png b/icons/weather/wi-time-3.png
similarity index 100%
rename from icons/wi-time-3.png
rename to icons/weather/wi-time-3.png
diff --git a/icons/wi-time-4.png b/icons/weather/wi-time-4.png
similarity index 100%
rename from icons/wi-time-4.png
rename to icons/weather/wi-time-4.png
diff --git a/icons/wi-time-5.png b/icons/weather/wi-time-5.png
similarity index 100%
rename from icons/wi-time-5.png
rename to icons/weather/wi-time-5.png
diff --git a/icons/wi-time-6.png b/icons/weather/wi-time-6.png
similarity index 100%
rename from icons/wi-time-6.png
rename to icons/weather/wi-time-6.png
diff --git a/icons/wi-time-7.png b/icons/weather/wi-time-7.png
similarity index 100%
rename from icons/wi-time-7.png
rename to icons/weather/wi-time-7.png
diff --git a/icons/wi-time-8.png b/icons/weather/wi-time-8.png
similarity index 100%
rename from icons/wi-time-8.png
rename to icons/weather/wi-time-8.png
diff --git a/icons/wi-time-9.png b/icons/weather/wi-time-9.png
similarity index 100%
rename from icons/wi-time-9.png
rename to icons/weather/wi-time-9.png
diff --git a/icons/wi-tornado.png b/icons/weather/wi-tornado.png
similarity index 100%
rename from icons/wi-tornado.png
rename to icons/weather/wi-tornado.png
diff --git a/icons/wi-train.png b/icons/weather/wi-train.png
similarity index 100%
rename from icons/wi-train.png
rename to icons/weather/wi-train.png
diff --git a/icons/wi-tsunami.png b/icons/weather/wi-tsunami.png
similarity index 100%
rename from icons/wi-tsunami.png
rename to icons/weather/wi-tsunami.png
diff --git a/icons/wi-umbrella.png b/icons/weather/wi-umbrella.png
similarity index 100%
rename from icons/wi-umbrella.png
rename to icons/weather/wi-umbrella.png
diff --git a/icons/wi-volcano.png b/icons/weather/wi-volcano.png
similarity index 100%
rename from icons/wi-volcano.png
rename to icons/weather/wi-volcano.png
diff --git a/icons/wi-wind-beaufort-0.png b/icons/weather/wi-wind-beaufort-0.png
similarity index 100%
rename from icons/wi-wind-beaufort-0.png
rename to icons/weather/wi-wind-beaufort-0.png
diff --git a/icons/wi-wind-beaufort-1.png b/icons/weather/wi-wind-beaufort-1.png
similarity index 100%
rename from icons/wi-wind-beaufort-1.png
rename to icons/weather/wi-wind-beaufort-1.png
diff --git a/icons/wi-wind-beaufort-10.png b/icons/weather/wi-wind-beaufort-10.png
similarity index 100%
rename from icons/wi-wind-beaufort-10.png
rename to icons/weather/wi-wind-beaufort-10.png
diff --git a/icons/wi-wind-beaufort-11.png b/icons/weather/wi-wind-beaufort-11.png
similarity index 100%
rename from icons/wi-wind-beaufort-11.png
rename to icons/weather/wi-wind-beaufort-11.png
diff --git a/icons/wi-wind-beaufort-12.png b/icons/weather/wi-wind-beaufort-12.png
similarity index 100%
rename from icons/wi-wind-beaufort-12.png
rename to icons/weather/wi-wind-beaufort-12.png
diff --git a/icons/wi-wind-beaufort-2.png b/icons/weather/wi-wind-beaufort-2.png
similarity index 100%
rename from icons/wi-wind-beaufort-2.png
rename to icons/weather/wi-wind-beaufort-2.png
diff --git a/icons/wi-wind-beaufort-3.png b/icons/weather/wi-wind-beaufort-3.png
similarity index 100%
rename from icons/wi-wind-beaufort-3.png
rename to icons/weather/wi-wind-beaufort-3.png
diff --git a/icons/wi-wind-beaufort-4.png b/icons/weather/wi-wind-beaufort-4.png
similarity index 100%
rename from icons/wi-wind-beaufort-4.png
rename to icons/weather/wi-wind-beaufort-4.png
diff --git a/icons/wi-wind-beaufort-5.png b/icons/weather/wi-wind-beaufort-5.png
similarity index 100%
rename from icons/wi-wind-beaufort-5.png
rename to icons/weather/wi-wind-beaufort-5.png
diff --git a/icons/wi-wind-beaufort-6.png b/icons/weather/wi-wind-beaufort-6.png
similarity index 100%
rename from icons/wi-wind-beaufort-6.png
rename to icons/weather/wi-wind-beaufort-6.png
diff --git a/icons/wi-wind-beaufort-7.png b/icons/weather/wi-wind-beaufort-7.png
similarity index 100%
rename from icons/wi-wind-beaufort-7.png
rename to icons/weather/wi-wind-beaufort-7.png
diff --git a/icons/wi-wind-beaufort-8.png b/icons/weather/wi-wind-beaufort-8.png
similarity index 100%
rename from icons/wi-wind-beaufort-8.png
rename to icons/weather/wi-wind-beaufort-8.png
diff --git a/icons/wi-wind-beaufort-9.png b/icons/weather/wi-wind-beaufort-9.png
similarity index 100%
rename from icons/wi-wind-beaufort-9.png
rename to icons/weather/wi-wind-beaufort-9.png
diff --git a/icons/wi-wind-deg.png b/icons/weather/wi-wind-deg.png
similarity index 100%
rename from icons/wi-wind-deg.png
rename to icons/weather/wi-wind-deg.png
diff --git a/icons/wi-windy.png b/icons/weather/wi-windy.png
similarity index 100%
rename from icons/wi-windy.png
rename to icons/weather/wi-windy.png
diff --git a/main.py b/main.py
index b75dcbd..4af6f3a 100644
--- a/main.py
+++ b/main.py
@@ -158,7 +158,7 @@ def main(only_on_coming_evt=False, ignore_module=[], force_coming_event=True, ex
             alerts.append({
                 "title": "Impossible de dessiner " + s.module.__name__,
                 "description": type(e).__name__ + ": " + (e.message if hasattr(e, 'message') else str(e)),
-                "icon": "wi-earthquake.png",
+                "icon": "weather/wi-earthquake.png",
             })
 
 
diff --git a/modules/__init__.py b/modules/__init__.py
index b8a683d..053a03c 100644
--- a/modules/__init__.py
+++ b/modules/__init__.py
@@ -174,7 +174,7 @@ class AlertsModule:
                         align = self.draw_alert({
                             "title": "Impossible de générer les alertes de " + alert.__name__,
                             "description": type(e).__name__ + ": " + (e.message if hasattr(e, 'message') else str(e)),
-                            "icon": "wi-earthquake.png",
+                            "icon": "weather/wi-earthquake.png",
                         }, width, image, draw, fnt_R, fnt_B, align, font_size)
                 else:
                     align = self.draw_alert(alert, width, image, draw, fnt_R, fnt_B, align, font_size)
diff --git a/modules/ratp.py b/modules/ratp.py
index e8cd829..1215f04 100644
--- a/modules/ratp.py
+++ b/modules/ratp.py
@@ -463,7 +463,7 @@ class RATPNextStopModule:
                 alerts.append({
                     "title": "Impossible de récupérer les horaires du " + mode + line + " pour " + tmp[1],
                     "description": type(e).__name__ + ": " + (e.message if hasattr(e, 'message') else str(e)),
-                    "icon": "wi-earthquake.png",
+                    "icon": "weather/wi-earthquake.png",
                 })
 
         align -= int(line_height * 0.33)
diff --git a/modules/weather.py b/modules/weather.py
index 975b5c4..40b8f65 100644
--- a/modules/weather.py
+++ b/modules/weather.py
@@ -123,7 +123,7 @@ class WeatherJumboCurrentModule:
         # current
         curweather = WeatherAPI().get_currently()
 
-        icon = Image.open(os.path.join(config.icons_dir, WeatherAPI.get_icon(curweather["condition"]["code"], night=not curweather["is_day"], current=True))).resize((height, height))
+        icon = Image.open(os.path.join(config.icons_dir, "weather", WeatherAPI.get_icon(curweather["condition"]["code"], night=not curweather["is_day"], current=True))).resize((height, height))
         image.paste(icon, (int(width*self.middle_align - height), 0), icon)
 
         draw.text(
@@ -160,7 +160,7 @@ class WeatherMoonPhaseModule:
     def draw_module(self, config, width, height):
         image = Image.new('RGBA', (width, height), '#fff0')
 
-        icon = Image.open(os.path.join(config.icons_dir, WeatherAPI().get_moon_icon())).resize((height, height))
+        icon = Image.open(os.path.join(config.icons_dir, "weather", WeatherAPI().get_moon_icon())).resize((height, height))
         image.paste(icon, (0,0), icon)
 
         return image
@@ -185,7 +185,7 @@ class WeatherSunModule:
         for icon, info in infos.items():
             if info == "":
                 continue
-            icon = Image.open(os.path.join(config.icons_dir, "wi-" + icon + ".png")).resize((height, height))
+            icon = Image.open(os.path.join(config.icons_dir, "weather", "wi-" + icon + ".png")).resize((height, height))
             image.paste(icon, (int(align),0), icon)
             align += height + 2
             draw.text(
@@ -242,7 +242,7 @@ class WeatherRainModule:
         image = Image.open(io.BytesIO(gauge.render_to_png()))
 
         if icon_path:
-                icon = Image.open(os.path.join(config.icons_dir, icon_path)).resize((int(height/1.25), int(height/1.25)))
+                icon = Image.open(os.path.join(config.icons_dir, "weather", icon_path)).resize((int(height/1.25), int(height/1.25)))
                 image.paste(icon, (int(width/2-height/2.5), int(height-height/1.25)), icon)
 
         return image
@@ -326,7 +326,7 @@ class WeeklyWeatherModule:
 
         i = 1
         for day in weekweather[self.first_day:self.first_day+self.limit_futur]:
-            icon = Image.open(os.path.join(config.icons_dir, WeatherAPI.get_icon(day["condition"]["code"]))).resize((day_size, day_size))
+            icon = Image.open(os.path.join(config.icons_dir, "weather", WeatherAPI.get_icon(day["condition"]["code"]))).resize((day_size, day_size))
             image.paste(icon, (0, i * day_size), icon)
 
             draw.text(
@@ -371,9 +371,9 @@ class WeatherAlerts:
 
         for alert in WeatherAPI().get_alerts():
                 if alert["severity"] == "Moderate":
-                        icon = "wi-small-craft-advisory.png"
+                        icon = "weather/wi-small-craft-advisory.png"
                 elif alert["severity"] != "Moderate":
-                        icon = "wi-gale-warning.png"
+                        icon = "weather/wi-gale-warning.png"
                 else:
                         icon = None
 
diff --git a/modules/weather_api.py b/modules/weather_api.py
index d2cef69..4a1b345 100644
--- a/modules/weather_api.py
+++ b/modules/weather_api.py
@@ -177,7 +177,7 @@ class WeatherAPI:
     def get_forecast(self, *args, **kwargs):
         for i in [0, 1, 2, 3]:
             enddt = datetime.now() + timedelta(days=i)
-            v = self.get_weather(*args, **kwargs, dt=enddt.strftime("%Y-%m-%d"))["forecast"]["forecastday"][0]
+            v = self.get_weather(*args, **kwargs, dt=enddt.strftime("%Y-%m-%d"), alerts="yes")["forecast"]["forecastday"][0]
             v["day"]["date"] = enddt
             yield v