diff --git a/resources-approachs7042mm/bitmaps.xml b/resources-approachs7042mm/bitmaps.xml
new file mode 100644
index 0000000..2bd9bbb
--- /dev/null
+++ b/resources-approachs7042mm/bitmaps.xml
@@ -0,0 +1,4 @@
+<resources>
+    <bitmap id="LauncherIcon" filename="images/MoveToBeActive.png"
+    	dithering="none" />
+</resources>
\ No newline at end of file
diff --git a/resources-approachs7042mm/images/MoveToBeActive.png b/resources-approachs7042mm/images/MoveToBeActive.png
new file mode 100644
index 0000000..2fedffe
Binary files /dev/null and b/resources-approachs7042mm/images/MoveToBeActive.png differ
diff --git a/resources-approachs7042mm/images/garmin5.png b/resources-approachs7042mm/images/garmin5.png
new file mode 100644
index 0000000..bf689d2
Binary files /dev/null and b/resources-approachs7042mm/images/garmin5.png differ
diff --git a/resources-epix2pro47mm/bitmaps.xml b/resources-epix2pro47mm/bitmaps.xml
new file mode 100644
index 0000000..2bd9bbb
--- /dev/null
+++ b/resources-epix2pro47mm/bitmaps.xml
@@ -0,0 +1,4 @@
+<resources>
+    <bitmap id="LauncherIcon" filename="images/MoveToBeActive.png"
+    	dithering="none" />
+</resources>
\ No newline at end of file
diff --git a/resources-epix2pro47mm/images/MoveToBeActive.png b/resources-epix2pro47mm/images/MoveToBeActive.png
new file mode 100644
index 0000000..dbf141f
Binary files /dev/null and b/resources-epix2pro47mm/images/MoveToBeActive.png differ
diff --git a/settings/AnalogSettingsView.mc b/settings/AnalogSettingsView.mc
index 99038be..a0f01e3 100644
--- a/settings/AnalogSettingsView.mc
+++ b/settings/AnalogSettingsView.mc
@@ -18,7 +18,7 @@ class AnalogSettingsViewTest extends WatchUi.Menu2 {
     function initialize() {
         Menu2.initialize(null);
 
-        var currentVersion=425;
+        var currentVersion=430;
         if (Storage.getValue(23)==null or Storage.getValue(23)<currentVersion){
             Storage.setValue(23,currentVersion);
 
@@ -101,8 +101,8 @@ class Menu2TestMenu2Delegate extends WatchUi.Menu2InputDelegate { // Sub-menu De
             } else if (item.getIcon() instanceof CustomThickness){ // Custom Thickness
                 item.setSubLabel((item.getIcon() as CustomThickness).nextState(item.getId()));
             }
-        } else if (item instanceof WatchUi.ToggleMenuItem) {
-            Storage.setValue(item.getId(), item.isEnabled());
+        } else if (item instanceof WatchUi.ToggleMenuItem and item.getId() instanceof Number) {
+            Storage.setValue(item.getId() as Number, item.isEnabled());
         }
 
         WatchUi.requestUpdate(); // really needed?
diff --git a/source/AnalogView.mc b/source/AnalogView.mc
index e07df58..17a7a1c 100644
--- a/source/AnalogView.mc
+++ b/source/AnalogView.mc
@@ -43,7 +43,7 @@ class AnalogView extends WatchUi.WatchFace
             }
         }
 
-        var currentVersion=425;
+        var currentVersion=430;
 
         if (Storage.getValue(23)==null or Storage.getValue(23)<currentVersion){
             //Storage.setValue(23,currentVersion);
diff --git a/source/MtbA_functions.mc b/source/MtbA_functions.mc
index e6478ee..7bcfbd6 100644
--- a/source/MtbA_functions.mc
+++ b/source/MtbA_functions.mc
@@ -1695,7 +1695,12 @@ class MtbA_functions {
 					clockTime.hour = 12;
 				}
 			}
-			seconds = clockTime.hour.format("%02d") + ":" + clockTime.min.format("%02d");
+			seconds = clockTime.hour.format("%2d") + ":" + clockTime.min.format("%02d");
+			if (clockTime.hour < 10 and clockTime.hour > 0 and width>=240){
+				xText=xText-(dc.getTextDimensions(clockTime.hour.format("%2d"),fontSize)[0])/2;
+			} else {
+				xText=xText-(dc.getTextDimensions("1",fontSize)[0])/2;
+			}
 		}
 
 		// placeholder for implementation of Partial Update
@@ -1731,6 +1736,7 @@ class MtbA_functions {
 		dc.drawText(xText, yText,	fontSize, seconds, Graphics.TEXT_JUSTIFY_LEFT);
 
 		if (type==2){ //digital clock
+			//dc.drawText(xText + dc.getTextWidthInPixels(seconds,fontSize), yText + fontSize*((dc.getFontHeight(Graphics.FONT_TINY)-dc.getFontHeight(Graphics.FONT_XTINY))*0.9 - (width>=360 ? 1 : 0)),	0, am_pm, Graphics.TEXT_JUSTIFY_LEFT);
 			dc.drawText(xText + dc.getTextWidthInPixels(seconds,fontSize), yText + fontSize*((dc.getFontHeight(Graphics.FONT_TINY)-dc.getFontHeight(Graphics.FONT_XTINY))*0.9 - (width>=360 ? 1 : 0)),	0, am_pm, Graphics.TEXT_JUSTIFY_LEFT);
 		}