Index: /CKEditor/branches/features/kama/_samples/index.html
===================================================================
--- /CKEditor/branches/features/kama/_samples/index.html	(revision 3646)
+++ /CKEditor/branches/features/kama/_samples/index.html	(revision 3647)
@@ -19,5 +19,11 @@
 		<li><a href="replacebyclass.html">Replace textareas by class name</a></li>
 		<li><a href="replacebycode.html">Replace textareas by code</a></li>
+	</ul>
+	<h2>
+		Basic Customization
+	</h2>
+	<ul>
 		<li><a href="skins.html">Skins</a></li>
+		<li><a href="ui_color.html">User Interface Color</a></li>
 		<li><a href="ui_languages.html">User Interface Languages</a></li>
 	</ul>
Index: /CKEditor/branches/features/kama/_samples/ui_color.html
===================================================================
--- /CKEditor/branches/features/kama/_samples/ui_color.html	(revision 3647)
+++ /CKEditor/branches/features/kama/_samples/ui_color.html	(revision 3647)
@@ -0,0 +1,83 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>UI Color Setting Tool - CKEditor Sample</title>
+	<script type="text/javascript" src="sample.js"></script>
+</head>
+<body>
+	<div id="html">
+		<p>Click the UI Color Picker button to test your color preferences at runtime.</p>
+		<form action="sample_posteddata.php" method="post">
+			<p>
+				<textarea id="editor1" name="editor1" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://www.fckeditor.net/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+				<script type="text/javascript">
+				//<![CDATA[
+
+					// Replace the <textarea id="editor"> with an CKEditor
+					// instance, using default configurations.
+					CKEDITOR.replace( 'editor1',
+						{
+							addPlugins : 'uicolor',
+							toolbar :
+							[
+								[ 'Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink' ],
+								[ 'UIColor' ]
+							]	
+						});
+
+				//]]>
+				</script>
+			</p>
+			<p>
+				<textarea id="editor2" name="editor2" rows="10" cols="80">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://www.fckeditor.net/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
+				<script type="text/javascript">
+				//<![CDATA[
+
+					// Replace the <textarea id="editor"> with an CKEditor
+					// instance, using default configurations.
+					CKEDITOR.replace( 'editor2',
+						{
+							addPlugins : 'uicolor',
+							uiColor: '#14B8C4',
+							toolbar :
+							[
+								[ 'Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink' ],
+								[ 'UIColor' ]
+							]	
+						} );
+
+				//]]>
+				</script>
+			</p>
+			<p>
+				<input type="submit" value="Submit" />
+			</p>
+		</form>
+	</div>
+	<div id="code">
+		<pre>
+&lt;form action=""&gt;
+  &lt;p&gt;
+    &lt;label for="editor1"&gt;
+      Editor 1:&lt;/label&gt;&lt;br /&gt;
+    &lt;textarea <b>name="editor1"</b> rows="10" cols="80"&gt;&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://www.fckeditor.net/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;&lt;/textarea&gt;
+    &lt;script type="text/javascript"&gt;
+    //&lt;![CDATA[
+
+      <b>CKEDITOR.replace( 'editor1' );</b>
+
+    //]]&gt;
+    &lt;/script&gt;
+  &lt;/p&gt;
+  &lt;p&gt;
+    &lt;input type="submit" value="Submit" /&gt;
+  &lt;/p&gt;
+&lt;/form&gt;
+</pre>
+	</div>
+</body>
+</html>
Index: /CKEditor/branches/features/kama/_source/plugins/toolbar/plugin.js
===================================================================
--- /CKEditor/branches/features/kama/_source/plugins/toolbar/plugin.js	(revision 3646)
+++ /CKEditor/branches/features/kama/_source/plugins/toolbar/plugin.js	(revision 3647)
@@ -312,5 +312,5 @@
 CKEDITOR.config.toolbar_Basic =
 [
-	['Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink' ]
+	['Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Link', 'Unlink','-','About']
 ];
 
@@ -329,5 +329,5 @@
 	['Styles','Format','Font','FontSize'],
 	['TextColor','BGColor'],
-	['Maximize', 'ShowBlocks','-','About', 'UIColor']
+	['Maximize', 'ShowBlocks','-','About']
 ];
 
