Index: /CKEditor/branches/features/kama/_source/plugins/toolbar/plugin.js
===================================================================
--- /CKEditor/branches/features/kama/_source/plugins/toolbar/plugin.js	(revision 3634)
+++ /CKEditor/branches/features/kama/_source/plugins/toolbar/plugin.js	(revision 3635)
@@ -144,5 +144,5 @@
 							}
 
-							output.push( '<div id="', toolbarId, '" class="cke_toolbar"><span class="cke_toolbar_start"></span>' );
+							output.push( '<span id="', toolbarId, '" class="cke_toolbar"><span class="cke_toolbar_start"></span>' );
 
 							// Add the toolbar to the "editor.toolbox.toolbars"
@@ -174,5 +174,5 @@
 										if ( !groupStarted )
 										{
-											output.push( '<div class="cke_toolgroup">' );
+											output.push( '<span class="cke_toolgroup">' );
 											groupStarted = 1;										
 										}
@@ -180,5 +180,5 @@
 									else if ( groupStarted )
 									{
-										output.push( '</div>' );
+										output.push( '</span>' );
 										groupStarted = 0;										
 									}
@@ -210,9 +210,9 @@
 							if ( groupStarted )
 							{
-								output.push( '</div>' );
+								output.push( '</span>' );
 								groupStarted = 0;
 							}
 
-							output.push( '<span class="cke_toolbar_end"></span></div>' );
+							output.push( '<span class="cke_toolbar_end"></span></span>' );
 						}
 
Index: /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css	(revision 3634)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css	(revision 3635)
@@ -11,13 +11,8 @@
 }
 
-/* RTL */
-.cke_skin_office2003 .cke_borwser_ie6.cke_rtl .cke_rcombo,
-.cke_skin_office2003 .cke_borwser_ie7.cke_rtl .cke_rcombo,
-.cke_skin_office2003 .cke_borwser_iequirks.cke_rtl .cke_rcombo
+.cke_skin_office2003 .cke_rtl .cke_rcombo
 {
 	float: none;
-	display: inline;
-}
-/* END RTL */
+}
 
 .cke_skin_office2003 .cke_rcombopanel
@@ -46,7 +41,8 @@
 .cke_skin_office2003 .cke_rcombo .cke_label
 {
-	float: left;
-	display: inline-block;
+	display: inline-block;
+	float: left;
 	line-height: 24px;
+	height: 24px;
 	vertical-align: top;
 	padding-left: 4px;
@@ -60,13 +56,8 @@
 }
 
-/* TODO IE8 ? */
-.cke_skin_office2003 .cke_browser_ie6 .cke_rcombo a *
-{
-	float: left;
-}
-
-.cke_skin_office2003 .cke_rcombo .cke_inline_label
-{
-	color: #fff;
+.cke_skin_office2003 .cke_rtl .cke_rcombo .cke_label
+{
+	padding-right: 4px;
+	padding-left: 5px;
 }
 
@@ -77,8 +68,7 @@
 }
 
-.cke_skin_office2003 .cke_rtl .cke_rcombo .cke_label
-{
-	padding-right: 4px;
-	padding-left: 5px;
+.cke_skin_office2003 .cke_rcombo .cke_inline_label
+{
+	color: #fff;
 }
 
@@ -118,10 +108,4 @@
 }
 
-.cke_skin_office2003 .cke_browser_iequirks .cke_rcombo .cke_text
-{
-	height: 24px;
-	width: 72px;
-}
-
 .cke_skin_office2003 .cke_rcombo .cke_openbutton
 {
@@ -158,10 +142,4 @@
 }
 
-.cke_skin_office2003 .cke_browser_iequirks .cke_rcombo .cke_openbutton
-{
-	height: 24px;
-    width: 15px;
-}
-
 .cke_skin_office2003 .cke_rcombo .cke_off a:hover,
 .cke_skin_office2003 .cke_rcombo .cke_off a:focus,
@@ -259,20 +237,2 @@
 	float: right;
 }
-
-.cke_skin_office2003 .cke_browser_ie8 .cke_button .cke_label
-{
-	padding-top: 2px;
-	float: right;
-}
-
-.cke_skin_office2003 .cke_browser_ie8 .cke_rtl .cke_button .cke_label
-{
-	padding-top: 2px;
-	float: left;
-}
-
-.cke_skin_office2003 .cke_browser_iequirks .cke_button .cke_label
-{
-	padding-top: 0;
-	float: none;
-}
Index: /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css	(revision 3634)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css	(revision 3635)
@@ -6,5 +6,5 @@
 @media print
 {
-	.cke_toolbox
+	.cke_skin_office2003 .cke_toolbox
 	{
 		display: none;
@@ -52,15 +52,32 @@
 	background-position: 0 -962px;
 	background-repeat: repeat-x;
-	display: inline;
+	display: inline-block;
+	float: left;
+}
+
+.cke_skin_office2003 .cke_rtl .cke_toolbar
+{
+	float: right;
+}
+
+.cke_skin_office2003 .cke_toolgroup 
+{
+	display: inline-block;
+	float: left;
+    height: 28px;
+}
+
+.cke_skin_office2003 .cke_rtl .cke_toolgroup 
+{
+	float: right;
 }
 
 .cke_skin_office2003 .cke_separator
 {
-	float: left;
-	display: inline-block;
+	display: inline-block;
+	float: left;
 	border-left: solid 1px #B2CBFF;
-	margin-left: 2px;
-	margin-right: 2px;
-	height:16px;
+	margin: 6px 2px;
+	height: 16px;
 }
 
@@ -82,5 +99,4 @@
 .cke_skin_office2003 .cke_toolbar_start
 {
-	float: left;
 	display: inline-block;
 	background-image: url(images/sprites.png);
@@ -90,15 +106,15 @@
     width: 10px;
     height: 28px;
+    float: left;
 }
 
 .cke_skin_office2003 .cke_rtl .cke_toolbar_start
 {
-	float: right;
     background-position: -27px -816px;
+    float: right;
 }
 
 .cke_skin_office2003 .cke_toolbar_end
 {
-	float: left;
 	display: inline-block;
 	background-image: url(images/sprites.png);
@@ -108,10 +124,11 @@
     width: 4px;
     height: 28px;
+    float: left;
 }
 
 .cke_skin_office2003 .cke_rtl .cke_toolbar_end
 {
-	float: right;
     background-position: -29px -907px;
+    float: right;
 }
 
@@ -274,15 +291,4 @@
 {
 	background-position: left center;
-}
-
-.cke_skin_office2003 .cke_toolgroup
-{
-	float: left;
-	display: inline-block;
-}
-
-.cke_skin_office2003 .cke_rtl .cke_toolgroup
-{
-	float: right;
 }
 
@@ -395,12 +401,8 @@
 }
 
-/*** IE ***/
-
-/* The biggest problem with IE is the RTL support (and float:right). It's
-   totally broken, and quite delicate. IE8 fixed these issues. */
-
-.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_button .cke_icon,
-.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_button .cke_label,
-.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_button .cke_buttonarrow
+.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_toolgroup,
+.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_separator,
+.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_toolbar_start,
+.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_toolbar_end
 {
 	float: none;