diff --git a/resources/drawables/apace.png b/resources/drawables/apace.png
new file mode 100644
index 0000000..27452bf
Binary files /dev/null and b/resources/drawables/apace.png differ
diff --git a/resources/drawables/cadence.png b/resources/drawables/cadence.png
new file mode 100644
index 0000000..c6e2fb0
Binary files /dev/null and b/resources/drawables/cadence.png differ
diff --git a/resources/drawables/e_gain.png b/resources/drawables/e_gain.png
index e47d097..bc2ea96 100644
Binary files a/resources/drawables/e_gain.png and b/resources/drawables/e_gain.png differ
diff --git a/resources/drawables/e_loss.png b/resources/drawables/e_loss.png
index 246dc11..f046eae 100644
Binary files a/resources/drawables/e_loss.png and b/resources/drawables/e_loss.png differ
diff --git a/resources/drawables/hills.png b/resources/drawables/hills.png
index 63a7a0d..52a971c 100644
Binary files a/resources/drawables/hills.png and b/resources/drawables/hills.png differ
diff --git a/resources/drawables/pace.png b/resources/drawables/pace.png
new file mode 100644
index 0000000..ac4c977
Binary files /dev/null and b/resources/drawables/pace.png differ
diff --git a/resources/layouts/layouts.xml b/resources/layouts/layouts.xml
index 0a6fdf2..89941ba 100755
--- a/resources/layouts/layouts.xml
+++ b/resources/layouts/layouts.xml
@@ -3,11 +3,11 @@
     <layout id="MainLayout">
         <drawable class="Background"/>
         <drawable class="BgOverlay" id="BgOverlay">
-            <param name="x">142</param>
+            <param name="x">158</param>
             <param name="y">62</param>
             <param name="w">280</param>
             <param name="h">260</param>
-            <param name="d">-30</param>
+            <param name="d">-32</param>
         </drawable>
         <drawable class="HeartRate" id="HeartRate">
             <param name="y">64</param>
@@ -26,24 +26,24 @@
         <label id="time" x="center" y="330" color="0xDDFF88" justification="Graphics.TEXT_JUSTIFY_CENTER" font="Graphics.FONT_LARGE" />
 
         <!-- distance/pace/avg pace -->
-        <label id="pace" x="82%" y="80" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM" text="12.34"/>
-        <label id="paceLabel" x="83%" y="136" color="0x004488" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" text="pace"/>
-        <label id="apace" x="82%" y="178" color="0x4488FF" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_LARGE" text="12.34"/>
-        <label id="apaceLabel" x="83%" y="200" color="0x004488" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" text="apace"/>
-        <label id="distance" x="82%" y="224" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM" />
-        <label id="distanceLabel" x="83%" y="272" color="0x004488" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_TINY" text="km"/>
+        <label id="pace" x="360" y="80" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM" text="12.34"/>
+        <bitmap id="iconPace" filename="../drawables/pace.png" x="362" y="132" />
+        <label id="apace" x="360" y="178" color="0x4488FF" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_LARGE" text="12.34"/>
+        <bitmap id="iconAPace" filename="../drawables/apace.png" x="362" y="198" />
+        <label id="distance" x="360" y="224" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_NUMBER_MEDIUM" />
+        <label id="distanceLabel" x="364" y="246" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_XTINY" text="km"/>
 
         <!-- cadence -->
-        <label id="cadence" x="13%" y="92" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM" />
-        <label id="cadenceLabel" x="12%" y="98" color="0x004488" justification="Graphics.TEXT_JUSTIFY_RIGHT" font="Graphics.FONT_SMALL" text="c"/>
+        <bitmap id="iconCadence" filename="../drawables/cadence.png" x="36" y="116" />
+        <label id="cadence" x="62" y="92" color="Graphics.COLOR_WHITE" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM" />
 
         <!-- elevation, egain -->
-        <bitmap id="iconHills" filename="../drawables/hills.png" x="20" y="144" />
-        <label id="elevation" x="13%" y="132" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconEGain" filename="../drawables/e_gain.png" x="20" y="184" />
-        <label id="elevationGain" x="13%" y="172" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
-        <bitmap id="iconELoss" filename="../drawables/e_loss.png" x="20" y="224" />
-        <label id="elevationLoss" x="13%" y="212" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
+        <bitmap id="iconHills" filename="../drawables/hills.png" x="22" y="144" />
+        <label id="elevation" x="62" y="132" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
+        <bitmap id="iconEGain" filename="../drawables/e_gain.png" x="22" y="184" />
+        <label id="elevationGain" x="62" y="172" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
+        <bitmap id="iconELoss" filename="../drawables/e_loss.png" x="22" y="224" />
+        <label id="elevationLoss" x="62" y="212" color="0x0088FF" justification="Graphics.TEXT_JUSTIFY_LEFT" font="Graphics.FONT_MEDIUM"/>
 
     </layout>
 
diff --git a/source/RepaFieldView.mc b/source/RepaFieldView.mc
index 50219d8..fc5dfb5 100644
--- a/source/RepaFieldView.mc
+++ b/source/RepaFieldView.mc
@@ -32,7 +32,7 @@ class RepaFieldView extends WatchUi.DataField {
         ahrValue = 0;
         mhrValue = 0;
         hrZones = UserProfile.getHeartRateZones(UserProfile.getCurrentSport());
-        hrZoneColors = [Graphics.COLOR_BLACK, Graphics.COLOR_LT_GRAY, Graphics.COLOR_BLUE, Graphics.COLOR_GREEN, Graphics.COLOR_YELLOW, Graphics.COLOR_RED, Graphics.COLOR_DK_RED];
+        hrZoneColors = [Graphics.COLOR_DK_GRAY, Graphics.COLOR_LT_GRAY, Graphics.COLOR_BLUE, Graphics.COLOR_GREEN, Graphics.COLOR_YELLOW, Graphics.COLOR_RED, Graphics.COLOR_DK_RED];
         cadenceZones = [153, 163, 173, 183];
         cadenceZoneColors = [Graphics.COLOR_RED, Graphics.COLOR_YELLOW, Graphics.COLOR_GREEN, Graphics.COLOR_BLUE, Graphics.COLOR_PURPLE];
         toDestination = 0.0f;
@@ -301,17 +301,6 @@ class RepaFieldView extends WatchUi.DataField {
 
         // Call parent's onUpdate(dc) to redraw the layout
         View.onUpdate(dc);
-        // var bitmap = WatchUi.loadResource(Rez.Drawables.iconHills);
-        // dc.drawBitmap(132, 132, bitmap);
-        // TODO
-        /*
-        var bm = new WatchUi.Bitmap({
-            :rezId => Rez.Drawables.iconHills,
-            :locX => 132,
-            :locY => 132
-        });
-        bm.draw(dc);
-        */
     }
 
 }