diff --git a/dashmachine/platform/weather.py b/dashmachine/platform/weather.py
index cd2c6d3..a299a05 100644
--- a/dashmachine/platform/weather.py
+++ b/dashmachine/platform/weather.py
@@ -80,8 +80,8 @@ class Platform:
                     <div class="collection-item"><span class="font-weight-900">Min: </span>{{ value.consolidated_weather[0].min_temp|round(1, 'floor') }}&deg; <span class="font-weight-900">Max: </span>{{ value.consolidated_weather[0].max_temp|round(1, 'floor') }}&deg;</div>
                     <div class="collection-item"><span class="font-weight-900">Wind: </span>{{ value.consolidated_weather[0].wind_direction_compass }} at {{ value.consolidated_weather[0].wind_speed|round(1, 'floor') }} {{ wind_speed_unit }}</div>
                     <div class="collection-item"><span class="font-weight-900">Humidity: </span>{{ value.consolidated_weather[0].humidity }}%</div>
-                    <div class="collection-item"><span class="font-weight-900">Air Pressure: </span>{{ value.consolidated_weather[0].air_pressure|round(1, 'floor') }}</div>
-                    <div class="collection-item"><span class="font-weight-900">Visibility: </span>{{ value.consolidated_weather[0].visibility|round(1, 'floor') }}</div>
+                    <div class="collection-item"><span class="font-weight-900">Air Pressure: </span>{{ value.consolidated_weather[0].air_pressure|round(1, 'floor') }} {{ air_pressure_unit }}</div>
+                    <div class="collection-item"><span class="font-weight-900">Visibility: </span>{{ value.consolidated_weather[0].visibility|round(1, 'floor') }} {{ visibility_unit }} </div>
                     <div class="collection-item"><span class="font-weight-900">Predictability: </span>{{ value.consolidated_weather[0].predictability }}%</div>
                 </div>
             </div>
@@ -125,6 +125,15 @@ class Platform:
                 value["consolidated_weather"][0]["air_pressure"] / 33.864
             )
 
+        if self.visibility_unit.lower() == "mi":
+            value["consolidated_weather"][0]["visibility"] = (
+                value["consolidated_weather"][0]["visibility"] / 1.609
+            )
+
         return render_template_string(
-            self.html_template, value=value, wind_speed_unit=self.wind_speed_unit
+            self.html_template,
+            value=value,
+            wind_speed_unit=self.wind_speed_unit,
+            air_pressure_unit=self.air_pressure_unit,
+            visibility_unit=self.visibility_unit,
         )
