diff --git a/config/www/custom_ui/floorplan/images/icons/12PortPOE.svg b/config/www/custom_ui/floorplan/icons/12PortPOE.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/12PortPOE.svg
rename to config/www/custom_ui/floorplan/icons/12PortPOE.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/AMP_MIXER.svg b/config/www/custom_ui/floorplan/icons/AMP_MIXER.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/AMP_MIXER.svg
rename to config/www/custom_ui/floorplan/icons/AMP_MIXER.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/Alexa.svg b/config/www/custom_ui/floorplan/icons/Alexa.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/Alexa.svg
rename to config/www/custom_ui/floorplan/icons/Alexa.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/AmazonPolly.svg b/config/www/custom_ui/floorplan/icons/AmazonPolly.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/AmazonPolly.svg
rename to config/www/custom_ui/floorplan/icons/AmazonPolly.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/BackYard.svg b/config/www/custom_ui/floorplan/icons/BackYard.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/BackYard.svg
rename to config/www/custom_ui/floorplan/icons/BackYard.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/Cameras.svg b/config/www/custom_ui/floorplan/icons/Cameras.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/Cameras.svg
rename to config/www/custom_ui/floorplan/icons/Cameras.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/Cellphones.svg b/config/www/custom_ui/floorplan/icons/Cellphones.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/Cellphones.svg
rename to config/www/custom_ui/floorplan/icons/Cellphones.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/Dasher.svg b/config/www/custom_ui/floorplan/icons/Dasher.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/Dasher.svg
rename to config/www/custom_ui/floorplan/icons/Dasher.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/Docker.svg b/config/www/custom_ui/floorplan/icons/Docker.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/Docker.svg
rename to config/www/custom_ui/floorplan/icons/Docker.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/ESPHomeYAML.svg b/config/www/custom_ui/floorplan/icons/ESPHomeYAML.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/ESPHomeYAML.svg
rename to config/www/custom_ui/floorplan/icons/ESPHomeYAML.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/Echo.svg b/config/www/custom_ui/floorplan/icons/Echo.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/Echo.svg
rename to config/www/custom_ui/floorplan/icons/Echo.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/FrontEnd.svg b/config/www/custom_ui/floorplan/icons/FrontEnd.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/FrontEnd.svg
rename to config/www/custom_ui/floorplan/icons/FrontEnd.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/FrontYard.svg b/config/www/custom_ui/floorplan/icons/FrontYard.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/FrontYard.svg
rename to config/www/custom_ui/floorplan/icons/FrontYard.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/Grafana.svg b/config/www/custom_ui/floorplan/icons/Grafana.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/Grafana.svg
rename to config/www/custom_ui/floorplan/icons/Grafana.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/HomeAssistant.svg b/config/www/custom_ui/floorplan/icons/HomeAssistant.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/HomeAssistant.svg
rename to config/www/custom_ui/floorplan/icons/HomeAssistant.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/HomeBridge.svg b/config/www/custom_ui/floorplan/icons/HomeBridge.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/HomeBridge.svg
rename to config/www/custom_ui/floorplan/icons/HomeBridge.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/HueHub.svg b/config/www/custom_ui/floorplan/icons/HueHub.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/HueHub.svg
rename to config/www/custom_ui/floorplan/icons/HueHub.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/IFTT.svg b/config/www/custom_ui/floorplan/icons/IFTT.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/IFTT.svg
rename to config/www/custom_ui/floorplan/icons/IFTT.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/InFluxDB.svg b/config/www/custom_ui/floorplan/icons/InFluxDB.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/InFluxDB.svg
rename to config/www/custom_ui/floorplan/icons/InFluxDB.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/InteriorDoors.svg b/config/www/custom_ui/floorplan/icons/InteriorDoors.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/InteriorDoors.svg
rename to config/www/custom_ui/floorplan/icons/InteriorDoors.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/Internet.svg b/config/www/custom_ui/floorplan/icons/Internet.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/Internet.svg
rename to config/www/custom_ui/floorplan/icons/Internet.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/JuiceBox.svg b/config/www/custom_ui/floorplan/icons/JuiceBox.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/JuiceBox.svg
rename to config/www/custom_ui/floorplan/icons/JuiceBox.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/LAN.svg b/config/www/custom_ui/floorplan/icons/LAN.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/LAN.svg
rename to config/www/custom_ui/floorplan/icons/LAN.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/MQTT.svg b/config/www/custom_ui/floorplan/icons/MQTT.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/MQTT.svg
rename to config/www/custom_ui/floorplan/icons/MQTT.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/MuxMux.svg b/config/www/custom_ui/floorplan/icons/MuxMux.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/MuxMux.svg
rename to config/www/custom_ui/floorplan/icons/MuxMux.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/Nest.svg b/config/www/custom_ui/floorplan/icons/Nest.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/Nest.svg
rename to config/www/custom_ui/floorplan/icons/Nest.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/NestProtect.svg b/config/www/custom_ui/floorplan/icons/NestProtect.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/NestProtect.svg
rename to config/www/custom_ui/floorplan/icons/NestProtect.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/NodeMCU.svg b/config/www/custom_ui/floorplan/icons/NodeMCU.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/NodeMCU.svg
rename to config/www/custom_ui/floorplan/icons/NodeMCU.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/Outlet.svg b/config/www/custom_ui/floorplan/icons/Outlet.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/Outlet.svg
rename to config/www/custom_ui/floorplan/icons/Outlet.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/RMPro433Mhz.svg b/config/www/custom_ui/floorplan/icons/RMPro433Mhz.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/RMPro433Mhz.svg
rename to config/www/custom_ui/floorplan/icons/RMPro433Mhz.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/Rachio.svg b/config/www/custom_ui/floorplan/icons/Rachio.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/Rachio.svg
rename to config/www/custom_ui/floorplan/icons/Rachio.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/ReedSwithces.svg b/config/www/custom_ui/floorplan/icons/ReedSwithces.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/ReedSwithces.svg
rename to config/www/custom_ui/floorplan/icons/ReedSwithces.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/RoomKiosk.svg b/config/www/custom_ui/floorplan/icons/RoomKiosk.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/RoomKiosk.svg
rename to config/www/custom_ui/floorplan/icons/RoomKiosk.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/SleepIQPresence.svg b/config/www/custom_ui/floorplan/icons/SleepIQPresence.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/SleepIQPresence.svg
rename to config/www/custom_ui/floorplan/icons/SleepIQPresence.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/SmartBlubs.svg b/config/www/custom_ui/floorplan/icons/SmartBlubs.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/SmartBlubs.svg
rename to config/www/custom_ui/floorplan/icons/SmartBlubs.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/SolarPower.svg b/config/www/custom_ui/floorplan/icons/SolarPower.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/SolarPower.svg
rename to config/www/custom_ui/floorplan/icons/SolarPower.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/TP-Link.svg b/config/www/custom_ui/floorplan/icons/TP-Link.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/TP-Link.svg
rename to config/www/custom_ui/floorplan/icons/TP-Link.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/Tesla.svg b/config/www/custom_ui/floorplan/icons/Tesla.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/Tesla.svg
rename to config/www/custom_ui/floorplan/icons/Tesla.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/Twitter.svg b/config/www/custom_ui/floorplan/icons/Twitter.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/Twitter.svg
rename to config/www/custom_ui/floorplan/icons/Twitter.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/UniFi.svg b/config/www/custom_ui/floorplan/icons/UniFi.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/UniFi.svg
rename to config/www/custom_ui/floorplan/icons/UniFi.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/WholeHouseTTS.svg b/config/www/custom_ui/floorplan/icons/WholeHouseTTS.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/WholeHouseTTS.svg
rename to config/www/custom_ui/floorplan/icons/WholeHouseTTS.svg
diff --git a/config/www/custom_ui/floorplan/images/icons/WinkHome.svg b/config/www/custom_ui/floorplan/icons/WinkHome.svg
similarity index 100%
rename from config/www/custom_ui/floorplan/images/icons/WinkHome.svg
rename to config/www/custom_ui/floorplan/icons/WinkHome.svg