Index: /CKEditor/branches/features/kama/_source/core/env.js
===================================================================
--- /CKEditor/branches/features/kama/_source/core/env.js	(revision 3640)
+++ /CKEditor/branches/features/kama/_source/core/env.js	(revision 3641)
@@ -200,11 +200,8 @@
 		if ( env.ie )
 		{
-			if ( env.version < 7 )
-			{
-				env.cssClass += ' cke_browser_ie' + (
-					env.version < 7 ? '6' :
-					env.version >= 8 ? '8' :
-					'7' );
-			}
+			env.cssClass += ' cke_browser_ie' + (
+				env.version < 7 ? '6' :
+				env.version >= 8 ? '8' :
+				'7' );
 
 			if ( env.quirks )
Index: /CKEditor/branches/features/kama/_source/skins/kama/dialog.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/dialog.css	(revision 3640)
+++ /CKEditor/branches/features/kama/_source/skins/kama/dialog.css	(revision 3641)
@@ -291,4 +291,9 @@
 }
 
+.cke_skin_kama .cke_rtl a.cke_dialog_ui_button_ok span
+{
+	background-position: left -1219px;
+}
+
 .cke_skin_kama .cke_browser_ie7 a.cke_dialog_ui_button_ok span
 {
@@ -312,4 +317,10 @@
 	background: transparent url(sprites.png) no-repeat scroll right -1245px;
 	padding-right: 20px;
+	padding-left: 20px;
+}
+
+.cke_skin_kama .cke_rtl a.cke_dialog_ui_button_cancel span
+{
+	background-position: left -1245px;
 }
 
Index: /CKEditor/branches/features/kama/_source/skins/kama/elementspath.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/elementspath.css	(revision 3640)
+++ /CKEditor/branches/features/kama/_source/skins/kama/elementspath.css	(revision 3641)
@@ -42,10 +42,4 @@
 }
 
-.cke_skin_kama .cke_rtl .cke_path a,
-.cke_skin_kama .cke_rtl .cke_path .cke_empty
-{
-	float: right;
-}
-
 .cke_skin_kama .cke_path a:hover,
 .cke_skin_kama .cke_path a:focus,
@@ -60,2 +54,17 @@
 	color : #000;
 }
+
+/* IE double float-right workaround */
+.cke_skin_kama .cke_browser_ie .cke_rtl .cke_path a,
+.cke_skin_kama .cke_browser_ie .cke_rtl .cke_path .cke_empty
+{
+	float: none;
+}
+
+.cke_skin_kama .cke_browser_ie .cke_rtl .cke_path,
+.cke_skin_kama .cke_browser_ie .cke_rtl .cke_path a,
+.cke_skin_kama .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/kama/toolbar.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/toolbar.css	(revision 3640)
+++ /CKEditor/branches/features/kama/_source/skins/kama/toolbar.css	(revision 3641)
@@ -347,2 +347,15 @@
 	line-height: 17px;
 }
+
+/* IE8 strict button valign correction */
+.cke_skin_kama .cke_browser_ie8 .cke_button .cke_label
+{
+	vertical-align: top;
+}
+
+.cke_skin_kama .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/office2003/elementspath.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/elementspath.css	(revision 3640)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/elementspath.css	(revision 3641)
@@ -43,10 +43,4 @@
 }
 
-.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,
@@ -61,2 +55,17 @@
 	outline: none;
 }
+
+/* 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
+{
+	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 3640)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/mainui.css	(revision 3641)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -49,4 +49,12 @@
 }
 
+/* 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
 {
Index: /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css	(revision 3640)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/richcombo.css	(revision 3641)
@@ -28,7 +28,8 @@
 .cke_skin_office2003 .cke_rcombo a
 {
+	float: left;
+
 	filter: alpha(opacity=70); /* IE */
 	opacity: 0.70; /* Safari, Opera and Mozilla */
-	float: left;
 }
 
@@ -43,6 +44,8 @@
 	display: inline-block;
 	float: left;
+	
 	line-height: 24px;
 	height: 24px;
+
 	vertical-align: top;
 	padding-left: 4px;
@@ -83,6 +86,6 @@
 	padding-left: 5px;
 	padding-right: 5px;
-    text-overflow: ellipsis;
-    overflow: hidden;
+	text-overflow: ellipsis;
+	overflow: hidden;
 	display: inline-block;
 }
@@ -108,14 +111,22 @@
 }
 
+/* Fix for IE height */
+.cke_skin_office2003 .cke_browser_iequirks .cke_rcombo .cke_text
+{
+	height: 22px;
+}
+
 .cke_skin_office2003 .cke_rcombo .cke_openbutton
 {
+	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;
-	display: inline-block;
     width: 14px;
 	height: 22px;
-    background-repeat: no-repeat;
 }
 