Index: /CKEditor/branches/features/kama/_source/skins/kama/mainui.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/mainui.css	(revision 3646)
+++ /CKEditor/branches/features/kama/_source/skins/kama/mainui.css	(revision 3647)
@@ -105,2 +105,8 @@
 	float: left;
 }
+
+.cke_skin_kama .cke_browser_ie6 .cke_contents textarea,
+.cke_skin_kama .cke_browser_ie7 .cke_contents textarea
+{
+	position: relative;
+}
Index: /CKEditor/branches/features/kama/_source/skins/office2003/elementspath.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/elementspath.css	(revision 3646)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/elementspath.css	(revision 3647)
@@ -15,5 +15,5 @@
 {
 	padding: 3px 3px 0 3px;
-	display: block;
+	display: inline-block;
 	float: left;
 }
@@ -27,5 +27,5 @@
 .cke_skin_office2003 .cke_path .cke_empty
 {
-	display: block;
+	display: inline-block;
 	float: left;
 	border: solid 1px #f7f8fd;
@@ -43,4 +43,10 @@
 }
 
+.cke_skin_office2003 .cke_rtl .cke_path a,
+.cke_skin_office2003 .cke_rtl .cke_path cke_empty
+{
+	float: right;
+}
+
 .cke_skin_office2003 .cke_path a:hover,
 .cke_skin_office2003 .cke_path a:focus,
@@ -56,5 +62,4 @@
 }
 
-/* IE double float-right workaround */
 .cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_path a,
 .cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_path .cke_empty
@@ -62,10 +67,2 @@
 	float: none;
 }
-
-.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_path,
-.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_path a,
-.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_path .cke_empty
-{
-	display: inline-block;
-}
-/* END IE double float-right workaround */
Index: /CKEditor/branches/features/kama/_source/skins/office2003/mainui.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/mainui.css	(revision 3646)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/mainui.css	(revision 3647)
@@ -49,12 +49,4 @@
 }
 
-/* IE(6, 7) source view fix */
-.cke_skin_office2003 .cke_browser_ie6 .cke_contents textarea,
-.cke_skin_office2003 .cke_browser_ie7 .cke_contents textarea
-{
-	position: absolute;
-}
-/* END IE(6, 7) source view fix */
-
 .cke_skin_office2003 .cke_focus
 {
@@ -87,2 +79,8 @@
 	float: left;
 }
+
+.cke_skin_office2003 .cke_browser_ie6 .cke_contents textarea,
+.cke_skin_office2003 .cke_browser_ie7 .cke_contents textarea
+{
+	position: absolute;
+}
Index: /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css	(revision 3646)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css	(revision 3647)
@@ -13,5 +13,5 @@
 .cke_skin_office2003 .cke_rtl .cke_rcombo
 {
-	float: none;
+	float: right;
 }
 
@@ -28,4 +28,5 @@
 .cke_skin_office2003 .cke_rcombo a
 {
+	display: inline-block;
 	float: left;
 
@@ -34,4 +35,9 @@
 }
 
+.cke_skin_office2003 .cke_rtl .cke_rcombo a
+{
+	float: right;
+}
+
 .cke_skin_office2003 .cke_hc .cke_rcombo a
 {
@@ -44,5 +50,5 @@
 	display: inline-block;
 	float: left;
-	
+
 	line-height: 24px;
 	height: 24px;
@@ -61,4 +67,5 @@
 .cke_skin_office2003 .cke_rtl .cke_rcombo .cke_label
 {
+	float: right;
 	padding-right: 4px;
 	padding-left: 5px;
@@ -121,11 +128,11 @@
 	display: inline-block;
 
-    background-position: center center;
-    background-image: url(images/arrowdown.gif);
-    background-repeat: no-repeat;
-
-    border-top: 1px solid #8f8f73;
-    border-bottom: 1px solid #8f8f73;
-    width: 14px;
+	background-position: center center;
+	background-image: url(images/arrowdown.gif);
+	background-repeat: no-repeat;
+
+	border-top: 1px solid #8f8f73;
+	border-bottom: 1px solid #8f8f73;
+	width: 14px;
 	height: 22px;
 }
@@ -226,8 +233,8 @@
 /* Firefox 2 & WebKit Section */
 
-.cke_skin_office2003 .cke_browser_gecko .cke_rcombo,
-.cke_skin_office2003 .cke_browser_gecko .cke_rcombo .cke_label,
-.cke_skin_office2003 .cke_browser_gecko .cke_rcombo .cke_text,
-.cke_skin_office2003 .cke_browser_gecko .cke_rcombo .cke_openbutton,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rcombo,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rcombo .cke_label,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rcombo .cke_text,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rcombo .cke_openbutton,
 .cke_skin_office2003 .cke_browser_webkit .cke_rcombo .cke_label,
 .cke_skin_office2003 .cke_browser_webkit .cke_rcombo .cke_text,
@@ -238,8 +245,8 @@
 }
 
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_rcombo,
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_rcombo .cke_label,
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_rcombo .cke_text,
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_rcombo .cke_openbutton,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_rcombo,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_rcombo .cke_label,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_rcombo .cke_text,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_rcombo .cke_openbutton,
 .cke_skin_office2003 .cke_browser_webkit .cke_rtl .cke_rcombo .cke_label,
 .cke_skin_office2003 .cke_browser_webkit .cke_rtl .cke_rcombo .cke_text,
