Index: /CKEditor/branches/features/kama/_source/skins/kama/dialog.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/dialog.css	(revision 3611)
+++ /CKEditor/branches/features/kama/_source/skins/kama/dialog.css	(revision 3612)
@@ -257,4 +257,6 @@
 
 	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
 	background: transparent url(sprites.png) repeat-x scroll 0 -1069px;
 	_background: none;
Index: /CKEditor/branches/features/kama/_source/skins/kama/richcombo.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/richcombo.css	(revision 3611)
+++ /CKEditor/branches/features/kama/_source/skins/kama/richcombo.css	(revision 3612)
@@ -1,2 +1,7 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
 /* Special Combo */
 
@@ -4,5 +9,5 @@
 {
 	display: inline-block;
-	margin: 0 3px;
+	margin-right: 6px;
 }
 
@@ -17,5 +22,5 @@
 }
 
-/* IE6 workaround, shouln't be here */
+/* IE6 workaround, shouldn't be here */
 .cke_skin_kama .cke_browser_iequirks .cke_rcombopanel,
 .cke_skin_kama .cke_browser_ie6 .cke_rcombopanel
@@ -41,72 +46,4 @@
 }
 
-.cke_skin_kama .cke_browser_iequirks .cke_rcombo a,
-.cke_skin_kama .cke_browser_iequirks .cke_rcombo a:active,
-.cke_skin_kama .cke_browser_iequirks .cke_rcombo a:hover,
-.cke_skin_kama .cke_browser_ie6 .cke_rcombo a,
-.cke_skin_kama .cke_browser_ie6 .cke_rcombo a:active,
-.cke_skin_kama .cke_browser_ie6 .cke_rcombo a:hover
-{
-	border-bottom: 1px solid transparent;
-	background: #FEFEFE none;
-	padding-bottom: 0;
-	margin-bottom: -3px;
-}
-
-.cke_skin_kama .cke_browser_iequirks.cke_browser_ie8 .cke_rcombo a,
-.cke_skin_kama .cke_browser_iequirks.cke_browser_ie8 .cke_rcombo a:active,
-.cke_skin_kama .cke_browser_iequirks.cke_browser_ie8 .cke_rcombo a:hover
-{
-	margin-bottom: -6px;
-}
-
-/* Fix combo height IE6 */
-.cke_skin_kama .cke_browser_iequirks .cke_rcombo .cke_off,
-.cke_skin_kama .cke_browser_iequirks .cke_rcombo .cke_on,
-.cke_skin_kama .cke_browser_iequirks .cke_rcombo,
-.cke_skin_kama .cke_browser_iequirks .cke_rcombo
-{
-	margin-bottom: -5px;
-}
-
-.cke_skin_kama .cke_browser_iequirks .cke_toolbox
-{
-	padding-bottom: 0;
-}
-
-.cke_skin_kama .cke_browser_ie8.cke_browser_iequirks .cke_rcombo .cke_off,
-.cke_skin_kama .cke_browser_ie8.cke_browser_iequirks .cke_rcombo .cke_on,
-.cke_skin_kama .cke_browser_ie8.cke_browser_iequirks .cke_rcombo,
-.cke_skin_kama .cke_browser_ie8.cke_browser_iequirks .cke_rcombo,
-.cke_skin_kama .cke_browser_ie7.cke_browser_iequirks .cke_rcombo .cke_off,
-.cke_skin_kama .cke_browser_ie7.cke_browser_iequirks .cke_rcombo .cke_on,
-.cke_skin_kama .cke_browser_ie7.cke_browser_iequirks .cke_rcombo,
-.cke_skin_kama .cke_browser_ie7.cke_browser_iequirks .cke_rcombo
-{
-	margin-bottom: 0;
-}
-
-.cke_skin_kama .cke_browser_ie8.cke_browser_iequirks .cke_toolbox,
-.cke_skin_kama .cke_browser_ie7.cke_browser_iequirks .cke_toolbox
-{
-	padding-bottom: 0;
-}
-/* END Fix combo height IE6 */
-
-/* Fix combo height IE7 & IE8 */
-.cke_skin_kama .cke_browser_ie8.cke_browser_iequirks .cke_rcombo .cke_off,
-.cke_skin_kama .cke_browser_ie8.cke_browser_iequirks .cke_rcombo .cke_on,
-.cke_skin_kama .cke_browser_ie8.cke_browser_iequirks .cke_rcombo,
-.cke_skin_kama .cke_browser_ie8.cke_browser_iequirks .cke_rcombo
-{
-	margin-bottom: -2px;
-}
-
-.cke_skin_kama .cke_browser_ie8.cke_browser_iequirks .cke_toolbox
-{
-	padding-bottom: 1px;
-}
-/* END Fix combo height IE7 & IE8 */
-
 .cke_skin_kama .cke_hc .cke_rcombo a
 {
@@ -169,21 +106,4 @@
 }
 