Index: /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css	(revision 3640)
+++ /CKEditor/branches/features/kama/_source/skins/office2003/toolbar.css	(revision 3641)
@@ -65,5 +65,5 @@
 	display: inline-block;
 	float: left;
-    height: 28px;
+	height: 28px;
 }
 
@@ -102,9 +102,9 @@
 	background-image: url(images/sprites.png);
 	_background-image: url(images/sprites_ie6.png);
-    background-repeat: no-repeat;
-    background-position: -27px -765px;
-    width: 10px;
-    height: 28px;
-    float: left;
+	background-repeat: no-repeat;
+	background-position: -27px -765px;
+	width: 10px;
+	height: 28px;
+	float: left;
 }
 
@@ -120,9 +120,9 @@
 	background-image: url(images/sprites.png);
 	_background-image: url(images/sprites_ie6.png);
-    background-repeat: no-repeat;
-    background-position: -29px -861px;
-    width: 4px;
-    height: 28px;
-    float: left;
+	background-repeat: no-repeat;
+	background-position: -29px -861px;
+	width: 4px;
+	height: 28px;
+	float: left;
 }
 
@@ -408,2 +408,31 @@
 	float: none;
 }
+
+/* IE8 strict height correction */
+.cke_skin_office2003 .cke_browser_ie8 .cke_toolbar,
+.cke_skin_office2003 .cke_browser_ie8 .cke_toolgroup
+{
+	vertical-align: top;
+}
+
+.cke_skin_office2003 .cke_browser_iequirks.cke_browser_ie8 .cke_toolbar,
+.cke_skin_office2003 .cke_browser_iequirks.cke_browser_ie8 .cke_toolgroup
+{
+	/* revert previous */
+	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 3640)
+++ /CKEditor/branches/features/kama/_source/skins/v2/elementspath.css	(revision 3641)
@@ -27,5 +27,5 @@
 .cke_skin_v2 .cke_path .cke_empty
 {
-	display: block;
+	display: inline-block;
 	float: left;
 	border: solid 1px #efefde;
@@ -43,10 +43,4 @@
 }
 
-.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,
@@ -61,2 +55,17 @@
 	outline: none;
 }
+
+/* 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
+{
+	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 3640)
+++ /CKEditor/branches/features/kama/_source/skins/v2/mainui.css	(revision 3641)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -58,4 +58,12 @@
 }
 
+/* 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
 {
Index: /CKEditor/branches/features/kama/_source/skins/v2/richcombo.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/v2/richcombo.css	(revision 3640)
+++ /CKEditor/branches/features/kama/_source/skins/v2/richcombo.css	(revision 3641)
@@ -3,19 +3,18 @@
 .cke_skin_v2 .cke_rcombo
 {
-	display: inline-block;
+	float: left;
+	display: inline-block;
+
 	margin-left: 2px;
 	margin-right: 2px;
-	float: left;
-}
-
-/* RTL */
-.cke_skin_v2 .cke_borwser_ie6.cke_rtl .cke_rcombo,
-.cke_skin_v2 .cke_borwser_ie7.cke_rtl .cke_rcombo,
-.cke_skin_v2 .cke_borwser_iequirks.cke_rtl .cke_rcombo
+	margin-top: 2px;
+	
+	vertical-align: top;
+}
+
+.cke_skin_v2 .cke_rtl .cke_rcombo
 {
 	float: none;
-	display: inline;
-}
-/* END RTL */
+}
 
 .cke_skin_v2 .cke_rcombopanel
@@ -31,7 +30,8 @@
 .cke_skin_v2 .cke_rcombo a
 {
+	float: left;
+
 	filter: alpha(opacity=70); /* IE */
 	opacity: 0.70; /* Safari, Opera and Mozilla */
-	float: left;
 }
 
@@ -44,7 +44,10 @@
 .cke_skin_v2 .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;
@@ -53,10 +56,4 @@
 	opacity: 0.70; /* Safari, Opera and Mozilla */
 	background-color: #f1f1e3;	/* Because of IE6+ClearType */
-}
-
-/* TODO IE8 ? */
-.cke_skin_v2 .cke_browser_ie6 .cke_rcombo a *
-{
-	float: left;
 }
 
@@ -88,6 +85,6 @@
 	padding-left: 5px;
 	padding-right: 5px;
-    text-overflow: ellipsis;
-    overflow: hidden;
+	text-overflow: ellipsis;
+	overflow: hidden;
 	display: inline-block;
 }
@@ -113,20 +110,22 @@
 }
 