@@ -248,2 +255,11 @@
 	float: right;
 }
+
+/*** IE ***/
+
+.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_rcombo,
+.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_rcombo a,
+.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_rcombo .cke_label
+{
+	float: none;
+}
Index: /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css	(revision 3646)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css	(revision 3647)
@@ -89,10 +89,10 @@
 .cke_skin_office2003 .cke_break
 {
-	clear:left;
+	clear: left;
 }
 
 .cke_skin_office2003 .cke_rtl .cke_break
 {
-	clear:right;
+	clear: right;
 }
 
@@ -293,63 +293,14 @@
 }
 
-/* IE Section */
-
-/* Repeat it here for all variations of ".cke_button a" because of IE6 */
-/*
-.cke_skin_office2003 .cke_browser_ie .cke_button a,
-.cke_skin_office2003 .cke_browser_ie .cke_button a.cke_off,
-.cke_skin_office2003 .cke_browser_ie .cke_button a.cke_on,
-.cke_skin_office2003 .cke_browser_ie .cke_button a.cke_disabled,
-.cke_skin_office2003 .cke_browser_ie .cke_button a:hover.cke_on,
-.cke_skin_office2003 .cke_browser_ie .cke_button a:focus.cke_on,
-.cke_skin_office2003 .cke_browser_ie .cke_button a:active.cke_on,
-.cke_skin_office2003 .cke_browser_ie .cke_button a:hover.cke_off,
-.cke_skin_office2003 .cke_browser_ie .cke_button a:focus.cke_off,
-.cke_skin_office2003 .cke_browser_ie .cke_button a:active.cke_off
-{
-	padding-top: 2px;
-	padding-left: 4px;
-	padding-right: 4px;
-	padding-bottom: 2px;
-	height: 18px;
-}
-
-.cke_skin_office2003 .cke_browser_ie .cke_separator
-{
-	vertical-align: 35%;
-}
-
-
-.cke_skin_office2003 .cke_browser_ie .cke_button .cke_label
-{
-	vertical-align: 1px;
-}
-*/
-/* IE+Quirks Section */
-/*
-.cke_skin_office2003 .cke_browser_iequirks .cke_button a,
-.cke_skin_office2003 .cke_browser_iequirks .cke_button a.cke_off,
-.cke_skin_office2003 .cke_browser_iequirks .cke_button a.cke_on,
-.cke_skin_office2003 .cke_browser_iequirks .cke_button a.cke_disabled,
-.cke_skin_office2003 .cke_browser_iequirks .cke_button a:hover.cke_on,
-.cke_skin_office2003 .cke_browser_iequirks .cke_button a:focus.cke_on,
-.cke_skin_office2003 .cke_browser_iequirks .cke_button a:active.cke_on,
-.cke_skin_office2003 .cke_browser_iequirks .cke_button a:hover.cke_off,
-.cke_skin_office2003 .cke_browser_iequirks .cke_button a:focus.cke_off,
-.cke_skin_office2003 .cke_browser_iequirks .cke_button a:active.cke_off
-{
-	padding-bottom: 3px;
-}
-*/
-/* Firefox 2 Section */
-
-.cke_skin_office2003 .cke_browser_gecko .cke_toolbar,
-.cke_skin_office2003 .cke_browser_gecko .cke_button a,
-.cke_skin_office2003 .cke_browser_gecko .cke_button a.cke_off,
-.cke_skin_office2003 .cke_browser_gecko .cke_button .cke_icon,
-.cke_skin_office2003 .cke_browser_gecko .cke_button .cke_buttonarrow,
-.cke_skin_office2003 .cke_browser_gecko .cke_separator,
-.cke_skin_office2003 .cke_browser_gecko .cke_toolbar_start,
-.cke_skin_office2003 .cke_browser_gecko .cke_toolbar_end
+/*** Firefox 2 ***/
+
+.cke_skin_office2003 .cke_browser_gecko18 .cke_toolbar,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_button a,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_button a.cke_off,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_button .cke_icon,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_button .cke_buttonarrow,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_separator,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_toolbar_start,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_toolbar_end
 {
 	display: block;
@@ -357,47 +308,49 @@
 }
 
