Index: /CKEditor/trunk/_source/skins/default/toolbar.css
===================================================================
--- /CKEditor/trunk/_source/skins/default/toolbar.css	(revision 3242)
+++ /CKEditor/trunk/_source/skins/default/toolbar.css	(revision 3243)
@@ -22,25 +22,14 @@
 .cke_skin_default .cke_separator
 {
-	display:block;
-	float:left;
+	display:inline-block;
 	border-left: solid 1px #999;
-	margin: 2px;
-	height:20px;
-}
-
-.cke_skin_default .cke_rtl .cke_separator
-{
-	float:right;
+	margin-left: 2px;
+	margin-right: 2px;
+	height:16px;
 }
 
 .cke_skin_default .cke_break
 {
-	float:left;
 	clear:left;
-
-	/* IE */
-	*float:none;
-	*clear:right;
-    *height: 26px;
 }
 
@@ -50,21 +39,16 @@
 	border: solid 1px #efefde;
 	background-color: #efefde;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-left: 4px;
-	padding-right: 4px;
 	filter: alpha(opacity=70); /* IE */
 	opacity: 0.70; /* Safari, Opera and Mozilla */
-	display:block;
-	float: left;
-	height: 18px;
+	display: inline-block;
 	-moz-border-radius: 3px;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
-}
-
-.cke_skin_default .cke_rtl .cke_button a
-{
-	float: right;
+	outline: none;
+	padding-top: 2px;
+	padding-left: 4px;
+	padding-right: 4px;
+	padding-bottom: 2px;
+	height: 18px;
 }
 
@@ -73,35 +57,15 @@
 	border: solid 1px #316ac5;
 	background-color: #a3d7ff;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-left: 4px;
-	padding-right: 4px;
 	filter: alpha(opacity=100); /* IE */
 	opacity: 1; /* Safari, Opera and Mozilla */
-	display:block;
-	float: left;
-	height: 18px;
 }
 
-.cke_skin_default .cke_button a.cke_disabled
+.cke_skin_default .cke_button a.cke_disabled,
+.cke_skin_default .cke_browser_ie a:hover.cke_button .cke_disabled
 {
-	border: solid 1px transparent;
-	background-color: inherit;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-left: 4px;
-	padding-right: 4px;
+	border: solid 1px #efefde;
+	background-color: #efefde;
 	filter: alpha(opacity=30); /* IE */
 	opacity : 0.3; /* Safari, Opera and Mozilla */
-	display:block;
-	float: left;
-	height: 18px;
-}
-
-/* IE6 BUG: Hover removes the padding and border, for some unknown reason. */
-.cke_skin_default .cke_browser_ie a:hover.cke_button .cke_disabled
-{
-	padding: 2px 4px;
-	border: solid 1px #efefde;
 }
 
@@ -115,23 +79,6 @@
 	border: solid 1px #316ac5;
 	background-color: #dff1ff;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-left: 4px;
-	padding-right: 4px;
 	filter: alpha(opacity=100); /* IE */
 	opacity: 1; /* Safari, Opera and Mozilla */
-	display:block;
-	float: left;
-	height: 18px;
-	outline: none;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-}
-
-.cke_skin_default .cke_rtl .cke_button a:hover.cke_on,
-.cke_skin_default .cke_rtl .cke_button a:hover.cke_off
-{
-	float: right;
 }
 
@@ -144,11 +91,5 @@
 	width: 16px;
 	height: 16px;
-	display: block;
-	float: left;
-}
-
-.cke_skin_default .cke_rtl .cke_button .cke_icon
-{
-	float: right;
+	display: inline-block;
 }
 
@@ -156,13 +97,11 @@
 {
 	display: none;
-	float: left;
-	height: 14px;
 	padding-left: 3px;
-	padding-top:3px;
+	vertical-align: 3px;
 }
 
 .cke_skin_default .cke_button .cke_buttonarrow
 {
-	float: left;
+	display: inline-block;
 	height: 18px;
 	width: 8px;
@@ -172,6 +111,78 @@
 }
 
-.cke_skin_default .cke_rtl .cke_button .cke_label
+
+/* IE Section */
+
+/* Repeat it here for all variations of ".cke_button a" because of IE6 */
+.cke_skin_default .cke_browser_ie .cke_button a,
+.cke_skin_default .cke_browser_ie .cke_button a.cke_off,
+.cke_skin_default .cke_browser_ie .cke_button a.cke_on,
+.cke_skin_default .cke_browser_ie .cke_button a.cke_disabled,
+.cke_skin_default .cke_browser_ie .cke_button a:hover.cke_on,
+.cke_skin_default .cke_browser_ie .cke_button a:focus.cke_on,
+.cke_skin_default .cke_browser_ie .cke_button a:active.cke_on,
+.cke_skin_default .cke_browser_ie .cke_button a:hover.cke_off,
+.cke_skin_default .cke_browser_ie .cke_button a:focus.cke_off,
+.cke_skin_default .cke_browser_ie .cke_button a:active.cke_off
 {
-	float: right;
+	padding-top: 2px;
+	padding-left: 4px;
+	padding-right: 4px;
+	padding-bottom: 2px;
+	height: 18px;
 }
+
+.cke_skin_default .cke_browser_ie .cke_separator
+{
+	vertical-align: 35%;
+}
+
+
+.cke_skin_default .cke_browser_ie .cke_button .cke_label
+{
+	vertical-align: 1px;
+}
+
+/* IE+Quirks Section */
+
+.cke_skin_default .cke_browser_iequirks .cke_button a,
+.cke_skin_default .cke_browser_iequirks .cke_button a.cke_off,
+.cke_skin_default .cke_browser_iequirks .cke_button a.cke_on,
+.cke_skin_default .cke_browser_iequirks .cke_button a.cke_disabled,
+.cke_skin_default .cke_browser_iequirks .cke_button a:hover.cke_on,
+.cke_skin_default .cke_browser_iequirks .cke_button a:focus.cke_on,
+.cke_skin_default .cke_browser_iequirks .cke_button a:active.cke_on,
+.cke_skin_default .cke_browser_iequirks .cke_button a:hover.cke_off,
+.cke_skin_default .cke_browser_iequirks .cke_button a:focus.cke_off,
+.cke_skin_default .cke_browser_iequirks .cke_button a:active.cke_off
+{
+	padding-bottom: 3px;
+}
+
+/* Firefox 2 Section */
+
+.cke_skin_default .cke_browser_gecko .cke_button a,
+.cke_skin_default .cke_browser_gecko .cke_button a.cke_off,
+.cke_skin_default .cke_browser_gecko .cke_button .cke_icon,
+.cke_skin_default .cke_browser_gecko .cke_button .cke_buttonarrow,
+.cke_skin_default .cke_browser_gecko .cke_separator
+{
+	display: block;
+	float: left;
+}
+
+.cke_skin_default .cke_browser_gecko .cke_button .cke_label,
+.cke_skin_default .cke_browser_gecko .cke_break
+{
+	float: left;
+}
+
+.cke_skin_default .cke_browser_gecko .cke_separator
+{
+	margin-top: 4px;
+}
+
+.cke_skin_default .cke_browser_gecko .cke_button .cke_label
+{
+	padding-top: 3px;
+}
