diff --git a/panel/24-24-light/audio-volume-high-panel.svg b/panel/24-light/audio-volume-high-panel.svg similarity index 100% rename from panel/24-24-light/audio-volume-high-panel.svg rename to panel/24-light/audio-volume-high-panel.svg diff --git a/panel/24-24-light/audio-volume-high-symbolic.svg b/panel/24-light/audio-volume-high-symbolic.svg similarity index 100% rename from panel/24-24-light/audio-volume-high-symbolic.svg rename to panel/24-light/audio-volume-high-symbolic.svg diff --git a/panel/24-24-light/audio-volume-high.svg b/panel/24-light/audio-volume-high.svg similarity index 100% rename from panel/24-24-light/audio-volume-high.svg rename to panel/24-light/audio-volume-high.svg diff --git a/panel/24-24-light/audio-volume-low-panel.svg b/panel/24-light/audio-volume-low-panel.svg similarity index 100% rename from panel/24-24-light/audio-volume-low-panel.svg rename to panel/24-light/audio-volume-low-panel.svg diff --git a/panel/24-24-light/audio-volume-low-symbolic.svg b/panel/24-light/audio-volume-low-symbolic.svg similarity index 100% rename from panel/24-24-light/audio-volume-low-symbolic.svg rename to panel/24-light/audio-volume-low-symbolic.svg diff --git a/panel/24-24-light/audio-volume-low-zero-panel.svg b/panel/24-light/audio-volume-low-zero-panel.svg similarity index 100% rename from panel/24-24-light/audio-volume-low-zero-panel.svg rename to panel/24-light/audio-volume-low-zero-panel.svg diff --git a/panel/24-24-light/audio-volume-low.svg b/panel/24-light/audio-volume-low.svg similarity index 100% rename from panel/24-24-light/audio-volume-low.svg rename to panel/24-light/audio-volume-low.svg diff --git a/panel/24-24-light/audio-volume-medium-panel.svg b/panel/24-light/audio-volume-medium-panel.svg similarity index 100% rename from panel/24-24-light/audio-volume-medium-panel.svg rename to panel/24-light/audio-volume-medium-panel.svg diff --git a/panel/24-24-light/audio-volume-medium-symbolic.svg b/panel/24-light/audio-volume-medium-symbolic.svg similarity index 100% rename from panel/24-24-light/audio-volume-medium-symbolic.svg rename to panel/24-light/audio-volume-medium-symbolic.svg diff --git a/panel/24-24-light/audio-volume-medium.svg b/panel/24-light/audio-volume-medium.svg similarity index 100% rename from panel/24-24-light/audio-volume-medium.svg rename to panel/24-light/audio-volume-medium.svg diff --git a/panel/24-24-light/audio-volume-muted-blocking-panel.svg b/panel/24-light/audio-volume-muted-blocking-panel.svg similarity index 100% rename from panel/24-24-light/audio-volume-muted-blocking-panel.svg rename to panel/24-light/audio-volume-muted-blocking-panel.svg diff --git a/panel/24-24-light/battery-000-charging.svg b/panel/24-light/battery-000-charging.svg similarity index 100% rename from panel/24-24-light/battery-000-charging.svg rename to panel/24-light/battery-000-charging.svg diff --git a/panel/24-24-light/battery-020-charging.svg b/panel/24-light/battery-020-charging.svg similarity index 100% rename from panel/24-24-light/battery-020-charging.svg rename to panel/24-light/battery-020-charging.svg diff --git a/panel/24-24-light/battery-020.svg b/panel/24-light/battery-020.svg similarity index 100% rename from panel/24-24-light/battery-020.svg rename to panel/24-light/battery-020.svg diff --git a/panel/24-24-light/battery-040-charging.svg b/panel/24-light/battery-040-charging.svg similarity index 100% rename from panel/24-24-light/battery-040-charging.svg rename to panel/24-light/battery-040-charging.svg diff --git a/panel/24-24-light/battery-040.svg b/panel/24-light/battery-040.svg similarity index 100% rename from panel/24-24-light/battery-040.svg rename to panel/24-light/battery-040.svg diff --git a/panel/24-24-light/battery-060-charging.svg b/panel/24-light/battery-060-charging.svg similarity index 100% rename from panel/24-24-light/battery-060-charging.svg rename to panel/24-light/battery-060-charging.svg diff --git a/panel/24-24-light/battery-060.svg b/panel/24-light/battery-060.svg similarity index 100% rename from panel/24-24-light/battery-060.svg rename to panel/24-light/battery-060.svg diff --git a/panel/24-24-light/battery-080-charging.svg b/panel/24-light/battery-080-charging.svg similarity index 100% rename from panel/24-24-light/battery-080-charging.svg rename to panel/24-light/battery-080-charging.svg diff --git a/panel/24-24-light/battery-080.svg b/panel/24-light/battery-080.svg similarity index 100% rename from panel/24-24-light/battery-080.svg rename to panel/24-light/battery-080.svg diff --git a/panel/24-24-light/battery-100-charging.svg b/panel/24-light/battery-100-charging.svg similarity index 100% rename from panel/24-24-light/battery-100-charging.svg rename to panel/24-light/battery-100-charging.svg diff --git a/panel/24-24-light/battery-100.svg b/panel/24-light/battery-100.svg similarity index 100% rename from panel/24-24-light/battery-100.svg rename to panel/24-light/battery-100.svg diff --git a/panel/24-24-light/battery-caution-charging-symbolic.svg b/panel/24-light/battery-caution-charging-symbolic.svg similarity index 100% rename from panel/24-24-light/battery-caution-charging-symbolic.svg rename to panel/24-light/battery-caution-charging-symbolic.svg diff --git a/panel/24-24-light/battery-caution-charging.svg b/panel/24-light/battery-caution-charging.svg similarity index 100% rename from panel/24-24-light/battery-caution-charging.svg rename to panel/24-light/battery-caution-charging.svg diff --git a/panel/24-24-light/battery-caution-symbolic.svg b/panel/24-light/battery-caution-symbolic.svg similarity index 100% rename from panel/24-24-light/battery-caution-symbolic.svg rename to panel/24-light/battery-caution-symbolic.svg diff --git a/panel/24-24-light/battery-caution.svg b/panel/24-light/battery-caution.svg similarity index 100% rename from panel/24-24-light/battery-caution.svg rename to panel/24-light/battery-caution.svg diff --git a/panel/24-24-light/battery-charged.svg b/panel/24-light/battery-charged.svg similarity index 100% rename from panel/24-24-light/battery-charged.svg rename to panel/24-light/battery-charged.svg diff --git a/panel/24-24-light/battery-empty-charging-symbolic.svg b/panel/24-light/battery-empty-charging-symbolic.svg similarity index 100% rename from panel/24-24-light/battery-empty-charging-symbolic.svg rename to panel/24-light/battery-empty-charging-symbolic.svg diff --git a/panel/24-24-light/battery-empty-charging.svg b/panel/24-light/battery-empty-charging.svg similarity index 100% rename from panel/24-24-light/battery-empty-charging.svg rename to panel/24-light/battery-empty-charging.svg diff --git a/panel/24-24-light/battery-full-charged-symbolic.svg b/panel/24-light/battery-full-charged-symbolic.svg similarity index 100% rename from panel/24-24-light/battery-full-charged-symbolic.svg rename to panel/24-light/battery-full-charged-symbolic.svg diff --git a/panel/24-24-light/battery-full-charged.svg b/panel/24-light/battery-full-charged.svg similarity index 100% rename from panel/24-24-light/battery-full-charged.svg rename to panel/24-light/battery-full-charged.svg diff --git a/panel/24-24-light/battery-full-charging-symbolic.svg b/panel/24-light/battery-full-charging-symbolic.svg similarity index 100% rename from panel/24-24-light/battery-full-charging-symbolic.svg rename to panel/24-light/battery-full-charging-symbolic.svg diff --git a/panel/24-24-light/battery-full-charging.svg b/panel/24-light/battery-full-charging.svg similarity index 100% rename from panel/24-24-light/battery-full-charging.svg rename to panel/24-light/battery-full-charging.svg diff --git a/panel/24-24-light/battery-full-symbolic.svg b/panel/24-light/battery-full-symbolic.svg similarity index 100% rename from panel/24-24-light/battery-full-symbolic.svg rename to panel/24-light/battery-full-symbolic.svg diff --git a/panel/24-24-light/battery-full.svg b/panel/24-light/battery-full.svg similarity index 100% rename from panel/24-24-light/battery-full.svg rename to panel/24-light/battery-full.svg diff --git a/panel/24-24-light/battery-good-charging-symbolic.svg b/panel/24-light/battery-good-charging-symbolic.svg similarity index 100% rename from panel/24-24-light/battery-good-charging-symbolic.svg rename to panel/24-light/battery-good-charging-symbolic.svg diff --git a/panel/24-24-light/battery-good-charging.svg b/panel/24-light/battery-good-charging.svg similarity index 100% rename from panel/24-24-light/battery-good-charging.svg rename to panel/24-light/battery-good-charging.svg diff --git a/panel/24-24-light/battery-good-symbolic.svg b/panel/24-light/battery-good-symbolic.svg similarity index 100% rename from panel/24-24-light/battery-good-symbolic.svg rename to panel/24-light/battery-good-symbolic.svg diff --git a/panel/24-24-light/battery-good.svg b/panel/24-light/battery-good.svg similarity index 100% rename from panel/24-24-light/battery-good.svg rename to panel/24-light/battery-good.svg diff --git a/panel/24-24-light/battery-low-charging-symbolic.svg b/panel/24-light/battery-low-charging-symbolic.svg similarity index 100% rename from panel/24-24-light/battery-low-charging-symbolic.svg rename to panel/24-light/battery-low-charging-symbolic.svg diff --git a/panel/24-24-light/battery-low-charging.svg b/panel/24-light/battery-low-charging.svg similarity index 100% rename from panel/24-24-light/battery-low-charging.svg rename to panel/24-light/battery-low-charging.svg diff --git a/panel/24-24-light/battery-low-symbolic.svg b/panel/24-light/battery-low-symbolic.svg similarity index 100% rename from panel/24-24-light/battery-low-symbolic.svg rename to panel/24-light/battery-low-symbolic.svg diff --git a/panel/24-24-light/battery-low.svg b/panel/24-light/battery-low.svg similarity index 100% rename from panel/24-24-light/battery-low.svg rename to panel/24-light/battery-low.svg diff --git a/panel/24-24-light/battery-medium-charging.svg b/panel/24-light/battery-medium-charging.svg similarity index 100% rename from panel/24-24-light/battery-medium-charging.svg rename to panel/24-light/battery-medium-charging.svg diff --git a/panel/24-24-light/battery-medium.svg b/panel/24-light/battery-medium.svg similarity index 100% rename from panel/24-24-light/battery-medium.svg rename to panel/24-light/battery-medium.svg diff --git a/panel/24-24-light/battery_charged.svg b/panel/24-light/battery_charged.svg similarity index 100% rename from panel/24-24-light/battery_charged.svg rename to panel/24-light/battery_charged.svg diff --git a/panel/24-24-light/battery_full.svg b/panel/24-light/battery_full.svg similarity index 100% rename from panel/24-24-light/battery_full.svg rename to panel/24-light/battery_full.svg diff --git a/panel/24-24-light/discord-tray-connected.svg b/panel/24-light/discord-tray-connected.svg similarity index 100% rename from panel/24-24-light/discord-tray-connected.svg rename to panel/24-light/discord-tray-connected.svg diff --git a/panel/24-24-light/gpm-ac-adapter.svg b/panel/24-light/gpm-ac-adapter.svg similarity index 100% rename from panel/24-24-light/gpm-ac-adapter.svg rename to panel/24-light/gpm-ac-adapter.svg diff --git a/panel/24-24-light/gpm-battery-000-charging.svg b/panel/24-light/gpm-battery-000-charging.svg similarity index 100% rename from panel/24-24-light/gpm-battery-000-charging.svg rename to panel/24-light/gpm-battery-000-charging.svg diff --git a/panel/24-24-light/gpm-battery-020-charging.svg b/panel/24-light/gpm-battery-020-charging.svg similarity index 100% rename from panel/24-24-light/gpm-battery-020-charging.svg rename to panel/24-light/gpm-battery-020-charging.svg diff --git a/panel/24-24-light/gpm-battery-020.svg b/panel/24-light/gpm-battery-020.svg similarity index 100% rename from panel/24-24-light/gpm-battery-020.svg rename to panel/24-light/gpm-battery-020.svg diff --git a/panel/24-24-light/gpm-battery-040-charging.svg b/panel/24-light/gpm-battery-040-charging.svg similarity index 100% rename from panel/24-24-light/gpm-battery-040-charging.svg rename to panel/24-light/gpm-battery-040-charging.svg diff --git a/panel/24-24-light/gpm-battery-040.svg b/panel/24-light/gpm-battery-040.svg similarity index 100% rename from panel/24-24-light/gpm-battery-040.svg rename to panel/24-light/gpm-battery-040.svg diff --git a/panel/24-24-light/gpm-battery-060-charging.svg b/panel/24-light/gpm-battery-060-charging.svg similarity index 100% rename from panel/24-24-light/gpm-battery-060-charging.svg rename to panel/24-light/gpm-battery-060-charging.svg diff --git a/panel/24-24-light/gpm-battery-060.svg b/panel/24-light/gpm-battery-060.svg similarity index 100% rename from panel/24-24-light/gpm-battery-060.svg rename to panel/24-light/gpm-battery-060.svg diff --git a/panel/24-24-light/gpm-battery-080-charging.svg b/panel/24-light/gpm-battery-080-charging.svg similarity index 100% rename from panel/24-24-light/gpm-battery-080-charging.svg rename to panel/24-light/gpm-battery-080-charging.svg diff --git a/panel/24-24-light/gpm-battery-080.svg b/panel/24-light/gpm-battery-080.svg similarity index 100% rename from panel/24-24-light/gpm-battery-080.svg rename to panel/24-light/gpm-battery-080.svg diff --git a/panel/24-24-light/gpm-battery-100-charging.svg b/panel/24-light/gpm-battery-100-charging.svg similarity index 100% rename from panel/24-24-light/gpm-battery-100-charging.svg rename to panel/24-light/gpm-battery-100-charging.svg diff --git a/panel/24-24-light/gpm-battery-100.svg b/panel/24-light/gpm-battery-100.svg similarity index 100% rename from panel/24-24-light/gpm-battery-100.svg rename to panel/24-light/gpm-battery-100.svg diff --git a/panel/24-24-light/gpm-battery-charged.svg b/panel/24-light/gpm-battery-charged.svg similarity index 100% rename from panel/24-24-light/gpm-battery-charged.svg rename to panel/24-light/gpm-battery-charged.svg diff --git a/panel/24-24-light/gpm-ups-000-charging.svg b/panel/24-light/gpm-ups-000-charging.svg similarity index 100% rename from panel/24-24-light/gpm-ups-000-charging.svg rename to panel/24-light/gpm-ups-000-charging.svg diff --git a/panel/24-24-light/gpm-ups-020-charging.svg b/panel/24-light/gpm-ups-020-charging.svg similarity index 100% rename from panel/24-24-light/gpm-ups-020-charging.svg rename to panel/24-light/gpm-ups-020-charging.svg diff --git a/panel/24-24-light/gpm-ups-020.svg b/panel/24-light/gpm-ups-020.svg similarity index 100% rename from panel/24-24-light/gpm-ups-020.svg rename to panel/24-light/gpm-ups-020.svg diff --git a/panel/24-24-light/gpm-ups-040-charging.svg b/panel/24-light/gpm-ups-040-charging.svg similarity index 100% rename from panel/24-24-light/gpm-ups-040-charging.svg rename to panel/24-light/gpm-ups-040-charging.svg diff --git a/panel/24-24-light/gpm-ups-040.svg b/panel/24-light/gpm-ups-040.svg similarity index 100% rename from panel/24-24-light/gpm-ups-040.svg rename to panel/24-light/gpm-ups-040.svg diff --git a/panel/24-24-light/gpm-ups-060-charging.svg b/panel/24-light/gpm-ups-060-charging.svg similarity index 100% rename from panel/24-24-light/gpm-ups-060-charging.svg rename to panel/24-light/gpm-ups-060-charging.svg diff --git a/panel/24-24-light/gpm-ups-060.svg b/panel/24-light/gpm-ups-060.svg similarity index 100% rename from panel/24-24-light/gpm-ups-060.svg rename to panel/24-light/gpm-ups-060.svg diff --git a/panel/24-24-light/gpm-ups-080-charging.svg b/panel/24-light/gpm-ups-080-charging.svg similarity index 100% rename from panel/24-24-light/gpm-ups-080-charging.svg rename to panel/24-light/gpm-ups-080-charging.svg diff --git a/panel/24-24-light/gpm-ups-080.svg b/panel/24-light/gpm-ups-080.svg similarity index 100% rename from panel/24-24-light/gpm-ups-080.svg rename to panel/24-light/gpm-ups-080.svg diff --git a/panel/24-24-light/gpm-ups-100-charging.svg b/panel/24-light/gpm-ups-100-charging.svg similarity index 100% rename from panel/24-24-light/gpm-ups-100-charging.svg rename to panel/24-light/gpm-ups-100-charging.svg diff --git a/panel/24-24-light/gpm-ups-100.svg b/panel/24-light/gpm-ups-100.svg similarity index 100% rename from panel/24-24-light/gpm-ups-100.svg rename to panel/24-light/gpm-ups-100.svg diff --git a/panel/24-24-light/volume-level-high-panel.svg b/panel/24-light/volume-level-high-panel.svg similarity index 100% rename from panel/24-24-light/volume-level-high-panel.svg rename to panel/24-light/volume-level-high-panel.svg diff --git a/panel/24-24-light/volume-level-high.svg b/panel/24-light/volume-level-high.svg similarity index 100% rename from panel/24-24-light/volume-level-high.svg rename to panel/24-light/volume-level-high.svg diff --git a/panel/24-24-light/volume-level-low-panel.svg b/panel/24-light/volume-level-low-panel.svg similarity index 100% rename from panel/24-24-light/volume-level-low-panel.svg rename to panel/24-light/volume-level-low-panel.svg diff --git a/panel/24-24-light/volume-level-low.svg b/panel/24-light/volume-level-low.svg similarity index 100% rename from panel/24-24-light/volume-level-low.svg rename to panel/24-light/volume-level-low.svg diff --git a/panel/24-24-light/volume-level-medium-panel.svg b/panel/24-light/volume-level-medium-panel.svg similarity index 100% rename from panel/24-24-light/volume-level-medium-panel.svg rename to panel/24-light/volume-level-medium-panel.svg diff --git a/panel/24-24-light/volume-level-medium.svg b/panel/24-light/volume-level-medium.svg similarity index 100% rename from panel/24-24-light/volume-level-medium.svg rename to panel/24-light/volume-level-medium.svg diff --git a/panel/24-24-light/xfce4-battery-caution-charging.svg b/panel/24-light/xfce4-battery-caution-charging.svg similarity index 100% rename from panel/24-24-light/xfce4-battery-caution-charging.svg rename to panel/24-light/xfce4-battery-caution-charging.svg diff --git a/panel/24-24-light/xfce4-battery-caution.svg b/panel/24-light/xfce4-battery-caution.svg similarity index 100% rename from panel/24-24-light/xfce4-battery-caution.svg rename to panel/24-light/xfce4-battery-caution.svg diff --git a/panel/24-24-light/xfce4-battery-critical-charging.svg b/panel/24-light/xfce4-battery-critical-charging.svg similarity index 100% rename from panel/24-24-light/xfce4-battery-critical-charging.svg rename to panel/24-light/xfce4-battery-critical-charging.svg diff --git a/panel/24-24-light/xfce4-battery-critical.svg b/panel/24-light/xfce4-battery-critical.svg similarity index 100% rename from panel/24-24-light/xfce4-battery-critical.svg rename to panel/24-light/xfce4-battery-critical.svg diff --git a/panel/24-24-light/xfce4-battery-full-charging.svg b/panel/24-light/xfce4-battery-full-charging.svg similarity index 100% rename from panel/24-24-light/xfce4-battery-full-charging.svg rename to panel/24-light/xfce4-battery-full-charging.svg diff --git a/panel/24-24-light/xfce4-battery-full.svg b/panel/24-light/xfce4-battery-full.svg similarity index 100% rename from panel/24-24-light/xfce4-battery-full.svg rename to panel/24-light/xfce4-battery-full.svg diff --git a/panel/24-24-light/xfce4-battery-good-charging.svg b/panel/24-light/xfce4-battery-good-charging.svg similarity index 100% rename from panel/24-24-light/xfce4-battery-good-charging.svg rename to panel/24-light/xfce4-battery-good-charging.svg diff --git a/panel/24-24-light/xfce4-battery-good.svg b/panel/24-light/xfce4-battery-good.svg similarity index 100% rename from panel/24-24-light/xfce4-battery-good.svg rename to panel/24-light/xfce4-battery-good.svg diff --git a/panel/24-24-light/xfce4-battery-low-charging.svg b/panel/24-light/xfce4-battery-low-charging.svg similarity index 100% rename from panel/24-24-light/xfce4-battery-low-charging.svg rename to panel/24-light/xfce4-battery-low-charging.svg diff --git a/panel/24-24-light/xfce4-battery-low.svg b/panel/24-light/xfce4-battery-low.svg similarity index 100% rename from panel/24-24-light/xfce4-battery-low.svg rename to panel/24-light/xfce4-battery-low.svg diff --git a/panel/24-24-light/xfce4-battery-ok-charging.svg b/panel/24-light/xfce4-battery-ok-charging.svg similarity index 100% rename from panel/24-24-light/xfce4-battery-ok-charging.svg rename to panel/24-light/xfce4-battery-ok-charging.svg diff --git a/panel/24-24-light/xfce4-battery-ok.svg b/panel/24-light/xfce4-battery-ok.svg similarity index 100% rename from panel/24-24-light/xfce4-battery-ok.svg rename to panel/24-light/xfce4-battery-ok.svg diff --git a/panel/24-24-light/xfce4-battery-plugin.svg b/panel/24-light/xfce4-battery-plugin.svg similarity index 100% rename from panel/24-24-light/xfce4-battery-plugin.svg rename to panel/24-light/xfce4-battery-plugin.svg diff --git a/panel/24-24-light/xfce4-mixer-volume-high.svg b/panel/24-light/xfce4-mixer-volume-high.svg similarity index 100% rename from panel/24-24-light/xfce4-mixer-volume-high.svg rename to panel/24-light/xfce4-mixer-volume-high.svg diff --git a/panel/24-24-light/xfce4-mixer-volume-low-medium.svg b/panel/24-light/xfce4-mixer-volume-low-medium.svg similarity index 100% rename from panel/24-24-light/xfce4-mixer-volume-low-medium.svg rename to panel/24-light/xfce4-mixer-volume-low-medium.svg diff --git a/panel/24-24-light/xfce4-mixer-volume-low.svg b/panel/24-light/xfce4-mixer-volume-low.svg similarity index 100% rename from panel/24-24-light/xfce4-mixer-volume-low.svg rename to panel/24-light/xfce4-mixer-volume-low.svg diff --git a/panel/24-24-light/xfce4-mixer-volume-medium.svg b/panel/24-light/xfce4-mixer-volume-medium.svg similarity index 100% rename from panel/24-24-light/xfce4-mixer-volume-medium.svg rename to panel/24-light/xfce4-mixer-volume-medium.svg diff --git a/panel/24-24-light/xfce4-mixer-volume-ultra-low.svg b/panel/24-light/xfce4-mixer-volume-ultra-low.svg similarity index 100% rename from panel/24-24-light/xfce4-mixer-volume-ultra-low.svg rename to panel/24-light/xfce4-mixer-volume-ultra-low.svg diff --git a/panel/24-24-light/xfce4-mixer-volume-very-high.svg b/panel/24-light/xfce4-mixer-volume-very-high.svg similarity index 100% rename from panel/24-24-light/xfce4-mixer-volume-very-high.svg rename to panel/24-light/xfce4-mixer-volume-very-high.svg diff --git a/panel/24-24-light/xfpm-battery-000-charging.svg b/panel/24-light/xfpm-battery-000-charging.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-000-charging.svg rename to panel/24-light/xfpm-battery-000-charging.svg diff --git a/panel/24-24-light/xfpm-battery-020-charging.svg b/panel/24-light/xfpm-battery-020-charging.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-020-charging.svg rename to panel/24-light/xfpm-battery-020-charging.svg diff --git a/panel/24-24-light/xfpm-battery-020.svg b/panel/24-light/xfpm-battery-020.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-020.svg rename to panel/24-light/xfpm-battery-020.svg diff --git a/panel/24-24-light/xfpm-battery-040-charging.svg b/panel/24-light/xfpm-battery-040-charging.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-040-charging.svg rename to panel/24-light/xfpm-battery-040-charging.svg diff --git a/panel/24-24-light/xfpm-battery-040.svg b/panel/24-light/xfpm-battery-040.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-040.svg rename to panel/24-light/xfpm-battery-040.svg diff --git a/panel/24-24-light/xfpm-battery-060-charging.svg b/panel/24-light/xfpm-battery-060-charging.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-060-charging.svg rename to panel/24-light/xfpm-battery-060-charging.svg diff --git a/panel/24-24-light/xfpm-battery-060.svg b/panel/24-light/xfpm-battery-060.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-060.svg rename to panel/24-light/xfpm-battery-060.svg diff --git a/panel/24-24-light/xfpm-battery-080-charging.svg b/panel/24-light/xfpm-battery-080-charging.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-080-charging.svg rename to panel/24-light/xfpm-battery-080-charging.svg diff --git a/panel/24-24-light/xfpm-battery-080.svg b/panel/24-light/xfpm-battery-080.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-080.svg rename to panel/24-light/xfpm-battery-080.svg diff --git a/panel/24-24-light/xfpm-battery-100-charging.svg b/panel/24-light/xfpm-battery-100-charging.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-100-charging.svg rename to panel/24-light/xfpm-battery-100-charging.svg diff --git a/panel/24-24-light/xfpm-battery-100.svg b/panel/24-light/xfpm-battery-100.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-100.svg rename to panel/24-light/xfpm-battery-100.svg diff --git a/panel/24-24-light/xfpm-battery-caution-charging.svg b/panel/24-light/xfpm-battery-caution-charging.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-caution-charging.svg rename to panel/24-light/xfpm-battery-caution-charging.svg diff --git a/panel/24-24-light/xfpm-battery-caution.svg b/panel/24-light/xfpm-battery-caution.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-caution.svg rename to panel/24-light/xfpm-battery-caution.svg diff --git a/panel/24-24-light/xfpm-battery-critical-charging.svg b/panel/24-light/xfpm-battery-critical-charging.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-critical-charging.svg rename to panel/24-light/xfpm-battery-critical-charging.svg diff --git a/panel/24-24-light/xfpm-battery-critical.svg b/panel/24-light/xfpm-battery-critical.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-critical.svg rename to panel/24-light/xfpm-battery-critical.svg diff --git a/panel/24-24-light/xfpm-battery-full-charging.svg b/panel/24-light/xfpm-battery-full-charging.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-full-charging.svg rename to panel/24-light/xfpm-battery-full-charging.svg diff --git a/panel/24-24-light/xfpm-battery-full.svg b/panel/24-light/xfpm-battery-full.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-full.svg rename to panel/24-light/xfpm-battery-full.svg diff --git a/panel/24-24-light/xfpm-battery-good-charging.svg b/panel/24-light/xfpm-battery-good-charging.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-good-charging.svg rename to panel/24-light/xfpm-battery-good-charging.svg diff --git a/panel/24-24-light/xfpm-battery-good.svg b/panel/24-light/xfpm-battery-good.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-good.svg rename to panel/24-light/xfpm-battery-good.svg diff --git a/panel/24-24-light/xfpm-battery-low-charging.svg b/panel/24-light/xfpm-battery-low-charging.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-low-charging.svg rename to panel/24-light/xfpm-battery-low-charging.svg diff --git a/panel/24-24-light/xfpm-battery-low.svg b/panel/24-light/xfpm-battery-low.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-low.svg rename to panel/24-light/xfpm-battery-low.svg diff --git a/panel/24-24-light/xfpm-battery-ok-charging.svg b/panel/24-light/xfpm-battery-ok-charging.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-ok-charging.svg rename to panel/24-light/xfpm-battery-ok-charging.svg diff --git a/panel/24-24-light/xfpm-battery-ok.svg b/panel/24-light/xfpm-battery-ok.svg similarity index 100% rename from panel/24-24-light/xfpm-battery-ok.svg rename to panel/24-light/xfpm-battery-ok.svg diff --git a/panel/24-24/audio-input-microphone-muted.svg b/panel/24/audio-input-microphone-muted.svg similarity index 100% rename from panel/24-24/audio-input-microphone-muted.svg rename to panel/24/audio-input-microphone-muted.svg diff --git a/panel/24-24/audio-output-none-panel.svg b/panel/24/audio-output-none-panel.svg similarity index 100% rename from panel/24-24/audio-output-none-panel.svg rename to panel/24/audio-output-none-panel.svg diff --git a/panel/24-24/audio-output-none.svg b/panel/24/audio-output-none.svg similarity index 100% rename from panel/24-24/audio-output-none.svg rename to panel/24/audio-output-none.svg diff --git a/panel/24-24/audio-volume-high-panel.svg b/panel/24/audio-volume-high-panel.svg similarity index 100% rename from panel/24-24/audio-volume-high-panel.svg rename to panel/24/audio-volume-high-panel.svg diff --git a/panel/24-24/audio-volume-high-symbolic.svg b/panel/24/audio-volume-high-symbolic.svg similarity index 100% rename from panel/24-24/audio-volume-high-symbolic.svg rename to panel/24/audio-volume-high-symbolic.svg diff --git a/panel/24-24/audio-volume-high.svg b/panel/24/audio-volume-high.svg similarity index 100% rename from panel/24-24/audio-volume-high.svg rename to panel/24/audio-volume-high.svg diff --git a/panel/24-24/audio-volume-low-panel.svg b/panel/24/audio-volume-low-panel.svg similarity index 100% rename from panel/24-24/audio-volume-low-panel.svg rename to panel/24/audio-volume-low-panel.svg diff --git a/panel/24-24/audio-volume-low-symbolic.svg b/panel/24/audio-volume-low-symbolic.svg similarity index 100% rename from panel/24-24/audio-volume-low-symbolic.svg rename to panel/24/audio-volume-low-symbolic.svg diff --git a/panel/24-24/audio-volume-low-zero-panel.svg b/panel/24/audio-volume-low-zero-panel.svg similarity index 100% rename from panel/24-24/audio-volume-low-zero-panel.svg rename to panel/24/audio-volume-low-zero-panel.svg diff --git a/panel/24-24/audio-volume-low.svg b/panel/24/audio-volume-low.svg similarity index 100% rename from panel/24-24/audio-volume-low.svg rename to panel/24/audio-volume-low.svg diff --git a/panel/24-24/audio-volume-medium-panel.svg b/panel/24/audio-volume-medium-panel.svg similarity index 100% rename from panel/24-24/audio-volume-medium-panel.svg rename to panel/24/audio-volume-medium-panel.svg diff --git a/panel/24-24/audio-volume-medium-symbolic.svg b/panel/24/audio-volume-medium-symbolic.svg similarity index 100% rename from panel/24-24/audio-volume-medium-symbolic.svg rename to panel/24/audio-volume-medium-symbolic.svg diff --git a/panel/24-24/audio-volume-medium.svg b/panel/24/audio-volume-medium.svg similarity index 100% rename from panel/24-24/audio-volume-medium.svg rename to panel/24/audio-volume-medium.svg diff --git a/panel/24-24/audio-volume-muted-blocked-panel.svg b/panel/24/audio-volume-muted-blocked-panel.svg similarity index 100% rename from panel/24-24/audio-volume-muted-blocked-panel.svg rename to panel/24/audio-volume-muted-blocked-panel.svg diff --git a/panel/24-24/audio-volume-muted-blocking-panel.svg b/panel/24/audio-volume-muted-blocking-panel.svg similarity index 100% rename from panel/24-24/audio-volume-muted-blocking-panel.svg rename to panel/24/audio-volume-muted-blocking-panel.svg diff --git a/panel/24-24/audio-volume-muted-blocking.svg b/panel/24/audio-volume-muted-blocking.svg similarity index 100% rename from panel/24-24/audio-volume-muted-blocking.svg rename to panel/24/audio-volume-muted-blocking.svg diff --git a/panel/24-24/audio-volume-muted-panel.svg b/panel/24/audio-volume-muted-panel.svg similarity index 100% rename from panel/24-24/audio-volume-muted-panel.svg rename to panel/24/audio-volume-muted-panel.svg diff --git a/panel/24-24/audio-volume-muted-symbolic.svg b/panel/24/audio-volume-muted-symbolic.svg similarity index 100% rename from panel/24-24/audio-volume-muted-symbolic.svg rename to panel/24/audio-volume-muted-symbolic.svg diff --git a/panel/24-24/audio-volume-muted.svg b/panel/24/audio-volume-muted.svg similarity index 100% rename from panel/24-24/audio-volume-muted.svg rename to panel/24/audio-volume-muted.svg diff --git a/panel/24-24/audio-volume-off.svg b/panel/24/audio-volume-off.svg similarity index 100% rename from panel/24-24/audio-volume-off.svg rename to panel/24/audio-volume-off.svg diff --git a/panel/24-24/battery-000-charging.svg b/panel/24/battery-000-charging.svg similarity index 100% rename from panel/24-24/battery-000-charging.svg rename to panel/24/battery-000-charging.svg diff --git a/panel/24-24/battery-020-charging.svg b/panel/24/battery-020-charging.svg similarity index 100% rename from panel/24-24/battery-020-charging.svg rename to panel/24/battery-020-charging.svg diff --git a/panel/24-24/battery-020.svg b/panel/24/battery-020.svg similarity index 100% rename from panel/24-24/battery-020.svg rename to panel/24/battery-020.svg diff --git a/panel/24-24/battery-040-charging.svg b/panel/24/battery-040-charging.svg similarity index 100% rename from panel/24-24/battery-040-charging.svg rename to panel/24/battery-040-charging.svg diff --git a/panel/24-24/battery-040.svg b/panel/24/battery-040.svg similarity index 100% rename from panel/24-24/battery-040.svg rename to panel/24/battery-040.svg diff --git a/panel/24-24/battery-060-charging.svg b/panel/24/battery-060-charging.svg similarity index 100% rename from panel/24-24/battery-060-charging.svg rename to panel/24/battery-060-charging.svg diff --git a/panel/24-24/battery-060.svg b/panel/24/battery-060.svg similarity index 100% rename from panel/24-24/battery-060.svg rename to panel/24/battery-060.svg diff --git a/panel/24-24/battery-080-charging.svg b/panel/24/battery-080-charging.svg similarity index 100% rename from panel/24-24/battery-080-charging.svg rename to panel/24/battery-080-charging.svg diff --git a/panel/24-24/battery-080.svg b/panel/24/battery-080.svg similarity index 100% rename from panel/24-24/battery-080.svg rename to panel/24/battery-080.svg diff --git a/panel/24-24/battery-100-charging.svg b/panel/24/battery-100-charging.svg similarity index 100% rename from panel/24-24/battery-100-charging.svg rename to panel/24/battery-100-charging.svg diff --git a/panel/24-24/battery-100.svg b/panel/24/battery-100.svg similarity index 100% rename from panel/24-24/battery-100.svg rename to panel/24/battery-100.svg diff --git a/panel/24-24/battery-caution-charging-symbolic.svg b/panel/24/battery-caution-charging-symbolic.svg similarity index 100% rename from panel/24-24/battery-caution-charging-symbolic.svg rename to panel/24/battery-caution-charging-symbolic.svg diff --git a/panel/24-24/battery-caution-charging.svg b/panel/24/battery-caution-charging.svg similarity index 100% rename from panel/24-24/battery-caution-charging.svg rename to panel/24/battery-caution-charging.svg diff --git a/panel/24-24/battery-charged.svg b/panel/24/battery-charged.svg similarity index 100% rename from panel/24-24/battery-charged.svg rename to panel/24/battery-charged.svg diff --git a/panel/24-24/battery-empty-charging-symbolic.svg b/panel/24/battery-empty-charging-symbolic.svg similarity index 100% rename from panel/24-24/battery-empty-charging-symbolic.svg rename to panel/24/battery-empty-charging-symbolic.svg diff --git a/panel/24-24/battery-empty-charging.svg b/panel/24/battery-empty-charging.svg similarity index 100% rename from panel/24-24/battery-empty-charging.svg rename to panel/24/battery-empty-charging.svg diff --git a/panel/24-24/battery-full-charged-symbolic.svg b/panel/24/battery-full-charged-symbolic.svg similarity index 100% rename from panel/24-24/battery-full-charged-symbolic.svg rename to panel/24/battery-full-charged-symbolic.svg diff --git a/panel/24-24/battery-full-charged.svg b/panel/24/battery-full-charged.svg similarity index 100% rename from panel/24-24/battery-full-charged.svg rename to panel/24/battery-full-charged.svg diff --git a/panel/24-24/battery-full-charging-symbolic.svg b/panel/24/battery-full-charging-symbolic.svg similarity index 100% rename from panel/24-24/battery-full-charging-symbolic.svg rename to panel/24/battery-full-charging-symbolic.svg diff --git a/panel/24-24/battery-full-charging.svg b/panel/24/battery-full-charging.svg similarity index 100% rename from panel/24-24/battery-full-charging.svg rename to panel/24/battery-full-charging.svg diff --git a/panel/24-24/battery-full-symbolic.svg b/panel/24/battery-full-symbolic.svg similarity index 100% rename from panel/24-24/battery-full-symbolic.svg rename to panel/24/battery-full-symbolic.svg diff --git a/panel/24-24/battery-full.svg b/panel/24/battery-full.svg similarity index 100% rename from panel/24-24/battery-full.svg rename to panel/24/battery-full.svg diff --git a/panel/24-24/battery-good-charging-symbolic.svg b/panel/24/battery-good-charging-symbolic.svg similarity index 100% rename from panel/24-24/battery-good-charging-symbolic.svg rename to panel/24/battery-good-charging-symbolic.svg diff --git a/panel/24-24/battery-good-charging.svg b/panel/24/battery-good-charging.svg similarity index 100% rename from panel/24-24/battery-good-charging.svg rename to panel/24/battery-good-charging.svg diff --git a/panel/24-24/battery-good-symbolic.svg b/panel/24/battery-good-symbolic.svg similarity index 100% rename from panel/24-24/battery-good-symbolic.svg rename to panel/24/battery-good-symbolic.svg diff --git a/panel/24-24/battery-good.svg b/panel/24/battery-good.svg similarity index 100% rename from panel/24-24/battery-good.svg rename to panel/24/battery-good.svg diff --git a/panel/24-24/battery-low-charging-symbolic.svg b/panel/24/battery-low-charging-symbolic.svg similarity index 100% rename from panel/24-24/battery-low-charging-symbolic.svg rename to panel/24/battery-low-charging-symbolic.svg diff --git a/panel/24-24/battery-low-charging.svg b/panel/24/battery-low-charging.svg similarity index 100% rename from panel/24-24/battery-low-charging.svg rename to panel/24/battery-low-charging.svg diff --git a/panel/24-24/battery-low-symbolic.svg b/panel/24/battery-low-symbolic.svg similarity index 100% rename from panel/24-24/battery-low-symbolic.svg rename to panel/24/battery-low-symbolic.svg diff --git a/panel/24-24/battery-low.svg b/panel/24/battery-low.svg similarity index 100% rename from panel/24-24/battery-low.svg rename to panel/24/battery-low.svg diff --git a/panel/24-24/battery-medium-charging.svg b/panel/24/battery-medium-charging.svg similarity index 100% rename from panel/24-24/battery-medium-charging.svg rename to panel/24/battery-medium-charging.svg diff --git a/panel/24-24/battery-medium.svg b/panel/24/battery-medium.svg similarity index 100% rename from panel/24-24/battery-medium.svg rename to panel/24/battery-medium.svg diff --git a/panel/24-24/battery_charged.svg b/panel/24/battery_charged.svg similarity index 100% rename from panel/24-24/battery_charged.svg rename to panel/24/battery_charged.svg diff --git a/panel/24-24/battery_full.svg b/panel/24/battery_full.svg similarity index 100% rename from panel/24-24/battery_full.svg rename to panel/24/battery_full.svg diff --git a/panel/24-24/discord-tray-connected.svg b/panel/24/discord-tray-connected.svg similarity index 100% rename from panel/24-24/discord-tray-connected.svg rename to panel/24/discord-tray-connected.svg diff --git a/panel/24-24/discord-tray-muted.svg b/panel/24/discord-tray-muted.svg similarity index 100% rename from panel/24-24/discord-tray-muted.svg rename to panel/24/discord-tray-muted.svg diff --git a/panel/24-24/discord-tray-speaking.svg b/panel/24/discord-tray-speaking.svg similarity index 100% rename from panel/24-24/discord-tray-speaking.svg rename to panel/24/discord-tray-speaking.svg diff --git a/panel/24-24/gpm-ac-adapter.svg b/panel/24/gpm-ac-adapter.svg similarity index 100% rename from panel/24-24/gpm-ac-adapter.svg rename to panel/24/gpm-ac-adapter.svg diff --git a/panel/24-24/gpm-battery-000-charging.svg b/panel/24/gpm-battery-000-charging.svg similarity index 100% rename from panel/24-24/gpm-battery-000-charging.svg rename to panel/24/gpm-battery-000-charging.svg diff --git a/panel/24-24/gpm-battery-020-charging.svg b/panel/24/gpm-battery-020-charging.svg similarity index 100% rename from panel/24-24/gpm-battery-020-charging.svg rename to panel/24/gpm-battery-020-charging.svg diff --git a/panel/24-24/gpm-battery-020.svg b/panel/24/gpm-battery-020.svg similarity index 100% rename from panel/24-24/gpm-battery-020.svg rename to panel/24/gpm-battery-020.svg diff --git a/panel/24-24/gpm-battery-040-charging.svg b/panel/24/gpm-battery-040-charging.svg similarity index 100% rename from panel/24-24/gpm-battery-040-charging.svg rename to panel/24/gpm-battery-040-charging.svg diff --git a/panel/24-24/gpm-battery-040.svg b/panel/24/gpm-battery-040.svg similarity index 100% rename from panel/24-24/gpm-battery-040.svg rename to panel/24/gpm-battery-040.svg diff --git a/panel/24-24/gpm-battery-060-charging.svg b/panel/24/gpm-battery-060-charging.svg similarity index 100% rename from panel/24-24/gpm-battery-060-charging.svg rename to panel/24/gpm-battery-060-charging.svg diff --git a/panel/24-24/gpm-battery-060.svg b/panel/24/gpm-battery-060.svg similarity index 100% rename from panel/24-24/gpm-battery-060.svg rename to panel/24/gpm-battery-060.svg diff --git a/panel/24-24/gpm-battery-080-charging.svg b/panel/24/gpm-battery-080-charging.svg similarity index 100% rename from panel/24-24/gpm-battery-080-charging.svg rename to panel/24/gpm-battery-080-charging.svg diff --git a/panel/24-24/gpm-battery-080.svg b/panel/24/gpm-battery-080.svg similarity index 100% rename from panel/24-24/gpm-battery-080.svg rename to panel/24/gpm-battery-080.svg diff --git a/panel/24-24/gpm-battery-100-charging.svg b/panel/24/gpm-battery-100-charging.svg similarity index 100% rename from panel/24-24/gpm-battery-100-charging.svg rename to panel/24/gpm-battery-100-charging.svg diff --git a/panel/24-24/gpm-battery-100.svg b/panel/24/gpm-battery-100.svg similarity index 100% rename from panel/24-24/gpm-battery-100.svg rename to panel/24/gpm-battery-100.svg diff --git a/panel/24-24/gpm-battery-charged.svg b/panel/24/gpm-battery-charged.svg similarity index 100% rename from panel/24-24/gpm-battery-charged.svg rename to panel/24/gpm-battery-charged.svg diff --git a/panel/24-24/gpm-ups-000-charging.svg b/panel/24/gpm-ups-000-charging.svg similarity index 100% rename from panel/24-24/gpm-ups-000-charging.svg rename to panel/24/gpm-ups-000-charging.svg diff --git a/panel/24-24/gpm-ups-020-charging.svg b/panel/24/gpm-ups-020-charging.svg similarity index 100% rename from panel/24-24/gpm-ups-020-charging.svg rename to panel/24/gpm-ups-020-charging.svg diff --git a/panel/24-24/gpm-ups-020.svg b/panel/24/gpm-ups-020.svg similarity index 100% rename from panel/24-24/gpm-ups-020.svg rename to panel/24/gpm-ups-020.svg diff --git a/panel/24-24/gpm-ups-040-charging.svg b/panel/24/gpm-ups-040-charging.svg similarity index 100% rename from panel/24-24/gpm-ups-040-charging.svg rename to panel/24/gpm-ups-040-charging.svg diff --git a/panel/24-24/gpm-ups-040.svg b/panel/24/gpm-ups-040.svg similarity index 100% rename from panel/24-24/gpm-ups-040.svg rename to panel/24/gpm-ups-040.svg diff --git a/panel/24-24/gpm-ups-060-charging.svg b/panel/24/gpm-ups-060-charging.svg similarity index 100% rename from panel/24-24/gpm-ups-060-charging.svg rename to panel/24/gpm-ups-060-charging.svg diff --git a/panel/24-24/gpm-ups-060.svg b/panel/24/gpm-ups-060.svg similarity index 100% rename from panel/24-24/gpm-ups-060.svg rename to panel/24/gpm-ups-060.svg diff --git a/panel/24-24/gpm-ups-080-charging.svg b/panel/24/gpm-ups-080-charging.svg similarity index 100% rename from panel/24-24/gpm-ups-080-charging.svg rename to panel/24/gpm-ups-080-charging.svg diff --git a/panel/24-24/gpm-ups-080.svg b/panel/24/gpm-ups-080.svg similarity index 100% rename from panel/24-24/gpm-ups-080.svg rename to panel/24/gpm-ups-080.svg diff --git a/panel/24-24/gpm-ups-100-charging.svg b/panel/24/gpm-ups-100-charging.svg similarity index 100% rename from panel/24-24/gpm-ups-100-charging.svg rename to panel/24/gpm-ups-100-charging.svg diff --git a/panel/24-24/gpm-ups-100.svg b/panel/24/gpm-ups-100.svg similarity index 100% rename from panel/24-24/gpm-ups-100.svg rename to panel/24/gpm-ups-100.svg diff --git a/panel/24-24/microphone-sensitivity-muted.svg b/panel/24/microphone-sensitivity-muted.svg similarity index 100% rename from panel/24-24/microphone-sensitivity-muted.svg rename to panel/24/microphone-sensitivity-muted.svg diff --git a/panel/24-24/volume-level-high-panel.svg b/panel/24/volume-level-high-panel.svg similarity index 100% rename from panel/24-24/volume-level-high-panel.svg rename to panel/24/volume-level-high-panel.svg diff --git a/panel/24-24/volume-level-high.svg b/panel/24/volume-level-high.svg similarity index 100% rename from panel/24-24/volume-level-high.svg rename to panel/24/volume-level-high.svg diff --git a/panel/24-24/volume-level-low-panel.svg b/panel/24/volume-level-low-panel.svg similarity index 100% rename from panel/24-24/volume-level-low-panel.svg rename to panel/24/volume-level-low-panel.svg diff --git a/panel/24-24/volume-level-low.svg b/panel/24/volume-level-low.svg similarity index 100% rename from panel/24-24/volume-level-low.svg rename to panel/24/volume-level-low.svg diff --git a/panel/24-24/volume-level-medium-panel.svg b/panel/24/volume-level-medium-panel.svg similarity index 100% rename from panel/24-24/volume-level-medium-panel.svg rename to panel/24/volume-level-medium-panel.svg diff --git a/panel/24-24/volume-level-medium.svg b/panel/24/volume-level-medium.svg similarity index 100% rename from panel/24-24/volume-level-medium.svg rename to panel/24/volume-level-medium.svg diff --git a/panel/24-24/volume-level-muted-panel.svg b/panel/24/volume-level-muted-panel.svg similarity index 100% rename from panel/24-24/volume-level-muted-panel.svg rename to panel/24/volume-level-muted-panel.svg diff --git a/panel/24-24/volume-level-muted.svg b/panel/24/volume-level-muted.svg similarity index 100% rename from panel/24-24/volume-level-muted.svg rename to panel/24/volume-level-muted.svg diff --git a/panel/24-24/volume-level-none-panel.svg b/panel/24/volume-level-none-panel.svg similarity index 100% rename from panel/24-24/volume-level-none-panel.svg rename to panel/24/volume-level-none-panel.svg diff --git a/panel/24-24/volume-level-none.svg b/panel/24/volume-level-none.svg similarity index 100% rename from panel/24-24/volume-level-none.svg rename to panel/24/volume-level-none.svg diff --git a/panel/24-24/xfce4-battery-caution-charging.svg b/panel/24/xfce4-battery-caution-charging.svg similarity index 100% rename from panel/24-24/xfce4-battery-caution-charging.svg rename to panel/24/xfce4-battery-caution-charging.svg diff --git a/panel/24-24/xfce4-battery-critical-charging.svg b/panel/24/xfce4-battery-critical-charging.svg similarity index 100% rename from panel/24-24/xfce4-battery-critical-charging.svg rename to panel/24/xfce4-battery-critical-charging.svg diff --git a/panel/24-24/xfce4-battery-full-charging.svg b/panel/24/xfce4-battery-full-charging.svg similarity index 100% rename from panel/24-24/xfce4-battery-full-charging.svg rename to panel/24/xfce4-battery-full-charging.svg diff --git a/panel/24-24/xfce4-battery-full.svg b/panel/24/xfce4-battery-full.svg similarity index 100% rename from panel/24-24/xfce4-battery-full.svg rename to panel/24/xfce4-battery-full.svg diff --git a/panel/24-24/xfce4-battery-good-charging.svg b/panel/24/xfce4-battery-good-charging.svg similarity index 100% rename from panel/24-24/xfce4-battery-good-charging.svg rename to panel/24/xfce4-battery-good-charging.svg diff --git a/panel/24-24/xfce4-battery-good.svg b/panel/24/xfce4-battery-good.svg similarity index 100% rename from panel/24-24/xfce4-battery-good.svg rename to panel/24/xfce4-battery-good.svg diff --git a/panel/24-24/xfce4-battery-low-charging.svg b/panel/24/xfce4-battery-low-charging.svg similarity index 100% rename from panel/24-24/xfce4-battery-low-charging.svg rename to panel/24/xfce4-battery-low-charging.svg diff --git a/panel/24-24/xfce4-battery-low.svg b/panel/24/xfce4-battery-low.svg similarity index 100% rename from panel/24-24/xfce4-battery-low.svg rename to panel/24/xfce4-battery-low.svg diff --git a/panel/24-24/xfce4-battery-ok-charging.svg b/panel/24/xfce4-battery-ok-charging.svg similarity index 100% rename from panel/24-24/xfce4-battery-ok-charging.svg rename to panel/24/xfce4-battery-ok-charging.svg diff --git a/panel/24-24/xfce4-battery-ok.svg b/panel/24/xfce4-battery-ok.svg similarity index 100% rename from panel/24-24/xfce4-battery-ok.svg rename to panel/24/xfce4-battery-ok.svg diff --git a/panel/24-24/xfce4-battery-plugin.svg b/panel/24/xfce4-battery-plugin.svg similarity index 100% rename from panel/24-24/xfce4-battery-plugin.svg rename to panel/24/xfce4-battery-plugin.svg diff --git a/panel/24-24/xfce4-mixer-volume-high.svg b/panel/24/xfce4-mixer-volume-high.svg similarity index 100% rename from panel/24-24/xfce4-mixer-volume-high.svg rename to panel/24/xfce4-mixer-volume-high.svg diff --git a/panel/24-24/xfce4-mixer-volume-low-medium.svg b/panel/24/xfce4-mixer-volume-low-medium.svg similarity index 100% rename from panel/24-24/xfce4-mixer-volume-low-medium.svg rename to panel/24/xfce4-mixer-volume-low-medium.svg diff --git a/panel/24-24/xfce4-mixer-volume-low.svg b/panel/24/xfce4-mixer-volume-low.svg similarity index 100% rename from panel/24-24/xfce4-mixer-volume-low.svg rename to panel/24/xfce4-mixer-volume-low.svg diff --git a/panel/24-24/xfce4-mixer-volume-medium.svg b/panel/24/xfce4-mixer-volume-medium.svg similarity index 100% rename from panel/24-24/xfce4-mixer-volume-medium.svg rename to panel/24/xfce4-mixer-volume-medium.svg diff --git a/panel/24-24/xfce4-mixer-volume-muted.svg b/panel/24/xfce4-mixer-volume-muted.svg similarity index 100% rename from panel/24-24/xfce4-mixer-volume-muted.svg rename to panel/24/xfce4-mixer-volume-muted.svg diff --git a/panel/24-24/xfce4-mixer-volume-ultra-low.svg b/panel/24/xfce4-mixer-volume-ultra-low.svg similarity index 100% rename from panel/24-24/xfce4-mixer-volume-ultra-low.svg rename to panel/24/xfce4-mixer-volume-ultra-low.svg diff --git a/panel/24-24/xfce4-mixer-volume-very-high.svg b/panel/24/xfce4-mixer-volume-very-high.svg similarity index 100% rename from panel/24-24/xfce4-mixer-volume-very-high.svg rename to panel/24/xfce4-mixer-volume-very-high.svg diff --git a/panel/24-24/xfpm-battery-000-charging.svg b/panel/24/xfpm-battery-000-charging.svg similarity index 100% rename from panel/24-24/xfpm-battery-000-charging.svg rename to panel/24/xfpm-battery-000-charging.svg diff --git a/panel/24-24/xfpm-battery-020-charging.svg b/panel/24/xfpm-battery-020-charging.svg similarity index 100% rename from panel/24-24/xfpm-battery-020-charging.svg rename to panel/24/xfpm-battery-020-charging.svg diff --git a/panel/24-24/xfpm-battery-020.svg b/panel/24/xfpm-battery-020.svg similarity index 100% rename from panel/24-24/xfpm-battery-020.svg rename to panel/24/xfpm-battery-020.svg diff --git a/panel/24-24/xfpm-battery-040-charging.svg b/panel/24/xfpm-battery-040-charging.svg similarity index 100% rename from panel/24-24/xfpm-battery-040-charging.svg rename to panel/24/xfpm-battery-040-charging.svg diff --git a/panel/24-24/xfpm-battery-040.svg b/panel/24/xfpm-battery-040.svg similarity index 100% rename from panel/24-24/xfpm-battery-040.svg rename to panel/24/xfpm-battery-040.svg diff --git a/panel/24-24/xfpm-battery-060-charging.svg b/panel/24/xfpm-battery-060-charging.svg similarity index 100% rename from panel/24-24/xfpm-battery-060-charging.svg rename to panel/24/xfpm-battery-060-charging.svg diff --git a/panel/24-24/xfpm-battery-060.svg b/panel/24/xfpm-battery-060.svg similarity index 100% rename from panel/24-24/xfpm-battery-060.svg rename to panel/24/xfpm-battery-060.svg diff --git a/panel/24-24/xfpm-battery-080-charging.svg b/panel/24/xfpm-battery-080-charging.svg similarity index 100% rename from panel/24-24/xfpm-battery-080-charging.svg rename to panel/24/xfpm-battery-080-charging.svg diff --git a/panel/24-24/xfpm-battery-080.svg b/panel/24/xfpm-battery-080.svg similarity index 100% rename from panel/24-24/xfpm-battery-080.svg rename to panel/24/xfpm-battery-080.svg diff --git a/panel/24-24/xfpm-battery-100-charging.svg b/panel/24/xfpm-battery-100-charging.svg similarity index 100% rename from panel/24-24/xfpm-battery-100-charging.svg rename to panel/24/xfpm-battery-100-charging.svg diff --git a/panel/24-24/xfpm-battery-100.svg b/panel/24/xfpm-battery-100.svg similarity index 100% rename from panel/24-24/xfpm-battery-100.svg rename to panel/24/xfpm-battery-100.svg diff --git a/panel/24-24/xfpm-battery-caution-charging.svg b/panel/24/xfpm-battery-caution-charging.svg similarity index 100% rename from panel/24-24/xfpm-battery-caution-charging.svg rename to panel/24/xfpm-battery-caution-charging.svg diff --git a/panel/24-24/xfpm-battery-critical-charging.svg b/panel/24/xfpm-battery-critical-charging.svg similarity index 100% rename from panel/24-24/xfpm-battery-critical-charging.svg rename to panel/24/xfpm-battery-critical-charging.svg diff --git a/panel/24-24/xfpm-battery-full-charging.svg b/panel/24/xfpm-battery-full-charging.svg similarity index 100% rename from panel/24-24/xfpm-battery-full-charging.svg rename to panel/24/xfpm-battery-full-charging.svg diff --git a/panel/24-24/xfpm-battery-full.svg b/panel/24/xfpm-battery-full.svg similarity index 100% rename from panel/24-24/xfpm-battery-full.svg rename to panel/24/xfpm-battery-full.svg diff --git a/panel/24-24/xfpm-battery-good-charging.svg b/panel/24/xfpm-battery-good-charging.svg similarity index 100% rename from panel/24-24/xfpm-battery-good-charging.svg rename to panel/24/xfpm-battery-good-charging.svg diff --git a/panel/24-24/xfpm-battery-good.svg b/panel/24/xfpm-battery-good.svg similarity index 100% rename from panel/24-24/xfpm-battery-good.svg rename to panel/24/xfpm-battery-good.svg diff --git a/panel/24-24/xfpm-battery-low-charging.svg b/panel/24/xfpm-battery-low-charging.svg similarity index 100% rename from panel/24-24/xfpm-battery-low-charging.svg rename to panel/24/xfpm-battery-low-charging.svg diff --git a/panel/24-24/xfpm-battery-low.svg b/panel/24/xfpm-battery-low.svg similarity index 100% rename from panel/24-24/xfpm-battery-low.svg rename to panel/24/xfpm-battery-low.svg diff --git a/panel/24-24/xfpm-battery-ok-charging.svg b/panel/24/xfpm-battery-ok-charging.svg similarity index 100% rename from panel/24-24/xfpm-battery-ok-charging.svg rename to panel/24/xfpm-battery-ok-charging.svg diff --git a/panel/24-24/xfpm-battery-ok.svg b/panel/24/xfpm-battery-ok.svg similarity index 100% rename from panel/24-24/xfpm-battery-ok.svg rename to panel/24/xfpm-battery-ok.svg