-.cke_skin_office2003 .cke_browser_gecko .cke_hc .cke_button .cke_icon
+.cke_skin_office2003 .cke_browser_gecko18 .cke_hc .cke_button .cke_icon
 {
 	display: none;
 }
 
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_toolbar,
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_button a,
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_button a.cke_off,
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_button .cke_icon,
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_button .cke_buttonarrow,
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_separator,
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_toolbar_start,
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_toolbar_end
-{
-	float: right;
-}
-
-.cke_skin_office2003 .cke_browser_gecko .cke_button .cke_label,
-.cke_skin_office2003 .cke_browser_gecko .cke_break
-{
-	float: left;
-}
-
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl span.cke_inline_label
-{
-	float: right;
-}
-
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_button .cke_label,
-.cke_skin_office2003 .cke_browser_gecko .cke_rtl .cke_break
-{
-	float: right;
-}
-
-.cke_skin_office2003 .cke_browser_gecko .cke_separator
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_toolbar,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_button a,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_button a.cke_off,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_button .cke_icon,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_button .cke_buttonarrow,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_separator,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_toolbar_start,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_toolbar_end
+{
+	float: right;
+}
+
+.cke_skin_office2003 .cke_browser_gecko18 .cke_button .cke_label,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_break
+{
+	float: left;
+}
+
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl span.cke_inline_label
+{
+	float: right;
+}
+
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_button .cke_label,
+.cke_skin_office2003 .cke_browser_gecko18 .cke_rtl .cke_break
+{
+	float: right;
+}
+
+.cke_skin_office2003 .cke_browser_gecko18 .cke_separator
 {
 	margin-top: 4px;
 }
 
-.cke_skin_office2003 .cke_browser_gecko .cke_button .cke_label
+.cke_skin_office2003 .cke_browser_gecko18 .cke_button .cke_label
 {
 	padding-top: 3px;
 }
+
+/*** IE6 ***/
 
 .cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_toolgroup,
@@ -409,5 +362,6 @@
 }
 
-/* IE8 strict height correction */
+/*** IE8 ***/
+
 .cke_skin_office2003 .cke_browser_ie8 .cke_toolbar,
 .cke_skin_office2003 .cke_browser_ie8 .cke_toolgroup
@@ -422,17 +376,2 @@
 	vertical-align: baseline;
 }
-/* END IE8 strict height correction */
-
-/* IE8 strict button valign correction */
-/*.cke_skin_office2003 .cke_browser_ie8 .cke_button .cke_label
-{
-	vertical-align: top;
-}
-
-.cke_skin_office2003 .cke_browser_iequirks.cke_browser_ie8 .cke_button .cke_label
-{
-	*//* revert previous *//*
-	vertical-align: middle;
-}*/
-/* END IE8 strict button valign correction */
-
Index: /CKEditor/branches/features/kama/_source/skins/v2/elementspath.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/v2/elementspath.css	(revision 3646)
+++ /CKEditor/branches/features/kama/_source/skins/v2/elementspath.css	(revision 3647)
@@ -15,5 +15,5 @@
 {
 	padding: 3px 3px 0 3px;
-	display: block;
+	display: inline-block;
 	float: left;
 }
@@ -43,4 +43,10 @@
 }
 
