diff --git a/input_boolean.yaml b/input_boolean.yaml
index 7af299b..820d725 100644
--- a/input_boolean.yaml
+++ b/input_boolean.yaml
@@ -1,15 +1,21 @@
 kallen_school:
   name: Kallen at School
+  icon: mdi:school
 good_morning_report:
-  name: Good Morning Report 
+  name: Good Morning Report
+  icon: mdi:home-analytics
 weather_reports:
-  name: Weather Info 
+  name: Weather Info
+  icon: mdi:weather-cloudy-alert
 traffic_reports:
   name: Traffic Reports
+  icon: mdi:traffic-light
 sun_reports:
-  name: Sun Reports 
+  name: Sun Reports
+  icon: mdi:weather-sunny-alert
 shuffle_spotify:
   name: Spotify Shuffle
+  icon: mdi:spotify
 tornado_watch:
   name: Tornado Watch
   icon: mdi:message-alert
@@ -18,6 +24,7 @@ vacation_mode:
   icon: mdi:umbrella-beach
 living_room_entertainment_mode:
   name: Living Room Entertainment Mode
+  icon: mdi:party-popper
 front_porch_light_on:
   name: Front Porch Light On
   icon: hue:room-outdoors
diff --git a/input_datetime.yaml b/input_datetime.yaml
index d1f0723..b1df768 100644
--- a/input_datetime.yaml
+++ b/input_datetime.yaml
@@ -2,3 +2,4 @@ announcement_delay:
   name: Announcement Delay
   has_date: false
   has_time: true
+  icon: mdi:clock-edit
\ No newline at end of file
diff --git a/packages/announcements.yaml b/packages/announcements.yaml
index adad739..6574d58 100644
--- a/packages/announcements.yaml
+++ b/packages/announcements.yaml
@@ -7,30 +7,37 @@ input_datetime:
     name: Morning Report
     has_date: false
     has_time: true
+    icon: mdi:home-analytics
   nightly_report:
     name: Nightly Report
     has_date: false
     has_time: true
+    icon: mdi:home-analytics
   daily_report:
     name: Daily Report
     has_date: false
     has_time: true
+    icon: mdi:home-analytics
   kallen_morning_briefing:
     name: Kallen Morning Briefing
     has_date: false
     has_time: true
+    icon: mdi:weather-sunset-up
   kallen_nightly_briefing:
     name: Kallen Nightly Briefing
     has_date: false
     has_time: true
+    icon: mdi:weather-night
   audible_notification_on:
     name: Audible Notifications On
     has_date: false
     has_time: true
+    icon: mdi:volume-high
   audible_notification_off:
     name: Audible Notifications Off
     has_date: false
     has_time: true
+    icon: mdi:volume-off
 
 ################################
 # Announcment Automation - fires at the time of the above input_datetimes
diff --git a/packages/events.yaml b/packages/events.yaml
index 7182386..53ae39f 100644
--- a/packages/events.yaml
+++ b/packages/events.yaml
@@ -17,38 +17,47 @@ input_datetime:
     name: First Day of School
     has_date: true
     has_time: false
+    icon: mdi:calendar
   school_last_day:
     name: Last Day of School
     has_date: true
     has_time: false
+    icon: mdi:calendar
   school_day_start:
     name: School Day Start
     has_date: false
     has_time: true
+    icon: mdi:clock-start
   school_day_end:
     name: School Day End
     has_date: false
     has_time: true
+    icon: mdi:clock-end
   thanksgiving_break_start:
     name: Thanksgiving Break
     has_date: true
     has_time: false
+    icon: mdi:calendar-start
   christmas_break_start:
     name: Christmas Break
     has_date: true
     has_time: false
+    icon: mdi:calendar-start
   spring_break_start:
     name: Spring Break
     has_date: true
     has_time: false
+    icon: mdi:calendar-start
   school_day_start_reminder:
     name: School Day Start Reminder
     has_date: false
     has_time: true
+    icon: mdi:clock-alert
   school_day_end_reminder:
     name: School Day End Reminder
     has_date: false
     has_time: true
+    icon: mdi:clock-alert
   tina_workday_start:
     name: Tina Workday Start
     has_date: false
