diff --git a/appdaemon/apps/vacuum.py b/appdaemon/apps/vacuum.py
index e68a90a..7bbd439 100644
--- a/appdaemon/apps/vacuum.py
+++ b/appdaemon/apps/vacuum.py
@@ -13,12 +13,12 @@ class Vacuum(Entities):
             name = f'switch.vacuum_{zone}'
             self.register_entity(zone, name, True, "off", e)
 
-        self.listen_event(self.zone, 'VACUUM_ZONE')
-        self.listen_event(self.all, 'VACUUM_ALL')
+        self.listen_event(self.clean_zone, 'VACUUM_ZONE')
+        self.listen_event(self.clean_all, 'VACUUM_ALL')
         self.listen_event(self.service, 'VACUUM_SERVICE')
         self.listen_event(self.home, 'VACUUM_HOME')
 
-    def zone(self, ev, data, kwargs):
+    def clean_zone(self, ev, data, kwargs):
         areas = []
         for zone in self.args['zones']:
             if self.e[zone].state == "on":
@@ -26,7 +26,7 @@ class Vacuum(Entities):
 
         self.call_service("vacuum/xiaomi_clean_zone", repeats = 1, zone = areas)
 
-    def all(self, ev, data, kwargs):
+    def clean_all(self, ev, data, kwargs):
         self.call_service("vacuum/start")
     def service(self, ev, data, kwargs):
         self.call_service("vacuum/send_command", entity_id = self.entity_id, command = 'app_goto_target', params = self.args['empty_spot'])
diff --git a/appdaemon/apps/vacuum.yaml b/appdaemon/apps/vacuum.yaml
index 661c0f6..fe6f1d2 100644
--- a/appdaemon/apps/vacuum.yaml
+++ b/appdaemon/apps/vacuum.yaml
@@ -14,16 +14,21 @@ vacuum:
       # Left, bottom, right, top
       area: [23200, 21000, 27500, 25100]
       friendly_name: Köket
+      icon: mdi:floor-plan
     hall:
       area: [23200, 25300, 27500, 28000]
       friendly_name: Hallen
+      icon: mdi:floor-plan
     livingroom:
       area: [19000, 24000, 23000, 31200]
       friendly_name: Vardagsrum
+      icon: mdi:floor-plan
     bedroom:
       area: [19000, 31500, 23500, 35500]
       friendly_name: Sovrum
+      icon: mdi:floor-plan
     office:
       area: [23300, 31000, 27500, 35500]
       friendly_name: Kontoret
+      icon: mdi:floor-plan