diff --git a/dashmachine/static/images/apps/gogs.png b/dashmachine/static/images/apps/gogs.png
index cbdbadb..c3eb24a 100755
Binary files a/dashmachine/static/images/apps/gogs.png and b/dashmachine/static/images/apps/gogs.png differ
diff --git a/dashmachine/static/images/apps/healthchecks.png b/dashmachine/static/images/apps/healthchecks.png
index 4f6c9ee..af11120 100755
Binary files a/dashmachine/static/images/apps/healthchecks.png and b/dashmachine/static/images/apps/healthchecks.png differ
diff --git a/dashmachine/static/images/apps/homebridge.png b/dashmachine/static/images/apps/homebridge.png
index 74f3193..f143126 100755
Binary files a/dashmachine/static/images/apps/homebridge.png and b/dashmachine/static/images/apps/homebridge.png differ
diff --git a/dashmachine/static/images/apps/hp-ilo.png b/dashmachine/static/images/apps/hp-ilo.png
index dabca4e..f7fe5a0 100755
Binary files a/dashmachine/static/images/apps/hp-ilo.png and b/dashmachine/static/images/apps/hp-ilo.png differ
diff --git a/dashmachine/static/images/apps/jeedom.png b/dashmachine/static/images/apps/jeedom.png
index 2f5bf7f..58c429d 100755
Binary files a/dashmachine/static/images/apps/jeedom.png and b/dashmachine/static/images/apps/jeedom.png differ
diff --git a/dashmachine/static/images/apps/jenkins.png b/dashmachine/static/images/apps/jenkins.png
index 441f87a..a7cdc23 100755
Binary files a/dashmachine/static/images/apps/jenkins.png and b/dashmachine/static/images/apps/jenkins.png differ
diff --git a/dashmachine/static/images/apps/kodi.png b/dashmachine/static/images/apps/kodi.png
index 4e71d38..3a201d0 100644
Binary files a/dashmachine/static/images/apps/kodi.png and b/dashmachine/static/images/apps/kodi.png differ
diff --git a/dashmachine/static/images/apps/openeats.png b/dashmachine/static/images/apps/openeats.png
index 87ec9f4..dab00f0 100755
Binary files a/dashmachine/static/images/apps/openeats.png and b/dashmachine/static/images/apps/openeats.png differ
diff --git a/dashmachine/static/images/apps/phoscon.png b/dashmachine/static/images/apps/phoscon.png
index 46ed0ab..61600a4 100755
Binary files a/dashmachine/static/images/apps/phoscon.png and b/dashmachine/static/images/apps/phoscon.png differ
diff --git a/dashmachine/static/images/apps/phpmyadmin.png b/dashmachine/static/images/apps/phpmyadmin.png
index add34e9..59d55da 100755
Binary files a/dashmachine/static/images/apps/phpmyadmin.png and b/dashmachine/static/images/apps/phpmyadmin.png differ
diff --git a/dashmachine/static/images/apps/privatebin.png b/dashmachine/static/images/apps/privatebin.png
index 790cf07..90f323c 100755
Binary files a/dashmachine/static/images/apps/privatebin.png and b/dashmachine/static/images/apps/privatebin.png differ
diff --git a/dashmachine/static/images/apps/projectsend.png b/dashmachine/static/images/apps/projectsend.png
index b458bbc..1a2068f 100755
Binary files a/dashmachine/static/images/apps/projectsend.png and b/dashmachine/static/images/apps/projectsend.png differ
diff --git a/dashmachine/static/images/apps/synology-active-backup.png b/dashmachine/static/images/apps/synology-active-backup.png
index 0d7c6c0..93a881e 100755
Binary files a/dashmachine/static/images/apps/synology-active-backup.png and b/dashmachine/static/images/apps/synology-active-backup.png differ
diff --git a/dashmachine/static/images/apps/synology-audio-station.png b/dashmachine/static/images/apps/synology-audio-station.png
index c739420..b1b78ca 100755
Binary files a/dashmachine/static/images/apps/synology-audio-station.png and b/dashmachine/static/images/apps/synology-audio-station.png differ
diff --git a/dashmachine/static/images/apps/synology-calendar.png b/dashmachine/static/images/apps/synology-calendar.png
index f68aae0..360fce3 100755
Binary files a/dashmachine/static/images/apps/synology-calendar.png and b/dashmachine/static/images/apps/synology-calendar.png differ
diff --git a/dashmachine/static/images/apps/synology-download-station.png b/dashmachine/static/images/apps/synology-download-station.png
index 9c84989..638dde1 100755
Binary files a/dashmachine/static/images/apps/synology-download-station.png and b/dashmachine/static/images/apps/synology-download-station.png differ
diff --git a/dashmachine/static/images/apps/synology-drive.png b/dashmachine/static/images/apps/synology-drive.png
index dd351be..c926f2b 100755
Binary files a/dashmachine/static/images/apps/synology-drive.png and b/dashmachine/static/images/apps/synology-drive.png differ
diff --git a/dashmachine/static/images/apps/synology-mailplus.png b/dashmachine/static/images/apps/synology-mailplus.png
index 8d0b2df..afef4d4 100755
Binary files a/dashmachine/static/images/apps/synology-mailplus.png and b/dashmachine/static/images/apps/synology-mailplus.png differ
diff --git a/dashmachine/static/images/apps/synology-moments.png b/dashmachine/static/images/apps/synology-moments.png
index d313f58..9c4ddd1 100755
Binary files a/dashmachine/static/images/apps/synology-moments.png and b/dashmachine/static/images/apps/synology-moments.png differ
diff --git a/dashmachine/static/images/apps/synology-note-station.png b/dashmachine/static/images/apps/synology-note-station.png
index 89ee17a..6fc908a 100755
Binary files a/dashmachine/static/images/apps/synology-note-station.png and b/dashmachine/static/images/apps/synology-note-station.png differ
diff --git a/dashmachine/static/images/apps/synology-office.png b/dashmachine/static/images/apps/synology-office.png
index 0543f95..2217bcf 100755
Binary files a/dashmachine/static/images/apps/synology-office.png and b/dashmachine/static/images/apps/synology-office.png differ
diff --git a/dashmachine/static/images/apps/synology-video-station.png b/dashmachine/static/images/apps/synology-video-station.png
index baf46f4..ab46be8 100755
Binary files a/dashmachine/static/images/apps/synology-video-station.png and b/dashmachine/static/images/apps/synology-video-station.png differ
diff --git a/dashmachine/static/images/apps/vmware-esxi.png b/dashmachine/static/images/apps/vmware-esxi.png
index 3e17b8b..c3cbfae 100755
Binary files a/dashmachine/static/images/apps/vmware-esxi.png and b/dashmachine/static/images/apps/vmware-esxi.png differ
diff --git a/dashmachine/static/images/apps/wallabag.png b/dashmachine/static/images/apps/wallabag.png
index c989390..c57bc3c 100755
Binary files a/dashmachine/static/images/apps/wallabag.png and b/dashmachine/static/images/apps/wallabag.png differ
diff --git a/dashmachine/static/images/apps/wetty.png b/dashmachine/static/images/apps/wetty.png
index 0e81369..ac04ecf 100755
Binary files a/dashmachine/static/images/apps/wetty.png and b/dashmachine/static/images/apps/wetty.png differ