diff --git a/packages/jarvis.yaml b/packages/jarvis.yaml
index 3e4a1ea..111f346 100644
--- a/packages/jarvis.yaml
+++ b/packages/jarvis.yaml
@@ -10,6 +10,7 @@
 input_boolean:
   house_party_protocol_switch:
     name: House Party Switch
+    icon: mdi:party-popper
 
 # automation:
 #   - id: house_party_protocol_on
diff --git a/packages/notify.yaml b/packages/notify.yaml
index 17bdd8f..658cf65 100644
--- a/packages/notify.yaml
+++ b/packages/notify.yaml
@@ -67,10 +67,15 @@ input_boolean:
   presence_notifications_tina:
     name: Send Tina Presence Texts
     icon: mdi:message
+  trash_notification:
+    name: Trash Notification
+    icon: mdi:delete
   welcome_home:
     name: Welcome Home
+    icon: mdi:human-greeting
   debug_texts:
     name: Debug Texts
+    icon: mdi:debug-step-over
 
 # Amazon Polly Sensors to see last message and location of audible notification
 mqtt:
diff --git a/packages/presence.yaml b/packages/presence.yaml
index 2b8fe25..1675289 100644
--- a/packages/presence.yaml
+++ b/packages/presence.yaml
@@ -3,14 +3,17 @@ input_datetime:
     name: Tony Last Seen
     has_date: true
     has_time: true
+    icon: mdi:binoculars
   last_time_home_tina:
     name: Tina Last Seen
     has_date: true
     has_time: true
+    icon: mdi:binoculars
   last_time_home_kallen:
     name: Kallen Last Seen
     has_date: true
     has_time: true
+    icon: mdi:binoculars
 
 proximity:
   home_tony:
@@ -38,6 +41,7 @@ sensor:
     sensors:
       tony_location:
         friendly_name: "Tony"
+        icon: mdi:map-marker
         unit_of_measurement: ""
         value_template: >-
           {% set person = states.person.tony_stork.state %}
@@ -54,6 +58,7 @@ sensor:
     sensors:
       tina_location:
         friendly_name: "Tina"
+        icon: mdi:map-marker
         unit_of_measurement: ""
         value_template: >-
           {% set person = states.person.christina_stork.state %}
@@ -72,6 +77,7 @@ sensor:
     sensors:
       kallen_location:
         friendly_name: "Kallen"
+        icon: mdi:map-marker
         unit_of_measurement: ""
         value_template: >-
           {% if is_state('input_boolean.kallen_school', 'on') %}
diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml
index 67a92de..38ae7db 100644
--- a/packages/scheduling.yaml
+++ b/packages/scheduling.yaml
@@ -3,18 +3,22 @@ input_datetime:
     name: Good Morning
     has_date: false
     has_time: true
+    icon: mdi:weather-sunset-up
   good_night_routine:
     name: Good Night Routine
     has_date: false
     has_time: true
+    icon: mdi:weather-night
   kallen_bedtime:
     name: Kallen Bedtime
     has_date: false
     has_time: true
+    icon: mdi:weather-night
   kallen_wakeup_time:
     name: Kallen Wake-up Time
     has_date: false
     has_time: true
+    icon: mdi:bell-alert
   master_bedroom_cooling:
     name: Master Bedroom Cooling
     has_date: false
diff --git a/sensors/entertainment.yaml b/sensors/entertainment.yaml
index 1297de2..547f1a7 100644
--- a/sensors/entertainment.yaml
+++ b/sensors/entertainment.yaml
@@ -20,6 +20,7 @@
   sensors:
     basement_tv_current_app:
       friendly_name: 'Basement TV Current App'
+      icon: mdi:television-play
       value_template: >-
         {% if is_state('media_player.basement_tv','off') %}
           Off
@@ -28,6 +29,7 @@
         {% endif %}
     living_room_tv_current_app:
       friendly_name: 'Living Room TV Current App'
+      icon: mdi:television-play
       value_template: >-
         {% if is_state('media_player.living_room_tv','off') %}
           Off
@@ -36,6 +38,7 @@
         {% endif %}
     master_bedroom_tv_current_app:
       friendly_name: 'Master Bedroom TV Current App'
