diff --git a/manifest.xml b/manifest.xml
index be231b4..3a29406 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -21,13 +21,12 @@
             <iq:product id="fenix6spro"/>
             <iq:product id="fenix6xpro"/>
             <iq:product id="fenixchronos"/>
-            <!-- <iq:product id="vivoactive3"/>
+            <iq:product id="vivoactive3"/>
             <iq:product id="vivoactive3d"/>
             <iq:product id="vivoactive3m"/>
             <iq:product id="vivoactive3mlte"/>
             <iq:product id="vivoactive4"/>
             <iq:product id="vivoactive4s"/>
-            <iq:product id="vivoactive_hr"/> -->
         </iq:products>
         <iq:permissions>
             <iq:uses-permission id="Communications"/> 
diff --git a/resources-round-218x218/drawables/drawables.xml b/resources-fenix5s/drawables/drawables.xml
similarity index 100%
rename from resources-round-218x218/drawables/drawables.xml
rename to resources-fenix5s/drawables/drawables.xml
diff --git a/resources-round-218x218/drawables/launcher_icon.png b/resources-fenix5s/drawables/launcher_icon.png
similarity index 100%
rename from resources-round-218x218/drawables/launcher_icon.png
rename to resources-fenix5s/drawables/launcher_icon.png
diff --git a/resources-vivoactive3/drawables/drawables.xml b/resources-vivoactive3/drawables/drawables.xml
new file mode 100644
index 0000000..a22c33c
--- /dev/null
+++ b/resources-vivoactive3/drawables/drawables.xml
@@ -0,0 +1,3 @@
+<drawables>
+    <bitmap id="LauncherIcon" filename="launcher_icon.png" />
+</drawables>
diff --git a/resources-vivoactive3/drawables/launcher_icon.png b/resources-vivoactive3/drawables/launcher_icon.png
new file mode 100644
index 0000000..abccbd9
Binary files /dev/null and b/resources-vivoactive3/drawables/launcher_icon.png differ
diff --git a/resources-vivoactive3d/drawables/drawables.xml b/resources-vivoactive3d/drawables/drawables.xml
new file mode 100644
index 0000000..a22c33c
--- /dev/null
+++ b/resources-vivoactive3d/drawables/drawables.xml
@@ -0,0 +1,3 @@
+<drawables>
+    <bitmap id="LauncherIcon" filename="launcher_icon.png" />
+</drawables>
diff --git a/resources-vivoactive3d/drawables/launcher_icon.png b/resources-vivoactive3d/drawables/launcher_icon.png
new file mode 100644
index 0000000..abccbd9
Binary files /dev/null and b/resources-vivoactive3d/drawables/launcher_icon.png differ
diff --git a/resources-vivoactive3m/drawables/drawables.xml b/resources-vivoactive3m/drawables/drawables.xml
new file mode 100644
index 0000000..a22c33c
--- /dev/null
+++ b/resources-vivoactive3m/drawables/drawables.xml
@@ -0,0 +1,3 @@
+<drawables>
+    <bitmap id="LauncherIcon" filename="launcher_icon.png" />
+</drawables>
diff --git a/resources-vivoactive3m/drawables/launcher_icon.png b/resources-vivoactive3m/drawables/launcher_icon.png
new file mode 100644
index 0000000..abccbd9
Binary files /dev/null and b/resources-vivoactive3m/drawables/launcher_icon.png differ
diff --git a/resources-vivoactive3mlte/drawables/drawables.xml b/resources-vivoactive3mlte/drawables/drawables.xml
new file mode 100644
index 0000000..a22c33c
--- /dev/null
+++ b/resources-vivoactive3mlte/drawables/drawables.xml
@@ -0,0 +1,3 @@
+<drawables>
+    <bitmap id="LauncherIcon" filename="launcher_icon.png" />
+</drawables>
diff --git a/resources-vivoactive3mlte/drawables/launcher_icon.png b/resources-vivoactive3mlte/drawables/launcher_icon.png
new file mode 100644
index 0000000..abccbd9
Binary files /dev/null and b/resources-vivoactive3mlte/drawables/launcher_icon.png differ
diff --git a/resources-vivoactive4/drawables/drawables.xml b/resources-vivoactive4/drawables/drawables.xml
new file mode 100644
index 0000000..a22c33c
--- /dev/null
+++ b/resources-vivoactive4/drawables/drawables.xml
@@ -0,0 +1,3 @@
+<drawables>
+    <bitmap id="LauncherIcon" filename="launcher_icon.png" />
+</drawables>
diff --git a/resources-vivoactive4/drawables/launcher_icon.png b/resources-vivoactive4/drawables/launcher_icon.png
new file mode 100644
index 0000000..abccbd9
Binary files /dev/null and b/resources-vivoactive4/drawables/launcher_icon.png differ
diff --git a/resources-vivoactive4s/drawables/drawables.xml b/resources-vivoactive4s/drawables/drawables.xml
new file mode 100644
index 0000000..a22c33c
--- /dev/null
+++ b/resources-vivoactive4s/drawables/drawables.xml
@@ -0,0 +1,3 @@
+<drawables>
+    <bitmap id="LauncherIcon" filename="launcher_icon.png" />
+</drawables>
diff --git a/resources-vivoactive4s/drawables/launcher_icon.png b/resources-vivoactive4s/drawables/launcher_icon.png
new file mode 100644
index 0000000..abccbd9
Binary files /dev/null and b/resources-vivoactive4s/drawables/launcher_icon.png differ
diff --git a/source/view/homeView/HomeView.mc b/source/view/homeView/HomeView.mc
index 22dbb4c..8fb252d 100644
--- a/source/view/homeView/HomeView.mc
+++ b/source/view/homeView/HomeView.mc
@@ -49,7 +49,7 @@ class HomeView extends WatchUi.View {
 
     // Update the view
     function onUpdate(dc) {
-        // First ubdate label drawables
+        // Update label drawables
         cDrawables[:TimeDate].setText( // Update time
             System.getClockTime().hour.format("%d") +
             ":" +
@@ -58,17 +58,13 @@ class HomeView extends WatchUi.View {
         cDrawables[:BatteryNumber].setText(Lang.format("$1$%", [WheelData.BatteryPercentage]));
         cDrawables[:TemperatureNumber].setText(Lang.format("$1$°", [WheelData.Temperature]));
         cDrawables[:BottomSubtitle].setText(WheelData.BottomSubtitleText);
-        var currentSpeed;
+        var currentSpeed = 0;
         if (WheelData.CurrentSpeed < 10) {
             currentSpeed = WheelData.CurrentSpeed;
         } else {
             currentSpeed = WheelData.CurrentSpeed / 10;
         }
-        cDrawables[:SpeedNumber].setText(currentSpeed);
-        // And then arc drawables
-        cDrawables[:SpeedArc].setText(WheelData.CurrentSpeed);
-        cDrawables[:BatteryArc].setText(WheelData.BatteryPercentage);
-        cDrawables[:TemperatureArc].setText(WheelData.Temperature);
+        cDrawables[:SpeedNumber].setText(currentSpeed.toString());
 
         // Call the parent onUpdate function to redraw the layout
         View.onUpdate(dc);