diff --git a/pages/home/static/js/weather_watch.js b/pages/home/static/js/weather_watch.js
index eca2b8a0..2eb83e60 100644
--- a/pages/home/static/js/weather_watch.js
+++ b/pages/home/static/js/weather_watch.js
@@ -272,7 +272,7 @@ $(document).ready(function () {
                         }
 
                     }
-                    img.src = `${static_path}${icon.properties.condition_icon}` ? icon.properties.condition_icon !== 'None.png' : ''
+                    img.src = `${static_path}${icon.properties.condition_icon}`
                     return img.src
 
                 })
diff --git a/pages/home/templates/hero_types/card_hero.html b/pages/home/templates/hero_types/card_hero.html
index 2a2c8d6b..93fe3496 100644
--- a/pages/home/templates/hero_types/card_hero.html
+++ b/pages/home/templates/hero_types/card_hero.html
@@ -74,11 +74,11 @@
                                     <div class="columns is-mobile">
                                         <div class="column weather-temp p-0 is-desktop" style="text-align:right">
                                             {% if latest_forecast.data_value.air_temperature_max %}
-                                            <p style="font-size:40px; font-weight: 300"> {{ latest_forecast.data_value.air_temperature_max|floatformat:0 }}{{ settings.forecastmanager.ForecastSetting.get_temp_units_display }}</p>
+                                            <p style="font-size:40px; font-weight: 300"> {{ latest_forecast.data_value.air_temperature_max|floatformat:0 }}°C</p>
                                             {% endif %}
                                             
                                             {% if latest_forecast.data_value.air_temperature_min %}
-                                            <p style="font-size:20px; font-weight: 300"> {{ latest_forecast.data_value.air_temperature_min|floatformat:0 }}{{ settings.forecastmanager.ForecastSetting.get_temp_units_display }}</p>
+                                            <p style="font-size:20px; font-weight: 300"> {{ latest_forecast.data_value.air_temperature_min|floatformat:0 }}°C</p>
                                             {% endif %}
                                         </div>
 
@@ -146,11 +146,11 @@
                                                 <div>
                                                     <p>
                                                         {% if item.data_value.air_temperature_max %}
-                                                        <span style="font-size:18px; font-weight:600">{{ item.data_value.air_temperature_max|floatformat:0 }} {{ settings.forecastmanager.ForecastSetting.get_temp_units_display }}</span>
+                                                        <span style="font-size:18px; font-weight:600">{{ item.data_value.air_temperature_max|floatformat:0 }}°C</span>
                                                         {% endif %}
 
                                                         {% if item.data_value.air_temperature_min %}
-                                                        <span style="font-size:12px">{{ item.data_value.air_temperature_min|floatformat:0 }} {{ settings.forecastmanager.ForecastSetting.get_temp_units_display }}</span>
+                                                        <span style="font-size:12px">{{ item.data_value.air_temperature_min|floatformat:0 }}°C</span>
                                                         {% endif %}
                                                         
                                                     </p>
diff --git a/pages/home/templates/hero_types/full_hero.html b/pages/home/templates/hero_types/full_hero.html
index aeb265d4..24a5973f 100644
--- a/pages/home/templates/hero_types/full_hero.html
+++ b/pages/home/templates/hero_types/full_hero.html
@@ -146,11 +146,11 @@
                                                 <div>
                                                     <p>
                                                         {% if item.data_value.air_temperature_max %}
-                                                        <span style="font-size:18px; font-weight:600">{{ item.data_value.air_temperature_max|floatformat:0 }} {{ settings.forecastmanager.ForecastSetting.get_temp_units_display }}</span>
+                                                        <span style="font-size:18px; font-weight:600">{{ item.data_value.air_temperature_max|floatformat:0 }}°C</span>
                                                         {% endif %}
 
                                                         {% if item.data_value.air_temperature_min %}
-                                                        <span style="font-size:12px">{{ item.data_value.air_temperature_min|floatformat:0 }} {{ settings.forecastmanager.ForecastSetting.get_temp_units_display }}</span>
+                                                        <span style="font-size:12px">{{ item.data_value.air_temperature_min|floatformat:0 }}°C</span>
                                                         {% endif %}
                                                         
                                                     </p>
diff --git a/pages/home/templates/hero_types/half_hero.html b/pages/home/templates/hero_types/half_hero.html
index c6cbfffa..858c2a2d 100644
--- a/pages/home/templates/hero_types/half_hero.html
+++ b/pages/home/templates/hero_types/half_hero.html
@@ -80,11 +80,11 @@
                                         <div class="columns is-mobile">
                                             <div class="column weather-temp p-0 is-desktop" style="text-align:right">
                                                 {% if latest_forecast.data_value.air_temperature_max %}
-                                                <p style="font-size:40px; font-weight: 300" class="latest_max_temp"> {{ latest_forecast.data_value.air_temperature_max|floatformat:0 }}{{ settings.forecastmanager.ForecastSetting.get_temp_units_display }}</p>
+                                                <p style="font-size:40px; font-weight: 300" class="latest_max_temp"> {{ latest_forecast.data_value.air_temperature_max|floatformat:0 }}°C</p>
                                                 {% endif %}
                                                 
                                                 {% if latest_forecast.data_value.air_temperature_min %}
-                                                <p style="font-size:20px; font-weight: 300" class="latest_min_temp"> {{ latest_forecast.data_value.air_temperature_min|floatformat:0 }}{{ settings.forecastmanager.ForecastSetting.get_temp_units_display }}</p>
+                                                <p style="font-size:20px; font-weight: 300" class="latest_min_temp"> {{ latest_forecast.data_value.air_temperature_min|floatformat:0 }}°C</p>
                                                 {% endif %}
                                             </div>
 
@@ -151,11 +151,11 @@
                                                 <div>
                                                     <p>
                                                         {% if item.data_value.air_temperature_max %}
-                                                        <span style="font-size:18px; font-weight:600">{{ item.data_value.air_temperature_max|floatformat:0 }} {{ settings.forecastmanager.ForecastSetting.get_temp_units_display }}</span>
+                                                        <span style="font-size:18px; font-weight:600">{{ item.data_value.air_temperature_max|floatformat:0 }}°C</span>
                                                         {% endif %}
 
                                                         {% if item.data_value.air_temperature_min %}
-                                                        <span style="font-size:12px">{{ item.data_value.air_temperature_min|floatformat:0 }} {{ settings.forecastmanager.ForecastSetting.get_temp_units_display }}</span>
+                                                        <span style="font-size:12px">{{ item.data_value.air_temperature_min|floatformat:0 }}°C</span>
                                                         {% endif %}
                                                         
                                                     </p>