diff --git a/customizations/device-tracker.yaml b/customizations/device-tracker.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3215d67fc9cbda8f606dc2bc3536a7c715d1a6ae
--- /dev/null
+++ b/customizations/device-tracker.yaml
@@ -0,0 +1,2 @@
+device_tracker.green_keys:
+  icon: mdi:key
diff --git a/customizations/scenes.yaml b/customizations/scenes.yaml
index 8070a85f3ed3727cdc1a42a19d711e9d87fb23c8..d44ab2da23d69cdc61016cad2cdc21cc9395d629 100755
--- a/customizations/scenes.yaml
+++ b/customizations/scenes.yaml
@@ -1,62 +1,93 @@
 scene.master_bedroom_nightlight:
   friendly_name: 'Nightlight'
+  icon: mdi:brightness-7
 scene.master_bedroom_dimmed:
   friendly_name: 'Dimmed'
+  icon: mdi:brightness-4
 scene.master_bedroom_relax:
   friendly_name: 'Relax'
+  icon: mdi:brightness-6
 scene.master_bedroom_read:
   friendly_name: 'Read'
+  icon: mdi:brightness-5
 scene.master_bedroom_concentrate:
   friendly_name: 'Bright'
+  icon: mdi:star-circle
 scene.master_bath_nightlight:
   friendly_name: 'Nightlight'
+  icon: mdi:brightness-7
 scene.master_bath_dimmed:
   friendly_name: 'Dimmed'
+  icon: mdi:brightness-4
 scene.master_bath_relax:
   friendly_name: 'Relax'
+  icon: mdi:brightness-6
 scene.master_bath_read:
   friendly_name: 'Read'
+  icon: mdi:brightness-5
 scene.master_bath_concentrate:
   friendly_name: 'Bright'
+  icon: mdi:star-circle
 scene.lr_nightlight:
   friendly_name: 'Nightlight'
+  icon: mdi:brightness-7
 scene.lr_dimmed:
   friendly_name: 'Dimmed'
+  icon: mdi:brightness-4
 scene.lr_relax:
   friendly_name: 'Relax'
+  icon: mdi:brightness-6
 scene.lr_read:
   friendly_name: 'Read'
+  icon: mdi:brightness-5
 scene.lr_concentrate:
   friendly_name: 'Bright'
+  icon: mdi:star-circle
 scene.da_nightlight:
   friendly_name: 'Nightlight'
+  icon: mdi:brightness-7
 scene.da_dimmed:
   friendly_name: 'Dimmed'
+  icon: mdi:brightness-4
 scene.da_relax:
   friendly_name: 'Relax'
+  icon: mdi:brightness-6
 scene.da_read:
   friendly_name: 'Read'
+  icon: mdi:brightness-5
 scene.da_concentrate:
   friendly_name: 'Bright'
+  icon: mdi:star-circle
 scene.office_nightlight:
   friendly_name: 'Nightlight'
+  icon: mdi:brightness-7
 scene.office_dimmed:
   friendly_name: 'Dimmed'
+  icon: mdi:brightness-4
 scene.office_relax:
   friendly_name: 'Relax'
+  icon: mdi:brightness-6
 scene.office_read:
   friendly_name: 'Read'
+  icon: mdi:brightness-5
 scene.office_concentrate:
   friendly_name: 'Bright'
+  icon: mdi:star-circle
 scene.ericks_desk_lamp_nightlight:
   friendly_name: 'Desk Lamp Dim'
+  icon: mdi:brightness-3
 scene.ericks_desk_lamp_relax:
   friendly_name: 'Desk Lamp Bright'
+  icon: mdi:brightness-1
 scene.balcony_dimmed:
   friendly_name: 'Dimmed'
+  icon: mdi:brightness-4
 scene.balcony_relax:
   friendly_name: 'Relax'
+  icon: mdi:brightness-6
 scene.balcony_read:
   friendly_name: 'Read'
+  icon: mdi:brightness-5
 scene.balcony_concentrate:
   friendly_name: 'Bright'
+  icon: mdi:star-circle
diff --git a/customizations/sensors.yaml b/customizations/sensors.yaml
index ea5a1b1efc449e97833b546d60f7d9d729259b64..f41a5fb913442a52b4ecc995df61fae5528ec853 100755
--- a/customizations/sensors.yaml
+++ b/customizations/sensors.yaml
@@ -4,3 +4,33 @@ sensor.speedtest_download:
   icon: mdi:download
 sensor.speedtest_upload:
   icon: mdi:upload
+sensor.lava_lamp_consumption:
+  icon: mdi:radiator
+sensor.living_room_alarm_battery_level:
+  icon: mdi:battery
+sensor.master_bedroom_alarm_battery_level:
+  icon: mdi:battery
+sensor.front_door_battery_level:
+  icon: mdi:battery
+sensor.slider_battery_level:
+  icon: mdi:battery
+sensor.master_bedroom_window_battery_level:
+  icon: mdi:battery
+sensor.dining_area_window_battery_level:
+  icon: mdi:battery
+sensor.office_window_battery_level:
+  icon: mdi:battery
+sensor.motion_sensor_above_slider_battery_level:
+  icon: mdi:battery
+sensor.motion_sensor_over_utility_closet_battery_level:
+  icon: mdi:battery
+sensor.kitchen_motion_sensor_battery_level:
+  icon: mdi:battery
+sensor.office_motion_sensor_near_closet_battery_level:
+  icon: mdi:battery
+sensor.office_motion_sensor_far_wall_battery_level:
+  icon: mdi:battery
+sensor.office_cabinet_battery_level:
+  icon: mdi:battery
+sensor.green_keys_battery_level:
+  icon: mdi:battery
diff --git a/customizations/switches.yaml b/customizations/switches.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..dee265ad40414731ae2edaa3af4274929e6ed774
--- /dev/null
+++ b/customizations/switches.yaml
@@ -0,0 +1,4 @@
+switch.lava_lamp:
+  icon: mdi:led-on
+switch.wireless_charger:
+  icon: mdi:battery-charging
diff --git a/device-tracker.yaml b/device-tracker.yaml
index c9a42e670a2fa570d7bd27d4b7e1eca2f93c34da..5c0abeb8263ac6b72afba723042ffff2e747dd03 100755
--- a/device-tracker.yaml
+++ b/device-tracker.yaml
@@ -8,3 +8,4 @@
   mode: router
   username: -
   ssh_key: -
+  consider_home: 90