+.cke_skin_v2 .cke_rtl .cke_path a,
+.cke_skin_v2 .cke_rtl .cke_path cke_empty
+{
+	float: right;
+}
+
 .cke_skin_v2 .cke_path a:hover,
 .cke_skin_v2 .cke_path a:focus,
@@ -56,5 +62,4 @@
 }
 
-/* IE double float-right workaround */
 .cke_skin_v2 .cke_browser_ie .cke_rtl .cke_path a,
 .cke_skin_v2 .cke_browser_ie .cke_rtl .cke_path .cke_empty
@@ -62,10 +67,2 @@
 	float: none;
 }
-
-.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_path,
-.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_path a,
-.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_path .cke_empty
-{
-	display: inline-block;
-}
-/* END IE double float-right workaround */
Index: /CKEditor/branches/features/kama/_source/skins/v2/mainui.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/v2/mainui.css	(revision 3646)
+++ /CKEditor/branches/features/kama/_source/skins/v2/mainui.css	(revision 3647)
@@ -58,12 +58,4 @@
 }
 
-/* IE(6, 7) strict source view fix */
-.cke_skin_v2 .cke_browser_ie6 .cke_contents textarea,
-.cke_skin_v2 .cke_browser_ie7 .cke_contents textarea
-{
-	position: absolute;
-}
-/* END IE(6, 7) strict source view fix */
-
 .cke_skin_v2 .cke_focus
 {
@@ -102,2 +94,8 @@
 	float: left;
 }
+
+.cke_skin_v2 .cke_browser_ie6 .cke_contents textarea,
+.cke_skin_v2 .cke_browser_ie7 .cke_contents textarea
+{
+	position: absolute;
+}
Index: /CKEditor/branches/features/kama/_source/skins/v2/richcombo.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/v2/richcombo.css	(revision 3646)
+++ /CKEditor/branches/features/kama/_source/skins/v2/richcombo.css	(revision 3647)
@@ -3,17 +3,15 @@
 .cke_skin_v2 .cke_rcombo
 {
-	float: left;
-	display: inline-block;
-
+	display: inline-block;
 	margin-left: 2px;
 	margin-right: 2px;
 	margin-top: 2px;
-	
 	vertical-align: top;
+	float: left;
 }
 
 .cke_skin_v2 .cke_rtl .cke_rcombo
 {
-	float: none;
+	float: right;
 }
 
@@ -30,4 +28,5 @@
 .cke_skin_v2 .cke_rcombo a
 {
+	display: inline-block;
 	float: left;
 
@@ -36,4 +35,9 @@
 }
 
+.cke_skin_v2 .cke_rtl .cke_rcombo a
+{
+	float: right;
+}
+
 .cke_skin_v2 .cke_hc .cke_rcombo a
 {
@@ -49,5 +53,5 @@
 	line-height: 24px;
 	height: 24px;
-	
+
 	vertical-align: top;
 	padding-left: 4px;
@@ -58,7 +62,9 @@
 }
 
-.cke_skin_v2 .cke_rcombo .cke_inline_label
-{
-	color: #fff;
+.cke_skin_v2 .cke_rtl .cke_rcombo .cke_label
+{
+	float: right;
+	padding-right: 4px;
+	padding-left: 5px;
 }
 
@@ -69,8 +75,7 @@
 }
 
-.cke_skin_v2 .cke_rtl .cke_rcombo .cke_label
-{
-	padding-right: 4px;
-	padding-left: 5px;
+.cke_skin_v2 .cke_rcombo .cke_inline_label
+{
+	color: #fff;
 }
 
@@ -122,5 +127,5 @@
 	background-position: center center;
 	background-image: url(images/arrowdown.gif);
- 	background-repeat: no-repeat;
+	background-repeat: no-repeat;
 
 	border-top: 1px solid #8f8f73;
@@ -152,10 +157,4 @@
 }
 
-/*.cke_skin_v2 .cke_browser_iequirks .cke_rcombo .cke_openbutton
-{
-	height: 24px;
-    width: 15px;
-}*/
-
 .cke_skin_v2 .cke_rcombo .cke_off a:hover,
 .cke_skin_v2 .cke_rcombo .cke_off a:focus,
@@ -231,7 +230,8 @@
 /* Firefox 2 & WebKit Section */
 
