diff --git a/config/automation/System/update_notification.yaml b/config/automation/System/update_notification.yaml
index 9a4111b5..65a73a2c 100755
--- a/config/automation/System/update_notification.yaml
+++ b/config/automation/System/update_notification.yaml
@@ -28,7 +28,7 @@
               ] | random -}}
             {% endmacro %}
             {% macro getVersion() %}
-          "New version of @Home_Assistant! Cannot wait for @CCostan to install it! - {{ states('updater.updater') }} (http://www.vmwareinfo.com/2017/07/my-smart-home-look-at-parts-that-make.html)"
+             "New version of @Home_Assistant! Cannot wait for @CCostan to install {{ states('updater.updater') }}! (http://www.vmwareinfo.com/2017/07/my-smart-home-look-at-parts-that-make.html)"
             {% endmacro %}
             {%- macro getRandomSnark() -%}
            {{- [
@@ -63,7 +63,6 @@
           "/config/www/custom_ui/floorplan/images/branding/repo_ad.png",
           "/config/www/custom_ui/floorplan/images/branding/repo_ad2.png",
           "/config/www/custom_ui/floorplan/images/branding/repo_ad3.png",
-          "/config/www/custom_ui/floorplan/images/branding/repo_ad4.png"
           ] | random }}
 
     - service: notify.html5
diff --git a/config/packages/powerwall.yaml b/config/packages/powerwall.yaml
index eb9e495d..361b348b 100755
--- a/config/packages/powerwall.yaml
+++ b/config/packages/powerwall.yaml
@@ -25,12 +25,7 @@ sensor:
     name: Grid Status
     scan_interval: 60
     value_template: "{{ value_json.grid_status == 'SystemGridConnected' }}"
-    icon_template: >-
-      {%- if is_state('sensor.grid_status', 'True') %}
-        mdi:flash
-      {%- else %}
-        mdi:flash-off
-      {%- endif %}
+    device_class: power
 
   - platform: rest
     name: House now
@@ -63,12 +58,7 @@ sensor:
     verify_ssl: false
     value_template: '{{ value_json.battery.instant_power / 1000 | round(2) }}'
     unit_of_measurement: kWh
-    icon_template: >-
-      {%- if states('sensor.powerwall_battery_now') | float > 0 %}
-      mdi:battery
-      {%- else %}
-      mdi:battery-charging
-      {%- endif %}
+    device_class: battery
 
   - platform: rest
     name: PowerWall Battery Capacity
@@ -78,29 +68,7 @@ sensor:
     value_template: '{{ (value_json.percentage | float | round(0)) }}'
     unit_of_measurement: '%'
     scan_interval: 300
-    icon_template: >-
-      {%- set battery = states('sensor.powerwall_battery_capacity') | float %}
-      {%- if battery > 90 %}
-      mdi:battery
-      {%- elif battery > 80 %}
-      mdi:battery-90
-      {%- elif battery > 70 %}
-      mdi:battery-80
-      {%- elif battery > 60 %}
-      mdi:battery-70
-      {%- elif battery > 50 %}
-      mdi:battery-60
-      {%- elif battery > 40 %}
-      mdi:battery-50
-      {%- elif battery > 30 %}
-      mdi:battery-40
-      {%- elif battery > 20 %}
-      mdi:battery-30
-      {%- elif battery > 10 %}
-      mdi:battery-20
-      {%- else %}
-      mdi:battery-outline
-      {%- endif %}
+    device_class: battery
 
 #-------------------------------------------
 # Located in the Grafana package.  Tweets out Solar Production Daily!