+/* Fix for IE height */
 .cke_skin_v2 .cke_browser_iequirks .cke_rcombo .cke_text
 {
-	height: 24px;
-	width: 72px;
+	height: 22px;
 }
 
 .cke_skin_v2 .cke_rcombo .cke_openbutton
 {
-    background-position: center center;
-    background-image: url(images/arrowdown.gif);
-    border-top: 1px solid #8f8f73;
-    border-bottom: 1px solid #8f8f73;
-	display: inline-block;
-    width: 14px;
+	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;
 	height: 22px;
-    background-repeat: no-repeat;
 }
 
@@ -153,9 +152,9 @@
 }
 
-.cke_skin_v2 .cke_browser_iequirks .cke_rcombo .cke_openbutton
+/*.cke_skin_v2 .cke_browser_iequirks .cke_rcombo .cke_openbutton
 {
 	height: 24px;
     width: 15px;
-}
+}*/
 
 .cke_skin_v2 .cke_rcombo .cke_off a:hover,
Index: /CKEditor/branches/features/kama/_source/skins/v2/toolbar.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/v2/toolbar.css	(revision 3640)
+++ /CKEditor/branches/features/kama/_source/skins/v2/toolbar.css	(revision 3641)
@@ -54,9 +54,20 @@
 	padding-top: 1px;
 	padding-bottom: 1px;
-	float:left;
+	float: left;
 	display: inline-block;
 }
 
 .cke_skin_v2 .cke_rtl .cke_toolbar
+{
+	float: right;
+}
+
+.cke_skin_v2 .cke_toolgroup
+{
+	display: inline-block;
+	float: left;
+}
+
+.cke_skin_v2 .cke_rtl .cke_toolgroup 
 {
 	float: right;
@@ -75,5 +86,5 @@
 .cke_skin_v2 .cke_rtl .cke_separator
 {
-	float: none;
+	float: right;
 }
 
@@ -88,5 +99,5 @@
 }
 
-/* RTL */
+/* RTL *//*
 .cke_skin_v2 .cke_rtl .cke_toolgroup
 {
@@ -141,5 +152,5 @@
 {
 	display: inline;
-}
+}*/
 /* END RTL */
 
@@ -148,14 +159,26 @@
 	float: left;
 	display: inline-block;
-    background-image: url(images/toolbar_start.gif);
-    background-repeat: no-repeat;
-    margin: 4px 2px 0 2px;
-    width: 3px;
-    height: 16px;
+
+  background-image: url(images/toolbar_start.gif);
+	background-repeat: no-repeat;
+	margin: 4px 2px 0 2px;
+	width: 3px;
+	height: 16px;
+}
+
+.cke_skin_v2 .cke_rtl .cke_toolbar_start
+{
+	float: right;
 }
 
 .cke_skin_v2 .cke_toolbar_end
 {
-	float: left;
+	display: inline-block;
+	float: left;
+}
+
+.cke_skin_v2 .cke_rtl .cke_toolbar_end
+{
+    float: right;
 }
 
@@ -192,5 +215,4 @@
 	filter: alpha(opacity=100); /* IE */
 	opacity: 1; /* Safari, Opera and Mozilla */
-	padding: 2px 4px;
 }
 
@@ -289,10 +311,4 @@
 {
 	background-position: left center;
-}
-
-.cke_skin_v2 .cke_toolgroup
-{
-	float: left;
-	display: inline;
 }
 
@@ -323,5 +339,6 @@
 }
 
-.cke_skin_v2 .cke_browser_ie .cke_separator
+.cke_skin_v2 .cke_browser_ie6 .cke_separator
+.cke_skin_v2 .cke_browser_ie7 .cke_separator,
 {
 	vertical-align: 35%;
@@ -407,5 +424,5 @@
 }
 
-.cke_skin_v2 .cke_browser_ie8 .cke_button .cke_label
+/*.cke_skin_v2 .cke_browser_ie8 .cke_button .cke_label
 {
 	padding-top: 2px;
@@ -417,5 +434,5 @@
 	padding-top: 2px;
 	float: left;
-}
+}*/
 
 .cke_skin_v2 .cke_browser_iequirks .cke_button .cke_label
@@ -424,2 +441,25 @@
 	float: none;
 }
+
+.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_toolgroup,
+.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_separator,
+.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_toolbar_start,
+.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_toolbar_end
+{
+	float: none;
+}
+
+/* IE8 strict height correction */
+.cke_skin_v2 .cke_browser_ie8 .cke_toolbar,
+.cke_skin_v2 .cke_browser_ie8 .cke_toolgroup
+{
+	vertical-align: top;
+}
+
+.cke_skin_v2 .cke_browser_iequirks.cke_browser_ie8 .cke_toolbar,
+.cke_skin_v2 .cke_browser_iequirks.cke_browser_ie8 .cke_toolgroup
+{
+	/* revert previous */
+	vertical-align: baseline;
+}
+/* END IE8 strict height correction */