-.cke_skin_v2 .cke_browser_gecko .cke_rcombo .cke_label,
-.cke_skin_v2 .cke_browser_gecko .cke_rcombo .cke_text,
-.cke_skin_v2 .cke_browser_gecko .cke_rcombo .cke_openbutton,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rcombo,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rcombo .cke_label,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rcombo .cke_text,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rcombo .cke_openbutton,
 .cke_skin_v2 .cke_browser_webkit .cke_rcombo .cke_label,
 .cke_skin_v2 .cke_browser_webkit .cke_rcombo .cke_text,
@@ -242,7 +242,8 @@
 }
 
-.cke_skin_v2 .cke_browser_gecko .cke_rtl .cke_rcombo .cke_label,
-.cke_skin_v2 .cke_browser_gecko .cke_rtl .cke_rcombo .cke_text,
-.cke_skin_v2 .cke_browser_gecko .cke_rtl .cke_rcombo .cke_openbutton,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_rcombo,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_rcombo .cke_label,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_rcombo .cke_text,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_rcombo .cke_openbutton,
 .cke_skin_v2 .cke_browser_webkit .cke_rtl .cke_rcombo .cke_label,
 .cke_skin_v2 .cke_browser_webkit .cke_rtl .cke_rcombo .cke_text,
@@ -251,2 +252,11 @@
 	float: right;
 }
+
+/*** IE ***/
+
+.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_rcombo,
+.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_rcombo a,
+.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_rcombo .cke_label
+{
+	float: none;
+}
Index: /CKEditor/branches/features/kama/_source/skins/v2/toolbar.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/v2/toolbar.css	(revision 3646)
+++ /CKEditor/branches/features/kama/_source/skins/v2/toolbar.css	(revision 3647)
@@ -4,12 +4,7 @@
 */
 
-.cke_toolbox
-{
-	clear: both;
-}
-
 @media print
 {
-	.cke_toolbox
+	.cke_skin_v2 .cke_toolbox
 	{
 		display: none;
@@ -54,6 +49,6 @@
 	padding-top: 1px;
 	padding-bottom: 1px;
-	float: left;
-	display: inline-block;
+	display: inline-block;
+	float: left;
 }
 
@@ -76,10 +71,9 @@
 .cke_skin_v2 .cke_separator
 {
-	float: left;
-	display: inline-block;
+	display: inline-block;
+	float: left;
 	border-left: solid 1px #999;
-	margin-left: 2px;
-	margin-right: 2px;
-	height:16px;
+	margin: 0 2px;
+	height: 16px;
 }
 
@@ -99,70 +93,13 @@
 }
 
-/* RTL *//*
-.cke_skin_v2 .cke_rtl .cke_toolgroup
-{
-	float: right;
-}
-
-.cke_skin_v2 .cke_browser_ie6 .cke_rtl .cke_toolbar,
-.cke_skin_v2 .cke_browser_ie7 .cke_rtl .cke_toolbar,
-.cke_skin_v2 .cke_browser_iequirks .cke_rtl .cke_toolbar
-{
-	display: inline;
-}
-
-.cke_skin_v2 .cke_browser_ie7 .cke_rtl .cke_toolgroup
-{
-	float: left;
-}
-
-.cke_skin_v2 .cke_browser_ie6 .cke_rtl .cke_toolgroup,
-.cke_skin_v2 .cke_browser_iequirks .cke_rtl .cke_toolgroup
-{
-	float: none;
-	height: 28px;
-	zoom: 1;
-}
-
-.cke_skin_v2 .cke_browser_ie6 .cke_rtl .cke_icon,
-.cke_skin_v2 .cke_browser_ie7 .cke_rtl .cke_icon,
-.cke_skin_v2 .cke_browser_iequirks .cke_rtl .cke_icon
-{
-	display: inline;
-	float: left;
-}
-
-.cke_skin_v2 .cke_browser_ie6 .cke_rtl .cke_label,
-.cke_skin_v2 .cke_browser_ie7 .cke_rtl .cke_label,
-.cke_skin_v2 .cke_browser_iequirks .cke_rtl .cke_label
-{
-	float: left;
-}
-
-.cke_skin_v2 .cke_browser_ie6 .cke_rtl .cke_toolbar_start,
-.cke_skin_v2 .cke_browser_ie7 .cke_rtl .cke_toolbar_start,
-.cke_skin_v2 .cke_browser_iequirks .cke_rtl .cke_toolbar_start
-{
-	display: inline;
-}
-
-.cke_skin_v2 .cke_browser_ie6 .cke_rtl .cke_toolbar_end,
-.cke_skin_v2 .cke_browser_ie7 .cke_rtl .cke_toolbar_end,
-.cke_skin_v2 .cke_browser_iequirks .cke_rtl .cke_toolbar_end
-{
-	display: inline;
-}*/
-/* END RTL */
-
 .cke_skin_v2 .cke_toolbar_start
 {
-	float: left;
-	display: inline-block;
-
-  background-image: url(images/toolbar_start.gif);
+	display: inline-block;
+	background-image: url(images/toolbar_start.gif);
 	background-repeat: no-repeat;
 	margin: 4px 2px 0 2px;
 	width: 3px;
 	height: 16px;
+	float: left;
 }
 