-.cke_skin_kama .cke_browser_opera .cke_rcombo .cke_text
-{
-	margin-bottom: 3px;
-}
-
-.cke_skin_kama .cke_browser_ie6 .cke_rcombo .cke_text,
-.cke_skin_kama .cke_browser_iequirks .cke_rcombo .cke_text
-{
-	filter: none;
-}
-
-.cke_skin_kama .cke_browser_iequirks .cke_rcombo .cke_text
-{
-	height: 24px;
-	width: 72px;
-}
-
 .cke_skin_kama .cke_rcombo .cke_openbutton
 {
@@ -193,5 +113,5 @@
 	display: inline-block;
 	width: 17px;
-	height: 22px;
+	height: 19px;
 	margin: 2px;
 	background-repeat: no-repeat;
@@ -200,13 +120,5 @@
 .cke_skin_kama .cke_browser_iequirks .cke_rcombo .cke_openbutton
 {
-	height: 24px;
-	width: 15px;
-}
-
-.cke_skin_kama .cke_rcombo .cke_off a:hover,
-.cke_skin_kama .cke_rcombo .cke_off a:focus,
-.cke_skin_kama .cke_rcombo .cke_off a:active,
-.cke_skin_kama .cke_rcombo .cke_on a
-{
+	margin-bottom: 0;
 }
 
Index: /CKEditor/branches/features/kama/_source/skins/kama/toolbar.css
===================================================================
--- /CKEditor/branches/features/kama/_source/skins/kama/toolbar.css	(revision 3611)
+++ /CKEditor/branches/features/kama/_source/skins/kama/toolbar.css	(revision 3612)
@@ -4,13 +4,13 @@
 */
 
-.cke_toolbox
+.cke_skin_kama .cke_toolbox
 {
 	clear: both;
-	padding: 5px 3px;
+	padding: 5px 3px 5px 6px;
 }
 
 @media print
 {
-	.cke_toolbox
+	.cke_skin_kama .cke_toolbox
 	{
 		display: none;
@@ -53,7 +53,7 @@
 .cke_skin_kama .cke_toolbar
 {
-	display:inline-block;
-	float:left;
-	margin-bottom: 5px
+	display: inline-block;
+	float: left;
+	margin-bottom: 5px;
 }
 
@@ -94,35 +94,8 @@
 	background-position: 0 -500px;
 	float:left;
-	margin: 0 3px;
+	margin-right: 6px;
 	padding: 2px;
-}
-
-/* Fix for extra spaces in IE6 */
-.cke_skin_kama .cke_browser_ie6 .cke_toolgroup
-{
-	margin-left: 0;
-}
-
-.cke_skin_kama .cke_browser_ie6 .cke_toolbar
-{
-	margin-right: -2px;
-	margin-left: -1px;
-}
-
-.cke_skin_kama .cke_browser_ie6 .cke_rcombo
-{
-	margin-left: 0;
-}
-
-.cke_skin_kama .cke_browser_ie6 .cke_toolbox
-{
-	padding-left: 7px;
-}
-
-.cke_skin_kama .cke_browser_ie6 .cke_toolbar_end_last
-{
-	margin-right: 3px;
-}
-/* END Fix for extra spaces in IE6 */
+	display: inline;
+}
 
 .cke_skin_kama .cke_button a,
@@ -296,10 +269,4 @@
 }
 
-.cke_skin_kama .cke_browser_ie .cke_separator
-{
-	vertical-align: 35%;
-}
-
-
 /* IE+Quirks Section */