diff --git a/mozilla/calendar/resources/content/penglobal/timepicker-overlay.xul b/mozilla/calendar/resources/content/penglobal/timepicker-overlay.xul
index 000206f8f54..333e06a7dac 100644
--- a/mozilla/calendar/resources/content/penglobal/timepicker-overlay.xul
+++ b/mozilla/calendar/resources/content/penglobal/timepicker-overlay.xul
@@ -260,8 +260,9 @@
         </grid> <!-- Five  Minute Grid -->
      
         <hbox>
-            <image id="oe-time-picker-more-control-image" onclick="oeTimePicker.clickMore()" />
-            <image id="oe-time-picker-minutes-bottom-image" />
+            <label id="oe-time-picker-more-control-image" value="&more.label;" onclick="oeTimePicker.clickMore()" />
+            <spacer flex="1"/>
+            <image id="oe-time-picker-minutes-bottom-image"/>
         </hbox>
     
     </vbox> <!-- Five  Minute Grid Box -->
@@ -624,7 +625,8 @@
         </grid>  <!-- One  Minute Grid -->
         
         <hbox>
-            <image id="oe-time-picker-less-control-image" onclick="oeTimePicker.clickLess()" />
+            <label id="oe-time-picker-less-control-image" value="&less.label;" onclick="oeTimePicker.clickLess()"/>
+            <spacer flex="1"/>
             <image id="oe-time-picker-minutes-bottom-image" />
         </hbox>
     
diff --git a/mozilla/calendar/resources/locale/en-US/penglobal/global.dtd b/mozilla/calendar/resources/locale/en-US/penglobal/global.dtd
index aa00ecea325..b8f75544214 100644
--- a/mozilla/calendar/resources/locale/en-US/penglobal/global.dtd
+++ b/mozilla/calendar/resources/locale/en-US/penglobal/global.dtd
@@ -106,4 +106,5 @@
 <!ENTITY time.AM "AM" >
 <!ENTITY time.PM "PM" >
 
-
+<!ENTITY more.label "MORE" >
+<!ENTITY less.label "LESS" >
diff --git a/mozilla/calendar/resources/skin/modern/penglobal/timepicker/timepicker.css b/mozilla/calendar/resources/skin/modern/penglobal/timepicker/timepicker.css
index 6e0fdffc3fe..024206dab94 100644
--- a/mozilla/calendar/resources/skin/modern/penglobal/timepicker/timepicker.css
+++ b/mozilla/calendar/resources/skin/modern/penglobal/timepicker/timepicker.css
@@ -173,19 +173,6 @@
 #oe-time-picker-minutes-bottom-image
 {
    list-style-image     : url("chrome://penglobal/skin/timepicker/time_picker_minutes_bottom.png");
+   padding-right        : 2px;
 }
 
-
-/* more tab */
-
-#oe-time-picker-more-control-image
-{
-   list-style-image     : url("chrome://penglobal/skin/timepicker/time_picker_more.png");
-}
-    
-/* less tab */
-
-#oe-time-picker-less-control-image
-{
-   list-style-image     : url("chrome://penglobal/skin/timepicker/time_picker_less.png");
-}