diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index a8c97d422..e819f832a 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -29,14 +29,14 @@
 	    name="calendarColor"
 	    id="calendarColor"
 	    var:value="calendarColor"
-	    /><var:string
-	    label:value="Tag:"/><input type="text"
+	    /></span></div>
+      <div><span class="label"><var:string
+	    label:value="Tag:"/></span><span class="content"><input type="text"
 	    name="calendarSyncTag"
 	    id="calendarSyncTag"
 	    class="textField"
 	    var:value="calendarSyncTag"
-	    /></span>
-      </div>
+	    /></span></div>
       <div id="buttons">
 	<input type="button"
 	const:class="button"
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 89513dcd0..58f30badb 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1819,12 +1819,13 @@ function appendStyleElement(folderPath, color) {
     var styleElement = document.createElement("style");
     styleElement.type = "text/css";
     var selectors = [
-		     '.calendarFolder' + folderPath.substr(1),
-		     'div.colorBox.calendarFolder' + folderPath.substr(1)
+		     'DIV.calendarFolder' + folderPath.substr(1),
+		     'LI.calendarFolder' + folderPath.substr(1),
+		     'UL#calendarList DIV.calendarFolder' + folderPath.substr(1)
 		     ];
     var rules = [
-		 ' { background-color: ' + color + ' !important;'
-		 + ' color: ' + fgColor + ' !important; }',
+		 ' { background-color: ' + color + ' !important;' + ' color: ' + fgColor + ' !important; }',
+		 ' { background-color: ' + color + ' !important;' + ' color: ' + fgColor + ' !important; }',
 		 ' { color: ' + color + ' !important; }'
 		 ];
     for (var i = 0; i < rules.length; i++)
diff --git a/UI/WebServerResources/UIxCalendarProperties.css b/UI/WebServerResources/UIxCalendarProperties.css
index bb6e22618..e64c21b1f 100644
--- a/UI/WebServerResources/UIxCalendarProperties.css
+++ b/UI/WebServerResources/UIxCalendarProperties.css
@@ -1,6 +1,6 @@
 DIV#propertiesView
 { overflow: hidden;
-  padding: 5px; }
+  padding: 5px 5px 0 0; }
 
 DIV
 { clear: both; }
@@ -10,21 +10,22 @@ SPAN.label
   width: 7em;
   text-align: right;
   padding-right: 1em;
-  padding-top: .5em;
+  line-height: 2em;
   float: left;
   display: block; }
 
 SPAN.content
 { display: block;
-  vertical-alignment: middle;
-  float: left; }
+  height: 2em;
+  line-height: 1.5em;
+  vertical-align: middle; }
 
-LABEL#calendarSync
-{ margin-left: 10em; }
+SPAN.content INPUT
+{ margin-top: 0; }
 
 BUTTON#colorButton
 { display: none;
-  margin: 1px;
+  margin: 1px 0 0 1px;
   border-bottom: 1px solid #fff;
   border-right: 1px solid #fff;
   border-top: 2px solid #222;
@@ -32,7 +33,7 @@ BUTTON#colorButton
   -moz-border-top-colors: #9c9a94 #000 transparent;
   -moz-border-left-colors: #9c9a94 #000 transparent;
   width: 3em;
-  height: 2em; }
+  height: 18px; }
 
 DIV#buttons
 { padding: 10px;
@@ -40,4 +41,4 @@ DIV#buttons
   text-align: right; }
 
 INPUT#calendarSyncTag
-{ width: 5em; }
+{ width: 7em; }
diff --git a/UI/WebServerResources/iefixes.css b/UI/WebServerResources/iefixes.css
index 28a014570..7196fa518 100644
--- a/UI/WebServerResources/iefixes.css
+++ b/UI/WebServerResources/iefixes.css
@@ -304,3 +304,7 @@ TABLE#freeBusyData TD SPAN.freeBusyZoneElement
 
 TABLE
 { empty-cells: show; }
+
+/* UIxCalendarProperties */
+BUTTON#colorButton
+{ margin-top: 2px; }