+      icon: mdi:television-play
       value_template: >-
         {% if is_state('media_player.master_bedroom_firetv','off') %}
           Off
diff --git a/sensors/house_stats.yaml b/sensors/house_stats.yaml
index 6b1c774..36c8ff7 100644
--- a/sensors/house_stats.yaml
+++ b/sensors/house_stats.yaml
@@ -42,6 +42,7 @@
         {{ states | selectattr('state', 'eq', 'unavailable') | map(attribute='entity_id') | list | count }}
     current_lights_on:
       friendly_name: Current Lights On
+      icon: mdi:lamps
       unit_of_measurement: 'on'
       value_template: >-
         {% set lights = [
@@ -71,6 +72,7 @@
         {{ lights | selectattr('state','eq','on') | list | count }}
     first_floor_lights_on:
       friendly_name: First Floor Lights On
+      icon: mdi:lamps
       unit_of_measurement: 'on'
       value_template: >-
         {% set lights = [
@@ -87,6 +89,7 @@
         {{ lights | selectattr('state','eq','on') | list | count }}
     second_floor_lights_on:
       friendly_name: Second Floor Lights On
+      icon: mdi:lamps
       unit_of_measurement: 'on'
       value_template: >-
         {% set lights = [
@@ -103,6 +106,7 @@
         {{ lights | selectattr('state','eq','on') | list | count }}
     basement_lights_on:
       friendly_name: Basement Lights On
+      icon: mdi:lamps
       unit_of_measurement: 'on'
       value_template: >-
         {% set lights = [
@@ -114,6 +118,7 @@
         {{ lights | selectattr('state','eq','on') | list | count }}
     current_fans_on:
       friendly_name: Current Fans On
+      icon: mdi:fan
       unit_of_measurement: 'on'
       value_template: >-
         {% set fans = [
@@ -125,6 +130,7 @@
         {{ fans | selectattr('state','eq','on') | list | count }}
     current_outdoor_lights_on:
       friendly_name: Current Outdoor Lights On
+      icon: mdi:outdoor-lamp
       unit_of_measurement: 'on'
       value_template: >-
         {% set lights = [
@@ -133,6 +139,7 @@
         {{ lights | selectattr('state','eq','on') | list | count }}
     front_porch_color_temp:
       friendly_name: Front Porch Color Temp
+      icon: mdi:palette
       unit_of_measurement: 'mireds'
       value_template: >
         {% if is_state('light.front_porch_light','off') %}
@@ -146,6 +153,7 @@
 
 - platform: history_stats
   name: Basement TV Time
+  icon: mdi:chart-timeline-variant-shimmer
   entity_id: media_player.basement_tv
   state: 'playing'
   type: time
@@ -154,6 +162,7 @@
     hours: 24
 - platform: history_stats
   name: Basement TV Chromecast Time
+  icon: mdi:chart-timeline-variant-shimmer
   entity_id: media_player.basement_tv_chromecast
   state: 'playing'
   type: time
@@ -162,6 +171,7 @@
     hours: 24
 - platform: history_stats
   name: Living Room TV Time
+  icon: mdi:chart-timeline-variant-shimmer
   entity_id: media_player.living_room_tv
   state: 'playing'
   type: time
@@ -170,6 +180,7 @@
     hours: 24
 - platform: history_stats
   name: Living Room TV Chromecast Time
+  icon: mdi:chart-timeline-variant-shimmer
   entity_id: media_player.living_room_tv_chromecast
   state: 'playing'
   type: time
@@ -178,6 +189,7 @@
     hours: 24
 - platform: history_stats
   name: Master Bedroom TV Time
+  icon: mdi:chart-timeline-variant-shimmer
   entity_id: media_player.master_bedroom_firetv
   state: 'playing'
   type: time
@@ -186,6 +198,7 @@
     hours: 24
 - platform: history_stats
   name: Living Room Xbox One Time
+  icon: mdi:chart-timeline-variant-shimmer
   entity_id: media_player.xboxone
   state: 'playing'
   type: time
@@ -194,6 +207,7 @@
     hours: 24
 - platform: history_stats
   name: Outside Lights
+  icon: mdi:chart-timeline-variant-shimmer
   entity_id: light.outside_lights
   state: 'on'
   type: time