@@ -313,67 +250,13 @@
 }
 
-/* IE Section */
-
-.cke_skin_v2 .cke_browser_ie .cke_button .cke_buttonarrow
-{
-	margin-top: -1px;
-}
-
-/* Repeat it here for all variations of ".cke_button a" because of IE6 */
-.cke_skin_v2 .cke_browser_ie .cke_button a,
-.cke_skin_v2 .cke_browser_ie .cke_button a.cke_off,
-.cke_skin_v2 .cke_browser_ie .cke_button a.cke_on,
-.cke_skin_v2 .cke_browser_ie .cke_button a.cke_disabled,
-.cke_skin_v2 .cke_browser_ie .cke_button a:hover.cke_on,
-.cke_skin_v2 .cke_browser_ie .cke_button a:focus.cke_on,
-.cke_skin_v2 .cke_browser_ie .cke_button a:active.cke_on,
-.cke_skin_v2 .cke_browser_ie .cke_button a:hover.cke_off,
-.cke_skin_v2 .cke_browser_ie .cke_button a:focus.cke_off,
-.cke_skin_v2 .cke_browser_ie .cke_button a:active.cke_off
-{
-	padding-top: 2px;
-	padding-left: 4px;
-	padding-right: 4px;
-	padding-bottom: 2px;
-	height: 18px;
-}
-
-.cke_skin_v2 .cke_browser_ie6 .cke_separator
-.cke_skin_v2 .cke_browser_ie7 .cke_separator,
-{
-	vertical-align: 35%;
-}
-
-
-.cke_skin_v2 .cke_browser_ie .cke_button .cke_label
-{
-	vertical-align: 1px;
-}
-
-/* IE+Quirks Section */
-
-.cke_skin_v2 .cke_browser_iequirks .cke_button a,
-.cke_skin_v2 .cke_browser_iequirks .cke_button a.cke_off,
-.cke_skin_v2 .cke_browser_iequirks .cke_button a.cke_on,
-.cke_skin_v2 .cke_browser_iequirks .cke_button a.cke_disabled,
-.cke_skin_v2 .cke_browser_iequirks .cke_button a:hover.cke_on,
-.cke_skin_v2 .cke_browser_iequirks .cke_button a:focus.cke_on,
-.cke_skin_v2 .cke_browser_iequirks .cke_button a:active.cke_on,
-.cke_skin_v2 .cke_browser_iequirks .cke_button a:hover.cke_off,
-.cke_skin_v2 .cke_browser_iequirks .cke_button a:focus.cke_off,
-.cke_skin_v2 .cke_browser_iequirks .cke_button a:active.cke_off
-{
-	padding-bottom: 3px;
-}
-
-/* Firefox 2 Section */
-
-.cke_skin_v2 .cke_browser_gecko .cke_toolbar,
-.cke_skin_v2 .cke_browser_gecko .cke_button a,
-.cke_skin_v2 .cke_browser_gecko .cke_button a.cke_off,
-.cke_skin_v2 .cke_browser_gecko .cke_button .cke_icon,
-.cke_skin_v2 .cke_browser_gecko .cke_button .cke_buttonarrow,
-.cke_skin_v2 .cke_browser_gecko .cke_separator,
-.cke_skin_v2 .cke_browser_gecko .cke_toolbar_start
+/*** Firefox 2 ***/
+
+.cke_skin_v2 .cke_browser_gecko18 .cke_toolbar,
+.cke_skin_v2 .cke_browser_gecko18 .cke_button a,
+.cke_skin_v2 .cke_browser_gecko18 .cke_button a.cke_off,
+.cke_skin_v2 .cke_browser_gecko18 .cke_button .cke_icon,
+.cke_skin_v2 .cke_browser_gecko18 .cke_button .cke_buttonarrow,
+.cke_skin_v2 .cke_browser_gecko18 .cke_separator,
+.cke_skin_v2 .cke_browser_gecko18 .cke_toolbar_start
 {
 	display: block;
@@ -381,64 +264,48 @@
 }
 
