diff --git a/config/packages/grafana.yaml b/config/packages/grafana.yaml
index aac0bd22..d1f0185d 100755
--- a/config/packages/grafana.yaml
+++ b/config/packages/grafana.yaml
@@ -33,13 +33,10 @@ automation:
   - alias: 'Tweet Solar Production'
     hide_entity: false
     trigger:
-      - platform: state
-        entity_id: sun.sun
-        to: 'below_horizon'
-        from: 'above_horizon'
-
+      - platform: sun
+        event: sunset
+        offset: '+01:00:00'
     action:
-      - delay: '0{{ range(1,3) | random | int }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}:{{ range(0,5) | random | int }}{{ range(0,9) | random | int }}'
       - service: script.tweet_engine_image
         data_template:
           tweet: >-
diff --git a/config/www/custom_ui/floorplan/images/branding/solar_readings.png b/config/www/custom_ui/floorplan/images/branding/solar_readings.png
index f1941a15..779701f5 100644
Binary files a/config/www/custom_ui/floorplan/images/branding/solar_readings.png and b/config/www/custom_ui/floorplan/images/branding/solar_readings.png differ