-.cke_skin_v2 .cke_browser_gecko .cke_hc .cke_button .cke_icon
+.cke_skin_v2 .cke_browser_gecko18 .cke_hc .cke_button .cke_icon
 {
 	display: none;
 }
 
-.cke_skin_v2 .cke_browser_gecko .cke_rtl .cke_toolbar,
-.cke_skin_v2 .cke_browser_gecko .cke_rtl .cke_button a,
-.cke_skin_v2 .cke_browser_gecko .cke_rtl .cke_button a.cke_off,
-.cke_skin_v2 .cke_browser_gecko .cke_rtl .cke_button .cke_icon,
-.cke_skin_v2 .cke_browser_gecko .cke_rtl .cke_button .cke_buttonarrow,
-.cke_skin_v2 .cke_browser_gecko .cke_rtl .cke_separator,
-.cke_skin_v2 .cke_browser_gecko .cke_rtl .cke_toolbar_start
-{
-	float: right;
-}
-
-.cke_skin_v2 .cke_browser_gecko .cke_button .cke_label,
-.cke_skin_v2 .cke_browser_gecko .cke_break
-{
-	float: left;
-}
-
-.cke_skin_v2 .cke_browser_gecko .cke_rtl span.cke_inline_label
-{
-	float: right;
-}
-
-.cke_skin_v2 .cke_browser_gecko .cke_rtl .cke_button .cke_label,
-.cke_skin_v2 .cke_browser_gecko .cke_rtl .cke_break
-{
-	float: right;
-}
-
-.cke_skin_v2 .cke_browser_gecko .cke_separator
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_toolbar,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_button a,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_button a.cke_off,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_button .cke_icon,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_button .cke_buttonarrow,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_separator,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_toolbar_start
+{
+	float: right;
+}
+
+.cke_skin_v2 .cke_browser_gecko18 .cke_button .cke_label,
+.cke_skin_v2 .cke_browser_gecko18 .cke_break
+{
+	float: left;
+}
+
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl span.cke_inline_label
+{
+	float: right;
+}
+
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_button .cke_label,
+.cke_skin_v2 .cke_browser_gecko18 .cke_rtl .cke_break
+{
+	float: right;
+}
+
+.cke_skin_v2 .cke_browser_gecko18 .cke_separator
 {
 	margin-top: 4px;
 }
 
-.cke_skin_v2 .cke_browser_gecko .cke_button .cke_label
+.cke_skin_v2 .cke_browser_gecko18 .cke_button .cke_label
 {
 	padding-top: 3px;
 }
 
-/*.cke_skin_v2 .cke_browser_ie8 .cke_button .cke_label
-{
-	padding-top: 2px;
-	float: right;
-}
-
-.cke_skin_v2 .cke_browser_ie8 .cke_rtl .cke_button .cke_label
-{
-	padding-top: 2px;
-	float: left;
-}*/
-
-.cke_skin_v2 .cke_browser_iequirks .cke_button .cke_label
-{
-	padding-top: 0;
-	float: none;
-}
+/*** IE6 ***/
 
 .cke_skin_v2 .cke_browser_ie .cke_rtl .cke_toolgroup,
@@ -450,5 +317,6 @@
 }
 
-/* IE8 strict height correction */
+/*** IE8 ***/
+
 .cke_skin_v2 .cke_browser_ie8 .cke_toolbar,
 .cke_skin_v2 .cke_browser_ie8 .cke_toolgroup
@@ -463,3 +331,2 @@
 	vertical-align: baseline;
 }
-/* END IE8 strict height correction */
