#7912 Remove support for IE6

120 files changed, 83 insertions, 1268 deletions

diff --git a/WebContent/VAADIN/themes/base/button/button.css b/WebContent/VAADIN/themes/base/button/button.css
index 2212120915..874619747e 100644
--- a/WebContent/VAADIN/themes/base/button/button.css
+++ b/WebContent/VAADIN/themes/base/button/button.css
@@ -29,10 +29,6 @@
 	cursor: default;

 }

 

-.v-ie6 .v-button {

-	display: inline;

-}

-

 .v-ie7 .v-button {

    display: inline;

 }

@@ -117,10 +113,7 @@
 	zoom: 1;

 	float: none;

 }

-/* Fixes streched buttons in IE6 and IE7*/

-.v-ie6 .v-nativebutton {

-	width: 1px;

-}

+/* Fixes stretched buttons in IE7*/

 .v-ie .v-nativebutton {

 	overflow: visible;

 	padding-left: 1em;

@@ -147,8 +140,7 @@
 	white-space: nowrap;

 }

 

-/* Fix for IE6/IE7 issue where checkbox moves 1 pixel down after selection (#4636) */

-.v-ie6 .v-checkbox,

+/* Fix for IE7 issue where checkbox moves 1 pixel down after selection (#4636) */

 .v-ie7 .v-checkbox {

 	vertical-align: baseline;

 }

diff --git a/WebContent/VAADIN/themes/base/caption/caption.css b/WebContent/VAADIN/themes/base/caption/caption.css
index bdeaae3de2..549d4f9cef 100644
--- a/WebContent/VAADIN/themes/base/caption/caption.css
+++ b/WebContent/VAADIN/themes/base/caption/caption.css
@@ -29,14 +29,6 @@
 	overflow: hidden;
 }
 
-/* Fix IE6 "double-float-margin-bug" */
-.v-ie6 .v-errorindicator,
-.v-ie6 .v-icon,
-.v-ie6 .v-captiontext,
-.v-ie6 .v-required-field-indicator {
-	display: inline;
-}
-
 .v-ie9 .v-gridlayout-margin>div>div>.v-caption,
 .v-ie9 .v-verticallayout>div>div>.v-caption,
 .v-ie9 .v-horizontallayout>div>div>.v-caption {
diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.css b/WebContent/VAADIN/themes/base/datefield/datefield.css
index 72d9510c3f..ef08509ed5 100644
--- a/WebContent/VAADIN/themes/base/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/base/datefield/datefield.css
@@ -61,11 +61,9 @@
 	outline: 1px dotted black;
 }
 
-.v-ie6 .v-datefield-calendarpanel-day,
 .v-ie7 .v-datefield-calendarpanel-day {
 	margin: 1px;
 }
-.v-ie6 .v-datefield-calendarpanel-day-focused,
 .v-ie7 .v-datefield-calendarpanel-day-focused {
 	border: 1px dotted black;
 	margin: 0px;
@@ -95,8 +93,6 @@
 }
 */
 /* IE somehow loses generic v-disabled alpha. See #1960 */
-.v-ie6 .v-disabled .v-datefield-button,
-.v-ie6 .v-disabled .v-datefield-textfield,
 .v-ie7 .v-disabled .v-datefield-button,
 .v-ie7 .v-disabled .v-datefield-textfield {
 	filter: alpha(opacity=30);
diff --git a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css
index 87cdcfd361..033fea5867 100644
--- a/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css
+++ b/WebContent/VAADIN/themes/base/gridlayout/gridlayout.css
@@ -24,7 +24,6 @@
 	overflow: hidden;
 }
 /* Ensure that resizing gridlayout works in IE */
-.v-ie6 .v-gridlayout,
 .v-ie7 .v-gridlayout {
 	overflow: hidden;
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css
index 9f91669385..58badbc615 100644
--- a/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css
+++ b/WebContent/VAADIN/themes/base/orderedlayout/orderedlayout.css
@@ -32,9 +32,6 @@
 	padding-left: 0;
 }
 /* To make sure IE don't expand elements larger than they should */
-.v-ie6 .v-orderedlayout,
-.v-ie6 .v-horizontallayout,
-.v-ie6 .v-verticallayout,
 .v-ie7 .v-orderedlayout,
 .v-ie7 .v-horizontallayout,
 .v-ie7 .v-verticallayout {
diff --git a/WebContent/VAADIN/themes/base/shadow/shadow.css b/WebContent/VAADIN/themes/base/shadow/shadow.css
index 209dd0e235..c576a026bd 100644
--- a/WebContent/VAADIN/themes/base/shadow/shadow.css
+++ b/WebContent/VAADIN/themes/base/shadow/shadow.css
@@ -66,20 +66,3 @@
     width: 10px;          height: 10px;
     background: transparent url(img/bottom-right.png);
 }
-
-
-
-
-
-/* For IE6 (no transparent png's, we use a blur filter) */
-
-.v-ie6 .v-shadow * {
-	display: none;
-}
-
-.v-ie6 .v-shadow {
-	background: #000;
-	filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=2) alpha(opacity=20);
-	margin-top: -2px;
-	margin-left: -2px;
-}  
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/slider/slider.css b/WebContent/VAADIN/themes/base/slider/slider.css
index 5ee6cbf31c..1be474f04e 100644
--- a/WebContent/VAADIN/themes/base/slider/slider.css
+++ b/WebContent/VAADIN/themes/base/slider/slider.css
@@ -63,15 +63,3 @@
 	background: #FFE0E0;
 }
 */
-
-/* IE specific styles */
-.v-ie6 .v-slider,
-.v-ie6 .v-slider-vertical {
-	margin: 0;
-}
-.v-ie6 .v-slider .v-slider-handle {
-	margin: -1px 0;
-}
-.v-ie6 .v-slider-vertical .v-slider-handle {
-	margin: 0 -1px;
-}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css
index 80a2133b23..3473092fa5 100644
--- a/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css
+++ b/WebContent/VAADIN/themes/base/splitpanel/splitpanel.css
@@ -34,11 +34,6 @@
 	cursor: default;
 }
 /* IE specific styles */
-.v-ie6 .v-splitpanel-hsplitter div {
-	height: 99%;
-}
-.v-ie6 .v-splitpanel-first-container,
-.v-ie6 .v-splitpanel-second-container,
 .v-ie7 .v-splitpanel-first-container,
 .v-ie7 .v-splitpanel-second-container {
 	position: relative;
diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css
index 4b3922c554..dd452c851f 100644
--- a/WebContent/VAADIN/themes/base/table/table.css
+++ b/WebContent/VAADIN/themes/base/table/table.css
@@ -181,7 +181,6 @@
 	position: relative; /* hide this from IE, it works without it */
 	cursor: pointer;
 }
-.v-ie6 .v-table-column-selector,
 .v-ie7 .v-table-column-selector {
 	position: static;
 }
diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
index 6fae7381a1..b150a1981e 100644
--- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
@@ -81,13 +81,9 @@
 	cursor: default;
 	visibility: hidden;
 }
-.v-tabsheet-tabitem:hover .v-tabsheet-caption-close,
-.v-ie6 .v-tabsheet-caption-close {
+.v-tabsheet-tabitem:hover .v-tabsheet-caption-close {
 	visibility: visible;
 }
-.v-ie6 .v-tabsheet-caption-close {
-	float: right;
-}
 .v-tabsheet-tabitem {
 	border: 1px solid #aaa;
 	border-right: none;
@@ -111,7 +107,6 @@
 	border-bottom: none;
 	position: relative;
 }
-.v-ie6 .v-tabsheet-content,
 .v-ie7 .v-tabsheet-content {
 	zoom: 1;
 }
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png
deleted file mode 100644
index f0e5953235..0000000000
--- a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.png
deleted file mode 100644
index 0d2fd54885..0000000000
--- a/WebContent/VAADIN/themes/base/tree/img/connector-collapse-last-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png
deleted file mode 100644
index 1a7758fce5..0000000000
--- a/WebContent/VAADIN/themes/base/tree/img/connector-expand-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.png b/WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.png
deleted file mode 100644
index db94fc0d8e..0000000000
--- a/WebContent/VAADIN/themes/base/tree/img/connector-expand-last-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/base/tree/tree-connectors.css b/WebContent/VAADIN/themes/base/tree/tree-connectors.css
index 6e7ce45391..c60e41c48b 100644
--- a/WebContent/VAADIN/themes/base/tree/tree-connectors.css
+++ b/WebContent/VAADIN/themes/base/tree/tree-connectors.css
@@ -33,17 +33,3 @@
 .v-tree-connectors .v-tree-node-drag-top.v-tree-node-leaf {
 	background-position: 2px 50%;
 }
-
-/* IE6 */
-.v-ie6 .v-tree-connectors .v-tree-node {
-	background: transparent url(img/connector-expand-ie6.png) no-repeat 2px -52px;
-}
-.v-ie6 .v-tree-connectors .v-tree-node-expanded {
-	background: transparent url(img/connector-collapse-ie6.png) no-repeat 2px -52px;
-}
-.v-ie6 .v-tree-connectors .v-tree-node-last {
-	background: transparent url(img/connector-expand-last-ie6.png) no-repeat 2px -52px;
-}
-.v-ie6 .v-tree-connectors .v-tree-node-last.v-tree-node-expanded {
-	background: transparent url(img/connector-collapse-last-ie6.png) no-repeat 2px -52px;
-}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/base/tree/tree-default.css b/WebContent/VAADIN/themes/base/tree/tree-default.css
index c486233ea8..23721c77ae 100644
--- a/WebContent/VAADIN/themes/base/tree/tree-default.css
+++ b/WebContent/VAADIN/themes/base/tree/tree-default.css
@@ -37,27 +37,6 @@ div.v-tree-node-leaf {
 .v-tree-node-children {
 	padding-left: 1em;
 }
-/* ie6compatnode is hidden from non ie6 browsers, for ie6 
- * uses weird hack to sink all events properly 
- */
-.v-tree-node-ie6compatnode {
-	display: none;
-}
-/* IMPORTANT keep the offsetWidth of this element the same as the margin-left of v-tree-node-caption */
-.v-ie6 .v-tree-node-ie6compatnode {
-	display: inline;
-	float: left;
-	background: orange;
-	margin: 0;
-	width: 0.8em;
-	height: 0.8em;
-	padding: 0.1em;
-	filter: alpha(opacity=0);
-}
-.v-ie6 .v-tree-node,
-.v-ie6 .v-tree-node-children {
-	clear: left;
-}
 /***************************************
  * Drag'n'drop styles
  ***************************************/
@@ -106,9 +85,6 @@ div.v-tree-node-leaf {
 	margin: -2px 2px -2px -2px;
 	background-color: #bcdcff;
 }
-.v-ie6 .v-tree .v-tree-node-caption-drag-center div {
-	margin: -2px ;
-}
 .v-tree .v-tree-node-caption-drag-center div {
 	background-color: rgba(169,209,255,.6);
 }
diff --git a/WebContent/VAADIN/themes/base/treetable/treetable.css b/WebContent/VAADIN/themes/base/treetable/treetable.css
index 1bc21b890c..02f358e4e6 100644
--- a/WebContent/VAADIN/themes/base/treetable/treetable.css
+++ b/WebContent/VAADIN/themes/base/treetable/treetable.css
@@ -13,18 +13,10 @@
     background: url(../treetable/img/arrow-right.png) right center no-repeat;
 }
 
-.v-ie6 .v-treetable-node-closed {
-	background-image: url(../treetable/img/arrow-right.gif); 
-} 
-
 .v-treetable-node-open {
     background: url(../treetable/img/arrow-down.png) right center no-repeat;
 }
 
-.v-ie6 .v-treetable-node-open {
-	background-image: url(../treetable/img/arrow-down.gif); 
-} 
-
 .v-treetable .v-checkbox {
 	display: inline-block;
 	padding-bottom: 4px;
diff --git a/WebContent/VAADIN/themes/base/upload/upload.css b/WebContent/VAADIN/themes/base/upload/upload.css
index e6b58fb14e..e6951e5dbf 100644
--- a/WebContent/VAADIN/themes/base/upload/upload.css
+++ b/WebContent/VAADIN/themes/base/upload/upload.css
@@ -2,7 +2,6 @@
 	white-space: nowrap;
 }
 
-.v-ie6 .v-upload,
 .v-ie7 .v-upload {
 	margin:0;
 }
diff --git a/WebContent/VAADIN/themes/base/window/window.css b/WebContent/VAADIN/themes/base/window/window.css
index d4c03bd82e..d5dfd66e2b 100644
--- a/WebContent/VAADIN/themes/base/window/window.css
+++ b/WebContent/VAADIN/themes/base/window/window.css
@@ -17,9 +17,6 @@ div.v-window-header {
 	overflow: hidden;
 	padding: 0;
 }
-.v-ie6 .v-window-header {
-	width: 100%;
-}
 .v-window-header .v-icon {
 	vertical-align: middle; /* This has to be 'middle', not 'bottom', to allow larger icons than 16px */
 }
@@ -77,15 +74,6 @@ div.v-window-header {
 	height: 100%;
 	filter: alpha(opacity=50);
 }
-/* IE6 workaround for position:fixed; */
-.v-ie6 .v-window-modalitycurtain { 
-	position: absolute;
-	top: expression(document.documentElement.scrollTop + "px"); 
-}
-/* min-width for IE6 */
-.v-ie6 .v-window {
-	width: 0; /*  */
-}
 /* Shadow for window */
 .v-shadow-window {
 	position: absolute;
@@ -147,13 +135,3 @@ div.v-window-header {
     width: 28px;          height: 28px;
     background: transparent url(img/shadow/bottom-right.png);
 }
-/* For IE6 (no transparent png's, we use a blur filter) */
-.v-ie6 .v-shadow-window * {
-	display: none;
-}
-.v-ie6 .v-shadow-window {
-	background: #000;
-	filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=5) alpha(opacity=20);
-	margin-top: 2px;
-	margin-left: 2px;
-}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/chameleon/common/common.css b/WebContent/VAADIN/themes/chameleon/common/common.css
index e1a5bdce7a..2e0b9d8e75 100644
--- a/WebContent/VAADIN/themes/chameleon/common/common.css
+++ b/WebContent/VAADIN/themes/chameleon/common/common.css
@@ -98,16 +98,6 @@
 	overflow: hidden;
 	}
 
-.v-ie6 .v-window,
-.v-ie6 .v-popupview-popup,
-.v-ie6 .v-filterselect-suggestpopup,
-.v-ie6 .v-datefield-popup,
-.v-ie6 .v-contextmenu,
-.v-ie6 .v-Notification,
-.v-ie6 .v-menubar-submenu {
-	background-image: none;
-	}
-
 .v-filterselect-suggestpopup,
 .v-contextmenu,
 .v-menubar-submenu {
diff --git a/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css b/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css
index 6b0f69aaaa..8fb7254008 100644
--- a/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css
+++ b/WebContent/VAADIN/themes/chameleon/components/accordion/accordion.css
@@ -14,10 +14,6 @@
 	border-style: solid none;
 	}
 	
-.v-ie6 .v-accordion-item-caption {
-	background-image: none;
-	}
-
 div.v-accordion-item-caption,
 div.v-accordion-item-open .v-accordion-item-caption:active {
 	background-color: transparent;
diff --git a/WebContent/VAADIN/themes/chameleon/components/button/button.css b/WebContent/VAADIN/themes/chameleon/components/button/button.css
index 13fa53cc3f..d31bdd0ecf 100644
--- a/WebContent/VAADIN/themes/chameleon/components/button/button.css
+++ b/WebContent/VAADIN/themes/chameleon/components/button/button.css
@@ -22,10 +22,6 @@ div.v-button-down .v-button-wrap {
 	background-image: url(../../img/grad-dark-top2.png);
 	}
 
-.v-ie6 div.v-button-down .v-button-wrap {
-	background-image: none;
-	}
-
 .v-button {
 	overflow: hidden;
 	}
@@ -66,16 +62,6 @@ div.v-button-down .v-button-wrap {
 	overflow: hidden;
 	}
 	
-body.v-ie6 .v-button {
-	background-image: none;
-	}
-
-body.v-ie6 .v-button .v-button-wrap {
-	background-image: none;
-	display: inline;
-	zoom: 1;
-	}
-
 .v-button:focus {
 	outline: none;
 	}
@@ -263,17 +249,14 @@ body.v-ie .v-pressed.v-button-borderless .v-button-wrap {
 	margin-right: -0.5em;
 	}
 	
-.v-ie6 .v-button-icon-on-right,
 .v-ie7 .v-button-icon-on-right {
 	position: relative;
 	}
 
-.v-ie6 .v-button-icon-on-right .v-button-caption,
 .v-ie7 .v-button-icon-on-right .v-button-caption {
 	padding-right: 14px;
 	}
 
-.v-ie6 .v-button-icon-on-right .v-icon,
 .v-ie7 .v-button-icon-on-right .v-icon {
 	position: absolute;
 	right: 0;
diff --git a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css
index 71771ad6e1..79bf7f904a 100644
--- a/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/chameleon/components/datefield/datefield.css
@@ -23,7 +23,6 @@
 	height: 1.2em;
 	}
 
-.v-ie6 .v-datefield-button,
 .v-ie7 .v-datefield-button {
 	height: 1.55em;
 	margin-top: 1px;
@@ -116,10 +115,6 @@ td.v-datefield-calendarpanel-month {
 	text-shadow: 0 1px 0 rgba(255,255,255,.7);
 	}
 
-.v-ie6 td.v-datefield-calendarpanel-month {
-	background-image: none;
-	}
-
 span.v-datefield-calendarpanel-month {
 	display: block;
 	text-align: center;
@@ -172,10 +167,6 @@ td.v-datefield-calendarpanel-nextyear {
 	background-position: 0 0;
 	}
 
-.v-ie6 .v-datefield-calendarpanel-header button {
-	background-image: none;
-	}
-
 .v-datefield-calendarpanel-header button:active {
 	background-image: url(../../img/grad-dark-top2.png);
 	}
@@ -239,10 +230,6 @@ td.v-datefield-calendarpanel-nextyear {
 	margin-bottom: 2px;
 	}
 
-.v-ie6 .v-datefield-calendarpanel-weekdays strong {
-	background-image: none;
-	}
-
 .v-datefield-calendarpanel .v-first strong {
 	-webkit-border-bottom-left-radius: 3px;
 	-moz-border-radius-bottomleft: 3px;
@@ -293,10 +280,6 @@ td.v-datefield-calendarpanel-nextyear {
 	border: 1px solid #c9c9c9;
 	}
 
-.v-ie6 .v-datefield-calendarpanel-day-today {
-	background-image: none;
-	}
-
 .v-datefield-calendarpanel-day-selected,
 .v-datefield-calendarpanel-day-selected:hover {
 	margin: 0 0 0 .3em;
diff --git a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css
index 00b062f8d6..4f6be1b923 100644
--- a/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css
+++ b/WebContent/VAADIN/themes/chameleon/components/menubar/menubar.css
@@ -5,10 +5,6 @@
 	border-width: 1px 0;
 	}
 
-.v-ie6 .v-menubar {
-	background-image: none;
-	}
-
 .v-menubar .v-menubar-menuitem {
 	padding: .2em .5em;
 	line-height: normal;
@@ -26,7 +22,3 @@
 	background-image: url(../../img/grad-light-top2.png);
 	background-position: 0 -1px;
 	}
-
-.v-ie6 .v-menubar-submenu .v-menubar-menuitem-selected {
-	background-image: none;
-	}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/chameleon/components/notification/notification.css b/WebContent/VAADIN/themes/chameleon/components/notification/notification.css
index 1e4268cf92..ee686912c5 100644
--- a/WebContent/VAADIN/themes/chameleon/components/notification/notification.css
+++ b/WebContent/VAADIN/themes/chameleon/components/notification/notification.css
@@ -47,10 +47,6 @@ div.v-Notification-tray {
 	text-shadow: 0 1px 1px rgba(0,0,0,.5);
 	}
 
-.v-ie6 .v-Notification-tray {
-	background-image: none;
-	}
-
 .v-Notification-tray h1 {
 	font-size: 14px;
 	line-height: 18px;
diff --git a/WebContent/VAADIN/themes/chameleon/components/panel/panel.css b/WebContent/VAADIN/themes/chameleon/components/panel/panel.css
index e83e245ce6..0e5dcb8a38 100644
--- a/WebContent/VAADIN/themes/chameleon/components/panel/panel.css
+++ b/WebContent/VAADIN/themes/chameleon/components/panel/panel.css
@@ -87,10 +87,6 @@ div.v-panel-content-light {
 	padding: .3em .6em;
 	}
 
-.v-ie6 .v-panel-bubble .v-panel-caption-bubble {
-	background-image: none;
-	}
-
 .v-panel-nocaption-bubble {
 	padding: 0;
 	margin: 0;
diff --git a/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css b/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css
index b13b627ed6..c080c0fc43 100644
--- a/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css
+++ b/WebContent/VAADIN/themes/chameleon/components/progressindicator/progressindicator.css
@@ -18,11 +18,6 @@
 	border: 1px solid #b3b3b3;
 	}
 
-.v-ie6 .v-progressindicator-wrapper,
-.v-ie6 .v-progressindicator-indicator {
-	background-image: none;
-	}
-
 
 /*******************************************************************************
  * Small
diff --git a/WebContent/VAADIN/themes/chameleon/components/selects/selects.css b/WebContent/VAADIN/themes/chameleon/components/selects/selects.css
index 170a4bb991..3c8496f0fe 100644
--- a/WebContent/VAADIN/themes/chameleon/components/selects/selects.css
+++ b/WebContent/VAADIN/themes/chameleon/components/selects/selects.css
@@ -84,13 +84,6 @@ body .v-filterselect-suggestpopup-big td {
 	-ms-user-select: none;
 	}
 
-.v-ie6 .v-filterselect-prevpage-off,
-.v-ie6 .v-filterselect-nextpage-off,
-.v-ie6 .v-filterselect-prevpage,
-.v-ie6 .v-filterselect-nextpage {
-	background-image: none;
-	}
-
 .v-filterselect-prevpage:active,
 .v-filterselect-nextpage:active {
 	background-image: (../../img/grad-dark-bottom2.png);
@@ -126,10 +119,6 @@ body .v-filterselect-suggestpopup-big td {
 	background-position: 0 -1px;
 	}
 
-.v-ie6 .v-filterselect-suggestmenu .gwt-menuItem-selected {
-	background-image: none;
-	}
-
 .v-filterselect-suggestpopup-small .v-filterselect-status {
 	font-size: .8em;
 	}
@@ -156,10 +145,6 @@ body .v-filterselect-suggestpopup-big td {
 	padding: .3em .5em;
 	}
 
-.v-ie6 .v-filterselect-select-button {
-	background-image: none;
-	}
-
 .v-filterselect-select-button .v-filterselect-input {
 	display: block;
 	width: 100% !important;
@@ -176,10 +161,3 @@ body .v-filterselect-suggestpopup-big td {
 	height: 100%;
 	background-position: 100% -8px;
 	}
-
-.v-ie6 .v-filterselect-select-button .v-filterselect-button {
-	float: none;
-	position: relative;
-	margin: -1.8em -.5em -.3em -.5em;
-	padding: .3em .5em;
-	}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/chameleon/components/slider/slider.css b/WebContent/VAADIN/themes/chameleon/components/slider/slider.css
index c0fc271d3f..6a430723e2 100644
--- a/WebContent/VAADIN/themes/chameleon/components/slider/slider.css
+++ b/WebContent/VAADIN/themes/chameleon/components/slider/slider.css
@@ -42,10 +42,6 @@
 	border-width: 0 1px;
 	}
 
-.v-ie6 .v-slider-vertical {
-	width: 6px;
-	}
-
 .v-slider-vertical .v-slider-base {
 	background-image: none;
 	width: 4px;
@@ -58,8 +54,3 @@
 	margin: 0;
 	margin-left: -5px;
 	}
-
-.v-ie6 .v-slider-base,
-.v-ie6 .v-slider-handle {
-	background-image: none;
-	}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css
index bd407592cb..1cb04bc29b 100644
--- a/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css
+++ b/WebContent/VAADIN/themes/chameleon/components/splitpanel/splitpanel.css
@@ -5,11 +5,6 @@
 	width: 9px;
 	}
 
-.v-ie6 .v-splitpanel-hsplitter div,
-.v-ie6 .v-splitpanel-vsplitter div {
-	background-image: url(../../img/split-handle-ie6.png);
-	}
-
 .v-splitpanel-vsplitter div {
 	background-position: 50% 2px;
 	margin: -1px 0;
@@ -35,13 +30,6 @@
 	background: #b3b3b3 url(../../img/grad-light-top.png) repeat-x;
 	}
 
-.v-ie6 .v-splitpanel-hsplitter,
-.v-ie6 .v-splitpanel-hsplitter-locked,
-.v-ie6 .v-splitpanel-vsplitter,
-.v-ie6 .v-splitpanel-vsplitter-locked {
-	background-image: none;
-	}
-
 /*******************************************************************************
  * Small
  ******************************************************************************/
@@ -61,11 +49,6 @@ body .v-splitpanel-vsplitter-small-locked {
 	line-height: 1px;
 	}
 
-body.v-ie6 .v-splitpanel-vsplitter-small,
-body.v-ie6 .v-splitpanel-vsplitter-small-locked {
-	overflow: hidden;
-	}
-
 .v-splitpanel-hsplitter-small div {
 	width: 7px;
 	margin-left: -2px;
@@ -78,8 +61,3 @@ body.v-ie6 .v-splitpanel-vsplitter-small-locked {
 	background: transparent;
 	overflow: hidden;
 	}
-
-.v-ie6 .v-splitpanel-hsplitter-small div,
-.v-ie6 .v-splitpanel-vsplitter-small div {
-	background-image: none;
-	}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/chameleon/components/table/table.css b/WebContent/VAADIN/themes/chameleon/components/table/table.css
index 1511beb913..ea56b14f98 100644
--- a/WebContent/VAADIN/themes/chameleon/components/table/table.css
+++ b/WebContent/VAADIN/themes/chameleon/components/table/table.css
@@ -5,11 +5,6 @@
 	line-height: normal;
 	}
 
-.v-ie6 .v-table-header-wrap,
-.v-ie6 .v-table-header-drag {
-	background-image: none;
-	}
-
 .v-table-caption-container,
 .v-table-header-drag {
 	padding-top: .2em;
@@ -52,10 +47,6 @@ div.v-table-focus-slot-left {
 	background-position: 0 -1px;
 	}
 
-.v-ie6 .v-table tr.v-selected {
-	background-image: none;
-	}
-
 div.v-table-focus-slot-right {
 	background: transparent;
 	border-right: 2px solid #b3b3b3;
diff --git a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css
index 1c52c27576..0db9b9d960 100644
--- a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css
@@ -36,10 +36,6 @@
 	-moz-border-radius-topright: 2px;
 	}
 
-.v-ie6 .v-tabsheet-tabitem-selected .v-caption {
-	background-image: none;
-	}
-
 .v-tabsheet-content {
 	background: #fff;
 	border-color: #b3b3b3;
@@ -62,10 +58,6 @@
 	margin: .2em 0 0 0;
 	}
 
-.v-ie6 .v-tabsheet-caption-close {
-	background-image: url(../../img/close-btn-ie6.png);
-	}
-
 .v-tabsheet-caption-close:hover {
 	background-position: .5em -25px;
 	}
@@ -89,10 +81,6 @@
 	-moz-border-radius: 6px;
 	}
 
-.v-ie6 .v-tabsheet-scroller {
-	background-image: none;
-	}
-
 .v-tabsheet-scrollerPrev,
 .v-tabsheet-scrollerNext,
 .v-tabsheet-scrollerPrev-disabled,
@@ -110,13 +98,6 @@
 	filter: alpha(opacity=50);
 	}
 
-.v-ie6 .v-tabsheet-scrollerPrev,
-.v-ie6 .v-tabsheet-scrollerNext,
-.v-ie6 .v-tabsheet-scrollerPrev-disabled,
-.v-ie6 .v-tabsheet-scrollerNext-disabled{
-	background-image: url(../../img/tab-arrows-ie6.png);
-	}
-
 .v-tabsheet-scroller button::-moz-focus-inner {
 	border: none;
 	padding: 0;
diff --git a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css
index 9c448eee00..42bd986cef 100644
--- a/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css
+++ b/WebContent/VAADIN/themes/chameleon/components/textfield/textfield.css
@@ -123,8 +123,3 @@ input.v-textfield-search[type=text],
 .v-filterselect-search {
 	padding-left: 17px;
 	}
-
-.v-ie6 input.v-textfield-search {
-	/* Compensate for big style as well, since IE6 doesn't handle the selector */
-	padding-left: 21px;
-	}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/chameleon/components/window/window.css b/WebContent/VAADIN/themes/chameleon/components/window/window.css
index 3034a58fbf..b5cc0170ac 100644
--- a/WebContent/VAADIN/themes/chameleon/components/window/window.css
+++ b/WebContent/VAADIN/themes/chameleon/components/window/window.css
@@ -11,10 +11,6 @@
 	z-index: 2;
 	}
 
-.v-ie6 .v-window-closebox {
-	background-image: url(../../img/close-btn-ie6.png);
-	}
-
 .v-window-closebox:hover {
 	background-position: 0 -25px;
 	}
@@ -35,10 +31,6 @@
 	background-repeat: repeat-x;
 	}
 
-.v-ie6 .v-window-wrap {
-	background: transparent !important;
-	}
-
 .v-window-outerheader {
 	padding: .2em 1.7em .5em 1.2em;
 	height: auto;
diff --git a/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css b/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css
index 83b736584f..e2ab7f2080 100644
--- a/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css
+++ b/WebContent/VAADIN/themes/chameleon/compound/sidebar-menu/sidebar-menu.css
@@ -33,11 +33,6 @@
 	color: #fff;
 	}
 
-.v-ie6 .sidebar-menu .tab-selected,
-.v-ie6 .sidebar-menu .selected {
-	background-image: none;
-	}
-
 .sidebar-menu .tab-selected:focus,
 .sidebar-menu .selected:focus {
 	outline: none;
diff --git a/WebContent/VAADIN/themes/chameleon/compound/toolbar/toolbar.css b/WebContent/VAADIN/themes/chameleon/compound/toolbar/toolbar.css
index 594fc245a6..468172037e 100644
--- a/WebContent/VAADIN/themes/chameleon/compound/toolbar/toolbar.css
+++ b/WebContent/VAADIN/themes/chameleon/compound/toolbar/toolbar.css
@@ -4,10 +4,6 @@
 	border-width: 1px 0;
 	}
 
-.v-ie6 .v-csslayout-toolbar {
-	background-image: none;
-	}
-
 .v-csslayout-toolbar .v-csslayout-margin {
 	margin: 3px .3em 2px;
 	padding-bottom: 1px;
diff --git a/WebContent/VAADIN/themes/chameleon/img/close-btn-ie6.png b/WebContent/VAADIN/themes/chameleon/img/close-btn-ie6.png
deleted file mode 100644
index 334b03769a..0000000000
--- a/WebContent/VAADIN/themes/chameleon/img/close-btn-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/chameleon/img/date-btn-ie6.png b/WebContent/VAADIN/themes/chameleon/img/date-btn-ie6.png
deleted file mode 100644
index d22411b260..0000000000
--- a/WebContent/VAADIN/themes/chameleon/img/date-btn-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/chameleon/img/split-handle-ie6.png b/WebContent/VAADIN/themes/chameleon/img/split-handle-ie6.png
deleted file mode 100644
index 2e23c10d90..0000000000
--- a/WebContent/VAADIN/themes/chameleon/img/split-handle-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/chameleon/img/tab-arrows-ie6.png b/WebContent/VAADIN/themes/chameleon/img/tab-arrows-ie6.png
deleted file mode 100644
index 963cf2e1a0..0000000000
--- a/WebContent/VAADIN/themes/chameleon/img/tab-arrows-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/liferay/button/button.css b/WebContent/VAADIN/themes/liferay/button/button.css
index 8181a041a0..bd0f307947 100644
--- a/WebContent/VAADIN/themes/liferay/button/button.css
+++ b/WebContent/VAADIN/themes/liferay/button/button.css
@@ -50,11 +50,6 @@
 	line-height: 16px;	
 }
 
-.v-ie6 .v-button .v-button-wrap {
-	display: inline;
-	zoom: 1;
-}
-
 /* Link style button */
 .v-button-link,
 .v-disabled.v-button-link,
diff --git a/WebContent/VAADIN/themes/liferay/common/common.css b/WebContent/VAADIN/themes/liferay/common/common.css
index 26a0354ff3..521c4f3ac1 100644
--- a/WebContent/VAADIN/themes/liferay/common/common.css
+++ b/WebContent/VAADIN/themes/liferay/common/common.css
@@ -33,7 +33,3 @@ div.v-app {
 	font-weight: bold;
 	margin: 1px 0 4px 0;
 }
-
-.v-ie6 .v-view {
-	border-top: none;
-}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/liferay/datefield/datefield.css b/WebContent/VAADIN/themes/liferay/datefield/datefield.css
index 4307658449..fc10f1639e 100644
--- a/WebContent/VAADIN/themes/liferay/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/liferay/datefield/datefield.css
@@ -116,8 +116,6 @@ span.v-datefield-calendarpanel-month {
 	min-width: 22px;
 }
 
-.v-ie6 .v-datefield-calendarpanel-prevyear button,
-.v-ie6 .v-datefield-calendarpanel-nextyear button,
 .v-ie7 .v-datefield-calendarpanel-prevyear button,
 .v-ie7 .v-datefield-calendarpanel-nextyear button {
 	width: 22px;
diff --git a/WebContent/VAADIN/themes/liferay/select/select.css b/WebContent/VAADIN/themes/liferay/select/select.css
index 48e35f9baa..66672cc573 100644
--- a/WebContent/VAADIN/themes/liferay/select/select.css
+++ b/WebContent/VAADIN/themes/liferay/select/select.css
@@ -7,10 +7,6 @@ select {
 	background-color: #fff;	
 }
 
-.v-ie6 select { 
-	font-size: 1em;
-}
-
 .v-filterselect-button {
 	width: 24px;
 	height: 24px;
diff --git a/WebContent/VAADIN/themes/liferay/tabsheet/close-ie6.png b/WebContent/VAADIN/themes/liferay/tabsheet/close-ie6.png
deleted file mode 100644
index fcbbedb6d4..0000000000
--- a/WebContent/VAADIN/themes/liferay/tabsheet/close-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css
index 4d5c21d7af..7f23edb809 100644
--- a/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/liferay/tabsheet/tabsheet.css
@@ -132,7 +132,6 @@
 
 .v-tabsheet-caption-close {
 	background: transparent url(close.png) no-repeat right top;
-	-background-image: url(close-ie6.png);
 	cursor: default;
 	float: right;
 	margin: 3px -1px 0;
diff --git a/WebContent/VAADIN/themes/liferay/tree/arrows_sprites-ie6.png b/WebContent/VAADIN/themes/liferay/tree/arrows_sprites-ie6.png
deleted file mode 100644
index c9a0bbd388..0000000000
--- a/WebContent/VAADIN/themes/liferay/tree/arrows_sprites-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/liferay/tree/tree.css b/WebContent/VAADIN/themes/liferay/tree/tree.css
index 23fe10f52e..33da398736 100644
--- a/WebContent/VAADIN/themes/liferay/tree/tree.css
+++ b/WebContent/VAADIN/themes/liferay/tree/tree.css
@@ -1,6 +1,5 @@
 .v-tree-node {
 	background: transparent url(arrows_sprites.png) no-repeat -42px 1px;
-	-background: transparent url(arrows_sprites-ie6.png) no-repeat -42px 1px;
 }
 
 .v-tree-node span {
diff --git a/WebContent/VAADIN/themes/liferay/window/window.css b/WebContent/VAADIN/themes/liferay/window/window.css
index 6b61d880f1..ae1516b78a 100644
--- a/WebContent/VAADIN/themes/liferay/window/window.css
+++ b/WebContent/VAADIN/themes/liferay/window/window.css
@@ -10,21 +10,10 @@
 	background: #fff url(top-left.png) no-repeat;
 }
 
-.v-ie6 .v-window-wrap,
 .v-ie7 .v-window-wrap {
 	background-position: 1px 1px;
 }
 
-.v-ie6 .v-window-wrap {
-	border-bottom: none;
-}
-
-.v-ie6 .v-window-footer {
-	border-bottom: 1px solid #c8c9ca;
-	margin-top: -1px;
-	padding-top: 1px;
-}
-
 .v-window-outerheader {
 	height: 16px;
 	margin-left: 9px;
diff --git a/WebContent/VAADIN/themes/reindeer/button/button-ie.css b/WebContent/VAADIN/themes/reindeer/button/button-ie.css
index aaac6bf0b6..b75a0c896e 100644
--- a/WebContent/VAADIN/themes/reindeer/button/button-ie.css
+++ b/WebContent/VAADIN/themes/reindeer/button/button-ie.css
@@ -1,75 +1,5 @@
-.v-ie6 .v-nativebutton-link,
 .v-ie7 .v-nativebutton-link,
 .v-ie8 .v-nativebutton-link {
 	padding: 0;
 	text-align: left;
 }
-
-/**
- * IE6 buttons --------------------------
- */
-.v-ie6 .v-button {
-	border: 1px solid #b3b3b3;
-	border-bottom-color: #9a9a9a;
-	background: #d8d8d8 url(img/right.png) no-repeat 0 -1px;
-	padding: 0 15px;
-	height: 23px;
-}
-.v-ie6 .v-button .v-button-wrap {
-	background: transparent;
-	height: 20px;
-	padding: 3px 0 0;
-	display: inline;
-	zoom: 1;
-}
-.v-ie6 .v-button-primary {
-	background-image: url(img/primary-right.png);
-}
-.v-ie6 .v-button-small {
-	background-image: url(img/small-right.png);
-	height: 17px;
-}
-.v-ie6 .v-button-small .v-button-wrap {
-	height: 17px;
-	padding: 0;
-}
-.v-ie6 .v-button.v-pressed {
-	background: transparent url(img/right-pressed.png) no-repeat 0 -1px;
-}
-/* Buttons on blue background */
-.v-ie6 .blue .v-button {
-	border-color: #84949c;
-	border-top-color: #83939b;
-	border-bottom-color: #888d91;
-}
-/* Buttons on black background */
-.v-ie6 .black .v-button {
-	border: 1px solid #0d0e0f;
-	background: #202224 url(img/black/right.png) no-repeat 0 -1px;
-	color: #c9ccce;
-}
-.v-ie6 .black .v-button-primary {
-	background-image: url(img/black/primary-right.png);
-}
-.v-ie6 .black .v-button-small {
-	background-image: url(img/black/small-right.png);
-}
-.v-ie6 .black .v-button.v-pressed {
-	background-image: url(img/black/right-pressed.png);
-}
-
-
-/* Link style button */
-.v-ie6 .v-button-link,
-.v-ie6 .black .v-button-link {
-	background: transparent;
-	border: none;
-	height: auto;
-	line-height: normal;
-	padding: 0;
-}
-.v-ie6 .v-button-link .v-button-wrap,
-.v-ie6 .black .v-button-link .v-button-wrap {
-	padding: 0;
-	height: auto;
-}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/common/common.css b/WebContent/VAADIN/themes/reindeer/common/common.css
index 50dcdd84ab..ff8ae47036 100644
--- a/WebContent/VAADIN/themes/reindeer/common/common.css
+++ b/WebContent/VAADIN/themes/reindeer/common/common.css
@@ -44,9 +44,6 @@
 	height: 16px;
 	background: transparent url(../common/icons/error.png) no-repeat 50%;
 }
-.v-ie6 .v-errorindicator {
-	background-image: url(../common/icons/error-ie6.png);
-}
 .v-tooltip {
 	background-color: #fffcdd;
 	border: 1px solid #b8b295;
diff --git a/WebContent/VAADIN/themes/reindeer/common/icons/bullet-ie6.png b/WebContent/VAADIN/themes/reindeer/common/icons/bullet-ie6.png
deleted file mode 100644
index 7ba2e118a6..0000000000
--- a/WebContent/VAADIN/themes/reindeer/common/icons/bullet-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/common/icons/bullet-white-ie6.png b/WebContent/VAADIN/themes/reindeer/common/icons/bullet-white-ie6.png
deleted file mode 100644
index 9661802744..0000000000
--- a/WebContent/VAADIN/themes/reindeer/common/icons/bullet-white-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/common/icons/error-ie6.png b/WebContent/VAADIN/themes/reindeer/common/icons/error-ie6.png
deleted file mode 100644
index dce7941157..0000000000
--- a/WebContent/VAADIN/themes/reindeer/common/icons/error-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
index 7217d70576..a7e6506d5f 100644
--- a/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
+++ b/WebContent/VAADIN/themes/reindeer/datefield/datefield.css
@@ -120,10 +120,6 @@ td.v-datefield-calendarpanel-nextyear {
 .v-ie .v-datefield-calendarpanel-nextmonth button {
 	border: none;
 }
-.v-ie6 .v-datefield-calendarpanel-prevmonth button,
-.v-ie6 .v-datefield-calendarpanel-nextmonth button {
-	width: 24px;
-}
 .v-datefield-calendarpanel-nextmonth button {
 	background-image: url(img/month-next.png); /** sprite-ref: verticals; sprite-alignment: center */
 }
@@ -289,11 +285,6 @@ td.v-datefield-calendarpanel-nextyear {
 	background-image: url(img/popup-btn-black-pressed.png); /** sprite-ref: black-verticals */
 }
 
-/* Small adjustment for IE6 */
-.v-ie6 .v-datefield-popupcalendar .v-datefield-button {
-	margin-top: 1px;
-}
-
 
 /*------------
 * on black background
diff --git a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css
index a5d465a91f..b28040a0e9 100644
--- a/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css
+++ b/WebContent/VAADIN/themes/reindeer/formlayout/formlayout.css
@@ -6,9 +6,6 @@
 	height: 16px;
 	background: transparent url(../common/icons/error.png) no-repeat 50%;
 }
-.v-ie6 .v-formlayout-cell .v-errorindicator {
-	background-image: url(../common/icons/error-ie6.png);
-}
 .v-formlayout-captioncell {
 	text-align: right;
 	white-space: nowrap;
@@ -42,10 +39,6 @@
 	margin-top: 5px;
 	min-height: 20px;
 }
-.v-ie6 .v-form-errormessage {
-	height: 20px;
-	background-image: url(../common/icons/error-ie6.png);
-}
 .v-form fieldset {
 	border: none;
 	border-top: 1px solid #babfc0;
diff --git a/WebContent/VAADIN/themes/reindeer/panel/panel.css b/WebContent/VAADIN/themes/reindeer/panel/panel.css
index 22e8ea5995..ac0074a9e0 100644
--- a/WebContent/VAADIN/themes/reindeer/panel/panel.css
+++ b/WebContent/VAADIN/themes/reindeer/panel/panel.css
@@ -36,9 +36,6 @@
 	background: #fff;
 	min-height: 100%;
 }
-.v-ie6 .v-panel-content {
-	background: #fff;
-}
 .blue .v-panel-deco {
 	border-color: #92a3ac;
 	background: #adc2cd;
@@ -64,9 +61,6 @@
 	display: inline-block;
 	vertical-align: middle;
 }
-.v-ie6 .v-panel-caption .v-errorindicator {
-	background-image: url(../common/icons/error-ie6.png);
-}
 
 /* Light style */
 .v-panel-light .v-panel-caption-light,
@@ -79,9 +73,6 @@
 .v-panel-content-light > div {
 	background: transparent;
 }
-.v-ie6 .v-panel-content-light {
-	background: transparent;
-}
 .v-panel-light .v-panel-deco-light {
 	height: 0;
 	border: none;
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus-ie6.png
deleted file mode 100644
index 5cf13fac6a..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-focus-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-ie6.png
deleted file mode 100644
index d06d599e0e..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/black/left-black-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/left-focus-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/left-focus-ie6.png
deleted file mode 100644
index 643aac1bc9..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/left-focus-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/select/img/left-ie6.png b/WebContent/VAADIN/themes/reindeer/select/img/left-ie6.png
deleted file mode 100644
index 226aea1ad1..0000000000
--- a/WebContent/VAADIN/themes/reindeer/select/img/left-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/select/select.css b/WebContent/VAADIN/themes/reindeer/select/select.css
index b23e7571e2..a685e3322a 100644
--- a/WebContent/VAADIN/themes/reindeer/select/select.css
+++ b/WebContent/VAADIN/themes/reindeer/select/select.css
@@ -4,9 +4,6 @@
 	background-image: url(img/left.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */
 	padding-left: 2px;
 }
-.v-ie6 .v-filterselect {
-	background-image: url(img/left-ie6.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */
-}
 .v-app .v-filterselect-input,
 .v-window .v-filterselect-input,
 .v-popupview-popup .v-filterselect-input {
@@ -30,9 +27,6 @@
 .v-filterselect-focus {
 	background-image: url(img/left-focus.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */
 }
-.v-ie6 .v-filterselect-focus {
-	background-image: url(img/left-focus-ie6.png); /** sprite-ref: verticals; sprite-margin-bottom: 1px */
-}
 .v-filterselect-focus .v-filterselect-input {
 	background-image: url(img/center-focus.png); /** sprite-ref: verticals; sprite-alignment: repeat */
 }
@@ -209,9 +203,6 @@
 .black .v-filterselect {
 	background-image: url(img/black/left-black.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
 }
-.v-ie6 .black .v-filterselect {
-	background-image: url(img/black/left-black-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
-}
 .v-app .black .v-filterselect-input,
 .v-window .black .v-filterselect-input,
 .v-window-black .v-filterselect-input,
@@ -222,9 +213,6 @@
 .black .v-filterselect-focus {
 	background-image: url(img/black/left-black-focus.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
 }
-.v-ie6 .black .v-filterselect-focus {
-	background-image: url(img/black/left-black-focus-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 1px */
-}
 .black .v-filterselect-focus .v-filterselect-input {
 	background-image: url(img/black/center-black-focus.png); /** sprite-ref: black-verticals; sprite-alignment: repeat; sprite-margin-bottom: 1px */
 }
@@ -265,15 +253,3 @@
 	background: #151717;
 	color: #c9ccce;
 }
-
-/* Twincolselect needs a little tweak in IE6 */
-.v-ie6 .v-select-twincol-buttons .v-button {
-	padding-left: 12px;
-	padding-right: 12px;
-}
-
-/* IE6 needs some help identifying when the input is readonly */
-.v-ie6 .v-filterselect.v-readonly,
-.v-ie6 .v-filterselect .v-filterselect-input-readonly {
-	background: transparent;
-}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/reindeer/table/table.css b/WebContent/VAADIN/themes/reindeer/table/table.css
index 4768f4820d..f824ad00f9 100644
--- a/WebContent/VAADIN/themes/reindeer/table/table.css
+++ b/WebContent/VAADIN/themes/reindeer/table/table.css
@@ -25,19 +25,6 @@
 	line-height: normal;
 }
 
-.v-ie6 .v-table,
-.v-ie6 .v-table-header-wrap,
-.v-ie6 .v-table-footer-wrap,
-.v-ie6 .v-table-column-selector {
-	/* The header will overflow the Table due to a bug in IE6 after changes in #3003. To fix this (#7314) 
-	 * we need to apply position:relative to the wrappers and selector to make them appear on top of the 
-	 * header. We also need to apply it to the table root div to get rid of a really weird IE6 rendering bug
-	 * caused by all this relativeness (see attachment in #7314).  
-	 */
-	position: relative;
-}
-
-.v-ie6 .v-table.v-disabled,
 .v-ie7 .v-table.v-disabled {
 	/* Fixes ie issue #7324 where disabled shim does not cover table body */ 
 	position: relative;
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css
index 1c22a68a99..478348243e 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.css
@@ -56,9 +56,6 @@
 .v-ie7 .v-tabsheet-caption-close {
 	margin-top: -17px;
 }
-.v-ie6 .v-tabsheet-caption-close {
-	float: none;
-}
 .v-tabsheet-caption-close:hover {
 	background-image: url(img/close-btn-hover.png); /** sprite-ref: verticals */
 }
@@ -155,9 +152,6 @@
 .v-ff2 .v-tabsheet-tabs .v-errorindicator {
 	display: -moz-inline-stack;
 }
-.v-ie6 .v-tabsheet-tabs .v-errorindicator {
-	background-image: url(../common/icons/error-ie6.png);
-}
 .v-ie .v-tabsheet-tabs .v-errorindicator {
 	zoom: 1;
 	display: inline;
diff --git a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
index 4c8ed4251e..eeec6bdfb1 100644
--- a/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
+++ b/WebContent/VAADIN/themes/reindeer/textfield/textfield.css
@@ -71,14 +71,6 @@ textarea.v-textarea-prompt {
 	margin-top: -2px;
 	margin-bottom: -2px;
 }
-.v-ie6 .v-table-cell-wrapper input.v-textfield {
-	margin-top: -2px;
-	margin-bottom: -2px;
-}
-.v-ie6 .v-table-cell-wrapper div input.v-textfield {
-	margin-top: 0;
-	margin-bottom: 0;
-}
 /* Textfield on black background */
 .black .v-textfield,
 .black .v-textarea {
diff --git a/WebContent/VAADIN/themes/reindeer/tree/img/arrows-ie6.png b/WebContent/VAADIN/themes/reindeer/tree/img/arrows-ie6.png
deleted file mode 100644
index e016e313a7..0000000000
--- a/WebContent/VAADIN/themes/reindeer/tree/img/arrows-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/tree/tree.css b/WebContent/VAADIN/themes/reindeer/tree/tree.css
index 63ac914fdf..f72f61c545 100644
--- a/WebContent/VAADIN/themes/reindeer/tree/tree.css
+++ b/WebContent/VAADIN/themes/reindeer/tree/tree.css
@@ -1,13 +1,6 @@
 .v-tree-node {
 	background: transparent url(img/arrows.png) no-repeat 6px -10px;
 }
-.v-ie6 .v-tree-node {
-	background-image: url(img/arrows-ie6.png);
-	background-repeat: no-repeat;
-}
-.v-ie6 div.v-tree-node-leaf {
-	background: transparent;
-}
 .v-tree-node-expanded {
 	background-position: -7px 5px;
 }
@@ -32,12 +25,6 @@
 .v-tree-node-children {
 	padding-left: 16px;
 }
-/* IMPORTANT keep the offsetWidth (width + padding) of this element the same as the margin-left of v-tree-node-caption */
-.v-ie6 .v-tree-node-ie6compatnode {
-	width: 14px;
-	height: 10px;
-	padding: 1px;
-}
 .v-tree-node-caption.v-tree-node-focused span{
 	padding-left: 1px;
 	padding-top: 0px;
@@ -46,9 +33,6 @@
 .v-tree-node-focused span{
 	border: 1px dotted black;	
 }
-.v-ie6 .v-tree-node-ie6compatnode.v-tree-node-focused{
-	padding-left: 0px;
-}
 /***************************************
  * Drag'n'drop styles
  ***************************************/
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png
deleted file mode 100644
index 8ff06a11ed..0000000000
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/content-bg-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png
deleted file mode 100644
index ddfc27f6e6..0000000000
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/header-bg-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png b/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png
deleted file mode 100644
index 011b64a918..0000000000
--- a/WebContent/VAADIN/themes/reindeer/window/img/black/resize-ie6.png
+++ /dev/null
diff --git a/WebContent/VAADIN/themes/reindeer/window/window.css b/WebContent/VAADIN/themes/reindeer/window/window.css
index 5b3997f444..12139d60b7 100644
--- a/WebContent/VAADIN/themes/reindeer/window/window.css
+++ b/WebContent/VAADIN/themes/reindeer/window/window.css
@@ -9,23 +9,19 @@
 .v-op .v-window-wrap {
 	border-color: rgba(0,0,0,.2);
 }
-.v-ff2 .v-window-wrap,
-.v-ie6 .v-window-wrap {
+.v-ff2 .v-window-wrap {
 	border: none;
 }
-.v-ff2 .v-window-outerheader,
-.v-ie6 .v-window-outerheader {
+.v-ff2 .v-window-outerheader {
 	border: 1px solid #808386;
 	border-bottom: none;
 }
-.v-ff2 .v-window-contents,
-.v-ie6 .v-window-contents {
+.v-ff2 .v-window-contents {
 	border: 1px solid #808386;
 	border-top: none;
 	border-bottom: none;
 }
-.v-ff2 .v-window-footer,
-.v-ie6 .v-window-footer {
+.v-ff2 .v-window-footer {
 	border: 1px solid #808386;
 	border-top: none;
 }
@@ -50,9 +46,6 @@
 	padding-left: 13px;
 	background: transparent url(../common/icons/error.png) no-repeat 0 50%;
 }
-.v-ie6 .v-window-error .v-window-header {
-	background-image: url(../common/icons/error-ie6.png);
-}
 .v-window-resizebox {
 	width: 15px;
 	height: 15px;
@@ -136,12 +129,6 @@
 	background: #f7f7f8 repeat-x;
 	background-image: url(img/content-bg-light.png); /** sprite-ref: verticals; sprite-alignment: repeat */
 }
-.v-ie6 .v-window-light .v-window-wrap2 {
-	background-image: none;
-}
-
-
-
 
 
 /**
@@ -203,12 +190,6 @@
 	width: 14px;
 	height: 14px;
 }
-.v-ie6 .v-window-black .v-window-resizebox {
-	background-image: url(img/black/resize-ie6.png); /** sprite-ref: black-verticals; sprite-margin-bottom: 4px */
-}
-.v-ie6 .v-window-black .v-window-contents {
-	background: transparent url(img/black/content-bg-ie6.png) repeat-x;
-}
 /* Must be last to make this image last in the sprites */
 .v-window-black .v-window-contents {
 	border: none;
diff --git a/WebContent/VAADIN/themes/runo/button/button.css b/WebContent/VAADIN/themes/runo/button/button.css
index c196841ad3..0ab4d60d1d 100644
--- a/WebContent/VAADIN/themes/runo/button/button.css
+++ b/WebContent/VAADIN/themes/runo/button/button.css
@@ -160,13 +160,9 @@
 .v-checkbox .v-errorindicator {

 	padding-left: 10px;

 	}
-.v-ie6 .v-checkbox .v-errorindicator {

-	padding-right: 4px;

-	}
 .v-ie7 .v-checkbox .v-errorindicator {

 	padding-right: 7px;

 	}
-.v-ie6 .v-button .v-errorindicator,

 .v-ie7 .v-button .v-errorindicator {

 	padding-right: 5px;

 	}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/runo/caption/caption.css b/WebContent/VAADIN/themes/runo/caption/caption.css
index d5be467822..43abda4067 100644
--- a/WebContent/VAADIN/themes/runo/caption/caption.css
+++ b/WebContent/VAADIN/themes/runo/caption/caption.css
@@ -6,10 +6,6 @@
 	height: 16px;
 	background: transparent url(../icons/16/error.png) no-repeat top right;
 }
-.v-ie6 .v-errorindicator {
-	/* gif for transparency */
-	background-image: url(../icons/16/error.gif);
-}
 .v-ie7 .v-errorindicator {
 	margin-left: -3px;
 }
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/runo/formlayout/formlayout.css b/WebContent/VAADIN/themes/runo/formlayout/formlayout.css
index fa4a7bde63..466baafd8c 100644
--- a/WebContent/VAADIN/themes/runo/formlayout/formlayout.css
+++ b/WebContent/VAADIN/themes/runo/formlayout/formlayout.css
@@ -36,9 +36,6 @@
 	margin-top: 5px;
 	min-height: 20px;
 }
-.v-ie6 .v-form-errormessage {
-	height: 20px
-}
 .v-form fieldset {
 	border: none;
 	border-top: 1px solid #babfc0;
diff --git a/WebContent/VAADIN/themes/runo/panel/panel.css b/WebContent/VAADIN/themes/runo/panel/panel.css
index 8fcfcaf100..d69e319a8d 100644
--- a/WebContent/VAADIN/themes/runo/panel/panel.css
+++ b/WebContent/VAADIN/themes/runo/panel/panel.css
@@ -67,37 +67,14 @@
 	overflow: hidden;
 }
 /* IE specific rules */
-.v-ie6 .v-panel {
-	background: transparent;
-}
-.v-ie6 .v-panel-caption {
-	border: 1px solid #babfc0;
-	border-bottom: none;
-	background: #fff;
-	margin: 0;
-	padding-left: 18px
-}
-.v-ie6 .v-panel-nocaption {
-	border: none;
-	background: transparent;
-	margin: 0;
-	height: 0;
-}
-.v-ie6 .v-panel-caption-light {
-	border: none;
-	background: transparent;
-}
-.v-ie6 .v-panel-content,
 .v-ie7 .v-panel-content,
 .v-ie8 .v-panel-content {
 	border-bottom: 1px solid #babfc0;
 }
-.v-ie6 .v-panel-content-light, 
 .v-ie7 .v-panel-content-light, 
 .v-ie8 .v-panel-content-light {
 	border-bottom: none;
 }
-.v-ie6 .v-panel-deco, 
 .v-ie7 .v-panel-deco, 	 	 
 .v-ie8 .v-panel-deco { 
 	height: 0;
diff --git a/WebContent/VAADIN/themes/runo/select/select.css b/WebContent/VAADIN/themes/runo/select/select.css
index ad1744288a..5ea1dad783 100644
--- a/WebContent/VAADIN/themes/runo/select/select.css
+++ b/WebContent/VAADIN/themes/runo/select/select.css
@@ -127,12 +127,6 @@
 	border-top: 1px solid #b6bbbc;
 }
 
-/* IE6 needs some help identifying when the input is readonly */
-.v-ie6 .v-filterselect.v-readonly,
-.v-ie6 .v-filterselect .v-filterselect-input-readonly {
-	background: transparent;
-}
-
 
 /* Error styles (disabled by default)
    ----------------------------------
diff --git a/WebContent/VAADIN/themes/runo/slider/slider.css b/WebContent/VAADIN/themes/runo/slider/slider.css
index 07b10dfa17..698d15de90 100644
--- a/WebContent/VAADIN/themes/runo/slider/slider.css
+++ b/WebContent/VAADIN/themes/runo/slider/slider.css
@@ -68,16 +68,3 @@
 	background-color: #FFE0E0;
 }
 */
-
-/* IE specific styles */
-
-.v-ie6 .v-slider,
-.v-ie6 .v-slider-vertical {
-	margin: 0;
-}
-.v-ie6 .v-slider .v-slider-handle {
-	margin: -1px 0;
-}
-.v-ie6 .v-slider-vertical .v-slider-handle {
-	margin: 0 -1px;
-}
\ No newline at end of file
diff --git a/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.css b/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.css
index c74ab257ba..ff46127e16 100644
--- a/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.css
+++ b/WebContent/VAADIN/themes/runo/splitpanel/splitpanel.css
@@ -36,23 +36,6 @@
 	margin: -1px 0;
 }
 
-/* IE6 specific styles */
-
-.v-ie6 .v-splitpanel-hsplitter div,
-.v-ie6 .v-splitpanel-hsplitter-locked div {
-	height: 99%;
-}
-
-.v-ie6 .v-splitpanel-vsplitter,
-.v-ie6 .v-splitpanel-vsplitter-locked {
-	height: 8px;
-}
-
-.v-ie6 .v-splitpanel-vsplitter div,
-.v-ie6 .v-splitpanel-vsplitter-locked div {
-	margin: 0;
-}
-
 
 /* Rounded style */
 .v-splitpanel-hsplitter-rounded div,
@@ -72,10 +55,6 @@
 .v-splitpanel-vsplitter-rounded-locked div {
 	margin: -1px 4px;
 }
-.v-ie6 .v-splitpanel-hsplitter-rounded div,
-.v-ie6 .v-splitpanel-hsplitter-rounded-locked div {
-	height: 97%;
-}
 
 
 /* Small style */
diff --git a/WebContent/VAADIN/themes/runo/table/table.css b/WebContent/VAADIN/themes/runo/table/table.css
index 8c82a6f3e8..369aafa486 100644
--- a/WebContent/VAADIN/themes/runo/table/table.css
+++ b/WebContent/VAADIN/themes/runo/table/table.css
@@ -158,20 +158,6 @@ tr.v-table-row-odd:hover {
 .v-table .v-link {
 	display: inline;
 }
-/* IE6 hack */
-.v-ie6 .v-table-scrollposition {
-	background: transparent;
-	/* 
-	AlphaImageLoader uses src attribute relative to host page, not CSS
-	We need multiple different filters because we cannot be sure how host page is served compared to theme resources
-	TODO: This actually does not work as expected, since only the last filter is applied. Can we chain filters together (i.e. contain all versions on one line)?
-	 */
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../../VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale");
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale");
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale");
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="/VAADIN/themes/default/table/img/scroll-position-bg.png", sizingMethod="scale");
-}
-
 
 /* Borderless style */
 .v-table-borderless .v-table-header-wrap,
diff --git a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css
index 9c224cb84f..da95cb0c8b 100644
--- a/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/runo/tabsheet/tabsheet.css
@@ -132,24 +132,6 @@
 	padding-top: 12px;
 }*/
 /* IE specific styles */
-.v-ie6 .v-tabsheet-tabs {
-	height: 46px;
-}
-.v-ie6 .v-tabsheet-tabitem-selected {
-	border: 1px solid #babfc0;
-	border-bottom: none;
-	background: #fff;
-	margin-top: 0;
-	height: 23px;
-	padding: 18px 14px 6px 15px;
-	cursor: default;
-	color: #ee5311;
-}
-.v-ie6 .v-tabsheet-tabitem-selected .v-caption {
-	background: transparent;
-	padding: 0;
-	margin: 0;
-}
 .v-ie .v-tabsheet-content {
 	border-bottom: none;
 }
@@ -268,18 +250,15 @@
 	padding-left: 3px;
 }*/
 /* IE specific styles */
-.v-ie6 .v-tabsheet-tabs-light,
 .v-ie7 .v-tabsheet-tabs-light {
 	height: 32px;
 }
-.v-ie6 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected,
 .v-ie7 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected {
 	border: none;
 	background: #fff url(img/inline-tab-right.png) no-repeat right top;
 	padding: 0;
 	height: 32px;
 }
-.v-ie6 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected .v-caption,
 .v-ie7 .v-tabsheet-tabs-light .v-tabsheet-tabitem-selected .v-caption {
 	background: transparent url(img/inline-tab-left.png) no-repeat -7px 0;
 	padding: 9px 11px 0 11px;
diff --git a/WebContent/VAADIN/themes/runo/tree/tree.css b/WebContent/VAADIN/themes/runo/tree/tree.css
index 03c8a0d829..14061b8afb 100644
--- a/WebContent/VAADIN/themes/runo/tree/tree.css
+++ b/WebContent/VAADIN/themes/runo/tree/tree.css
@@ -30,12 +30,6 @@
 .v-tree-node-children {
 	padding-left: 16px;
 }
-/* IMPORTANT keep the offsetWidth (width + padding) of this element the same as the margin-left of v-tree-node-caption */
-.v-ie6 .v-tree-node-ie6compatnode {
-	width: 14px;
-	height: 10px;
-	padding: 1px;
-}
 .v-tree{
 	outline:none;	
 }
@@ -47,9 +41,6 @@
 .v-tree-node-focused span{
 	border: 1px dotted black;	
 }
-.v-ie6 .v-tree-node-ie6compatnode.v-tree-node-focused{
-	padding-left: 0px;
-}
 /***************************************
  * Drag'n'drop styles
  ***************************************/
diff --git a/WebContent/VAADIN/themes/runo/window/window.css b/WebContent/VAADIN/themes/runo/window/window.css
index 81509146aa..7edea92ed1 100644
--- a/WebContent/VAADIN/themes/runo/window/window.css
+++ b/WebContent/VAADIN/themes/runo/window/window.css
@@ -21,7 +21,6 @@
 	letter-spacing: -0.03em;
 	color: #f14c1a;
 	text-shadow: 0 1px 0 #fff;
-	/* This element is 100% wide in IE6 */
 }
 .v-window-contents {
 	background: #fff;
diff --git a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java
index 15d2acf6e9..0f7ec4a14b 100644
--- a/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java
+++ b/build/buildhelpers/com/vaadin/buildhelpers/CompileDefaultTheme.java
@@ -224,9 +224,8 @@ public class CompileDefaultTheme {
     private static void createSprites(String themeName)
             throws FileNotFoundException, IOException {
         String[] parameters = new String[] { "--sprite-png-depth", "AUTO",
-                "--sprite-png-ie6", "--css-file-suffix", "-sprite",
-                "--css-file-encoding", "UTF-8", "--root-dir-path",
-                THEME_DIR + themeName, "--log-level", "WARN" };
+                "--css-file-suffix", "-sprite", "--css-file-encoding", "UTF-8",
+                "--root-dir-path", THEME_DIR + themeName, "--log-level", "WARN" };
 
         org.carrot2.labs.smartsprites.SmartSprites.main(parameters);
 
diff --git a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
index 66ab7202ed..5884cdaceb 100644
--- a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
+++ b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
@@ -18,7 +18,7 @@
 		<when-type-is class="com.google.gwt.core.client.impl.SchedulerImpl" />
 	</replace-with>
 
-	<!-- Use our own history impl for IE to workaround #2931. -->
+	<!-- Use our own history impl for IE7 to workaround #2931. -->
 	<replace-with class="com.vaadin.terminal.gwt.client.HistoryImplIEVaadin">
 		<when-type-is class="com.google.gwt.user.client.impl.HistoryImpl" />
 		<when-property-is name="user.agent" value="ie6" />
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index 506f2d8eaf..15a025937d 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
@@ -443,10 +443,6 @@ public class ApplicationConfiguration implements EntryPoint {
 
     public void onModuleLoad() {
 
-        // Enable IE6 Background image caching
-        if (BrowserInfo.get().isIE6()) {
-            enableIE6BackgroundImageCache();
-        }
         // Prepare VConsole for debugging
         if (isDebugMode()) {
             VDebugConsole console = GWT.create(VDebugConsole.class);
@@ -476,19 +472,6 @@ public class ApplicationConfiguration implements EntryPoint {
         startNextApplication();
     }
 
-    // From ImageSrcIE6
-    private static native void enableIE6BackgroundImageCache()
-    /*-{
-       // Fix IE background image refresh bug, present through IE6
-       // see http://www.mister-pixel.com/#Content__state=is_that_simple
-       // this only works with IE6 SP1+
-       try {
-         $doc.execCommand("BackgroundImageCache", false, true);
-       } catch (e) {
-         // ignore error on other browsers
-       }
-    }-*/;
-
     /**
      * Checks if client side is in debug mode. Practically this is invoked by
      * adding ?debug parameter to URI.
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 18ccd363a8..5e0f420d49 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -2332,19 +2332,6 @@ public class ApplicationConnection {
 
     }
 
-    /**
-     * Adds PNG-fix conditionally (only for IE6) to the specified IMG -element.
-     * 
-     * @param el
-     *            the IMG element to fix
-     */
-    public void addPngFix(Element el) {
-        BrowserInfo b = BrowserInfo.get();
-        if (b.isIE6()) {
-            Util.addPngFix(el);
-        }
-    }
-
     /*
      * Helper to run layout functions triggered by child components with a
      * decent interval.
diff --git a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
index 3c908556fa..daa62b4495 100644
--- a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
+++ b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
@@ -192,10 +192,6 @@ public class BrowserInfo {
         return isSafari() && browserDetails.getBrowserMajorVersion() == 4;
     }
 
-    public boolean isIE6() {
-        return isIE() && browserDetails.getBrowserMajorVersion() == 6;
-    }
-
     public boolean isIE7() {
         return isIE() && browserDetails.getBrowserMajorVersion() == 7;
     }
diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java
index bd46871902..fd014bffe6 100644
--- a/src/com/vaadin/terminal/gwt/client/Util.java
+++ b/src/com/vaadin/terminal/gwt/client/Util.java
@@ -11,7 +11,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
 import com.google.gwt.dom.client.DivElement;
@@ -209,18 +208,6 @@ public class Util {
     }
 
     /**
-     * Detects if current browser is IE6.
-     * 
-     * @deprecated use BrowserInfo class instead
-     * 
-     * @return true if IE6
-     */
-    @Deprecated
-    public static boolean isIE6() {
-        return BrowserInfo.get().isIE6();
-    }
-
-    /**
      * @deprecated use BrowserInfo class instead
      * @return
      */
@@ -250,7 +237,7 @@ public class Util {
         DOM.setInnerText(escapeHtmlHelper, html);
         String escapedText = DOM.getInnerHTML(escapeHtmlHelper);
         if (BrowserInfo.get().isIE() && BrowserInfo.get().getIEVersion() < 9) {
-            // #7478 IE6-IE8 "incorrectly" returns "<br>" for newlines set using
+            // #7478 IE7-IE8 "incorrectly" returns "<br>" for newlines set using
             // setInnerText. The same for " " which is converted to "&nbsp;"
             escapedText = escapedText.replaceAll("<(BR|br)>", "\n");
             escapedText = escapedText.replaceAll("&nbsp;", " ");
@@ -275,48 +262,6 @@ public class Util {
     }
 
     /**
-     * Adds transparent PNG fix to image element; only use for IE6.
-     * 
-     * @param el
-     *            IMG element
-     */
-    public native static void addPngFix(Element el)
-    /*-{
-        el.attachEvent("onload", function() {
-            @com.vaadin.terminal.gwt.client.Util::doIE6PngFix(Lcom/google/gwt/user/client/Element;)(el);
-        },false);
-    }-*/;
-
-    private native static void doPngFix(Element el, String blankImageUrl)
-    /*-{
-        var src = el.src;
-        if (src.indexOf(".png") < 1) return;
-        var w = el.width || 16; 
-        var h = el.height || 16;
-        if(h==30 || w==28) {
-            setTimeout(function(){
-                el.style.height = el.height + "px";
-                el.style.width = el.width + "px";
-                el.src = blankImageUrl;
-            },10);
-        } else {
-            el.src = blankImageUrl;
-            el.style.height = h + "px";
-            el.style.width = w + "px";
-        }
-        el.style.padding = "0";
-        el.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+src+"', sizingMethod='crop')";  
-       }-*/;
-
-    public static void doIE6PngFix(Element el) {
-        String blankImageUrl = GWT.getModuleBaseURL() + "ie6pngfix/blank.gif";
-        String src = el.getAttribute("src");
-        if (src != null && !src.equals(blankImageUrl)) {
-            doPngFix(el, blankImageUrl);
-        }
-    }
-
-    /**
      * Clones given element as in JavaScript.
      * 
      * Deprecate this if there appears similar method into GWT someday.
@@ -334,11 +279,7 @@ public class Util {
     public static int measureHorizontalPaddingAndBorder(Element element,
             int paddingGuess) {
         String originalWidth = DOM.getStyleAttribute(element, "width");
-        String originalOverflow = "";
-        if (BrowserInfo.get().isIE6()) {
-            originalOverflow = DOM.getStyleAttribute(element, "overflow");
-            DOM.setStyleAttribute(element, "overflow", "hidden");
-        }
+
         int originalOffsetWidth = element.getOffsetWidth();
         int widthGuess = (originalOffsetWidth - paddingGuess);
         if (widthGuess < 1) {
@@ -348,9 +289,7 @@ public class Util {
         int padding = element.getOffsetWidth() - widthGuess;
 
         DOM.setStyleAttribute(element, "width", originalWidth);
-        if (BrowserInfo.get().isIE6()) {
-            DOM.setStyleAttribute(element, "overflow", originalOverflow);
-        }
+
         return padding;
     }
 
@@ -412,7 +351,6 @@ public class Util {
 
             int offsetWidth = element.getOffsetWidth();
             int offsetHeight = element.getOffsetHeight();
-            // if (BrowserInfo.get().isIE6()) {
             if (offsetHeight < 1) {
                 offsetHeight = 1;
             }
@@ -420,7 +358,6 @@ public class Util {
                 offsetWidth = 10;
             }
             element.getStyle().setPropertyPx("width", offsetWidth);
-            // }
 
             element.getStyle().setPropertyPx("height", offsetHeight);
 
@@ -428,9 +365,7 @@ public class Util {
                     - element.getPropertyInt("clientHeight");
 
             element.getStyle().setProperty("height", height);
-            // if (BrowserInfo.get().isIE6()) {
             element.getStyle().setProperty("width", width);
-            // }
         } else {
             borders = element.getOffsetHeight()
                     - element.getPropertyInt("clientHeight");
diff --git a/src/com/vaadin/terminal/gwt/client/VCaption.java b/src/com/vaadin/terminal/gwt/client/VCaption.java
index 5381f20d1b..59f1a5c437 100644
--- a/src/com/vaadin/terminal/gwt/client/VCaption.java
+++ b/src/com/vaadin/terminal/gwt/client/VCaption.java
@@ -29,7 +29,6 @@ public class VCaption extends HTML {
     private final ApplicationConnection client;
 
     private boolean placedAfterComponent = false;
-    private boolean iconOnloadHandled = false;
 
     private int maxWidth = -1;
 
@@ -112,7 +111,6 @@ public class VCaption extends HTML {
             // Icon forces the caption to be above the component
             placedAfterComponent = false;
 
-            iconOnloadHandled = false;
             icon.setUri(uidl.getStringAttribute(ATTRIBUTE_ICON));
 
         } else if (icon != null) {
@@ -246,16 +244,10 @@ public class VCaption extends HTML {
         }
 
         if (DOM.eventGetType(event) == Event.ONLOAD
-                && icon.getElement() == target && !iconOnloadHandled) {
+                && icon.getElement() == target) {
             icon.setWidth("");
             icon.setHeight("");
 
-            /*
-             * IE6 pngFix causes two onload events to be fired and we want to
-             * react only to the first one
-             */
-            iconOnloadHandled = true;
-
             // if max width defined, recalculate
             if (maxWidth != -1) {
                 setMaxWidth(maxWidth);
diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java b/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java
index 5f3e5b18fd..76e6edcc43 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/FocusElementPanel.java
@@ -13,11 +13,9 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.user.client.ui.impl.FocusImpl;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
 
 /**
  * A panel that contains an always visible 0x0 size element that holds the focus
- * for all browsers but IE6.
  */
 public class FocusElementPanel extends SimpleFocusablePanel {
 
@@ -30,22 +28,20 @@ public class FocusElementPanel extends SimpleFocusablePanel {
     @Override
     public void setWidget(Widget w) {
         super.setWidget(w);
-        if (!BrowserInfo.get().isIE6()) {
-            if (focusElement.getParentElement() == null) {
-                Style style = focusElement.getStyle();
-                style.setPosition(Position.FIXED);
-                style.setTop(0, Unit.PX);
-                style.setLeft(0, Unit.PX);
-                getElement().appendChild(focusElement);
-                /* Sink from focusElement too as focus and blur don't bubble */
-                DOM.sinkEvents(
-                        (com.google.gwt.user.client.Element) focusElement
-                                .cast(), Event.FOCUSEVENTS);
-                // revert to original, not focusable
-                getElement().setPropertyObject("tabIndex", null);
-            } else {
-                moveFocusElementAfterWidget();
-            }
+        if (focusElement.getParentElement() == null) {
+            Style style = focusElement.getStyle();
+            style.setPosition(Position.FIXED);
+            style.setTop(0, Unit.PX);
+            style.setLeft(0, Unit.PX);
+            getElement().appendChild(focusElement);
+            /* Sink from focusElement too as focus and blur don't bubble */
+            DOM.sinkEvents(
+                    (com.google.gwt.user.client.Element) focusElement.cast(),
+                    Event.FOCUSEVENTS);
+            // revert to original, not focusable
+            getElement().setPropertyObject("tabIndex", null);
+        } else {
+            moveFocusElementAfterWidget();
         }
     }
 
@@ -58,28 +54,20 @@ public class FocusElementPanel extends SimpleFocusablePanel {
 
     @Override
     public void setFocus(boolean focus) {
-        if (BrowserInfo.get().isIE6()) {
-            super.setFocus(focus);
+        if (focus) {
+            FocusImpl.getFocusImplForPanel().focus(
+                    (Element) focusElement.cast());
         } else {
-            if (focus) {
-                FocusImpl.getFocusImplForPanel().focus(
-                        (Element) focusElement.cast());
-            } else {
-                FocusImpl.getFocusImplForPanel().blur(
-                        (Element) focusElement.cast());
-            }
+            FocusImpl.getFocusImplForPanel()
+                    .blur((Element) focusElement.cast());
         }
     }
 
     @Override
     public void setTabIndex(int tabIndex) {
-        if (BrowserInfo.get().isIE6()) {
-            super.setTabIndex(tabIndex);
-        } else {
-            getElement().setTabIndex(-1);
-            if (focusElement != null) {
-                focusElement.setTabIndex(tabIndex);
-            }
+        getElement().setTabIndex(-1);
+        if (focusElement != null) {
+            focusElement.setTabIndex(tabIndex);
         }
     }
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java b/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java
index 74823ce75b..2452190d9d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java
@@ -21,7 +21,6 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ScrollPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.user.client.ui.impl.FocusImpl;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
 
 /**
  * A scrollhandlers similar to {@link ScrollPanel}.
@@ -57,18 +56,9 @@ public class FocusableScrollPanel extends SimpleFocusablePanel implements
         if (useFakeFocusElement()) {
             if (focusElement.getParentElement() == null) {
                 Style style = focusElement.getStyle();
-                if (BrowserInfo.get().isIE6()) {
-                    style.setOverflow(Overflow.HIDDEN);
-                    style.setHeight(0, Unit.PX);
-                    style.setWidth(0, Unit.PX);
-                    style.setPosition(Position.ABSOLUTE);
-
-                    addScrollHandler(this);
-                } else {
-                    style.setPosition(Position.FIXED);
-                    style.setTop(0, Unit.PX);
-                    style.setLeft(0, Unit.PX);
-                }
+                style.setPosition(Position.FIXED);
+                style.setTop(0, Unit.PX);
+                style.setLeft(0, Unit.PX);
                 getElement().appendChild(focusElement);
                 /* Sink from focusElemet too as focusa and blur don't bubble */
                 DOM.sinkEvents(
diff --git a/src/com/vaadin/terminal/gwt/client/ui/Icon.java b/src/com/vaadin/terminal/gwt/client/ui/Icon.java
index eba1a9bd78..bf24f6dac2 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/Icon.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/Icon.java
@@ -19,7 +19,6 @@ public class Icon extends UIObject {
         DOM.setElementProperty(getElement(), "alt", "");
         setStyleName(CLASSNAME);
         this.client = client;
-        client.addPngFix(getElement());
     }
 
     public Icon(ApplicationConnection client, String uidlUri) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java
index b0590ce5a0..cace2105c5 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java
@@ -22,7 +22,6 @@ import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.Container;
 import com.vaadin.terminal.gwt.client.EventId;
 import com.vaadin.terminal.gwt.client.Paintable;
@@ -30,7 +29,6 @@ import com.vaadin.terminal.gwt.client.RenderSpace;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VCaption;
-import com.vaadin.terminal.gwt.client.VConsole;
 
 public class VAbsoluteLayout extends ComplexPanel implements Container {
 
@@ -211,9 +209,6 @@ public class VAbsoluteLayout extends ComplexPanel implements Container {
         canvas.getStyle().setProperty("width", width);
 
         if (!rendering) {
-            if (BrowserInfo.get().isIE6()) {
-                relayoutWrappersForIe6();
-            }
             relayoutRelativeChildren();
         }
     }
@@ -236,21 +231,10 @@ public class VAbsoluteLayout extends ComplexPanel implements Container {
         canvas.getStyle().setProperty("height", height);
 
         if (!rendering) {
-            if (BrowserInfo.get().isIE6()) {
-                relayoutWrappersForIe6();
-            }
             relayoutRelativeChildren();
         }
     }
 
-    private void relayoutWrappersForIe6() {
-        for (Widget wrapper : getChildren()) {
-            if (wrapper instanceof AbsoluteWrapper) {
-                ((AbsoluteWrapper) wrapper).ie6Layout();
-            }
-        }
-    }
-
     public class AbsoluteWrapper extends SimplePanel {
         private String css;
         private String left;
@@ -353,9 +337,6 @@ public class VAbsoluteLayout extends ComplexPanel implements Container {
                 style.setProperty("right", right);
                 style.setProperty("bottom", bottom);
 
-                if (BrowserInfo.get().isIE6()) {
-                    ie6Layout();
-                }
             }
             updateCaptionPosition();
         }
@@ -369,60 +350,6 @@ public class VAbsoluteLayout extends ComplexPanel implements Container {
                         - caption.getHeight());
             }
         }
-
-        private void ie6Layout() {
-            // special handling for IE6 is needed, it does not support
-            // setting both left/right or top/bottom
-            Style style = getElement().getStyle();
-            if (bottom != null && top != null) {
-                // define height for wrapper to simulate bottom property
-                int bottompixels = measureForIE6(bottom, true);
-                VConsole.log("ALB" + bottompixels);
-                int height = canvas.getOffsetHeight() - bottompixels
-                        - getElement().getOffsetTop();
-                VConsole.log("ALB" + height);
-                if (height < 0) {
-                    height = 0;
-                }
-                style.setPropertyPx("height", height);
-            } else {
-                // reset possibly existing value
-                style.setProperty("height", "");
-            }
-            if (left != null && right != null) {
-                // define width for wrapper to simulate right property
-                int rightPixels = measureForIE6(right, false);
-                VConsole.log("ALR" + rightPixels);
-                int width = canvas.getOffsetWidth() - rightPixels
-                        - getElement().getOffsetLeft();
-                VConsole.log("ALR" + width);
-                if (width < 0) {
-                    width = 0;
-                }
-                style.setPropertyPx("width", width);
-            } else {
-                // reset possibly existing value
-                style.setProperty("width", "");
-            }
-        }
-
-    }
-
-    private Element measureElement;
-
-    private int measureForIE6(String cssLength, boolean vertical) {
-        if (measureElement == null) {
-            measureElement = DOM.createDiv();
-            measureElement.getStyle().setProperty("position", "absolute");
-            canvas.appendChild(measureElement);
-        }
-        if (vertical) {
-            measureElement.getStyle().setProperty("height", cssLength);
-            return measureElement.getOffsetHeight();
-        } else {
-            measureElement.getStyle().setProperty("width", cssLength);
-            return measureElement.getOffsetWidth();
-        }
     }
 
     /**
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java b/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java
index 66192489a9..6faf82446a 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java
@@ -16,7 +16,6 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.ContainerResizedListener;
 import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.RenderInformation;
@@ -50,10 +49,6 @@ public class VAccordion extends VTabsheetBase implements
 
     public VAccordion() {
         super(CLASSNAME);
-        // IE6 needs this to calculate offsetHeight correctly
-        if (BrowserInfo.get().isIE6()) {
-            DOM.setStyleAttribute(getElement(), "zoom", "1");
-        }
     }
 
     @Override
@@ -434,10 +429,6 @@ public class VAccordion extends VTabsheetBase implements
             setElement(DOM.createDiv());
             caption = new VCaption(null, client);
             caption.addClickHandler(this);
-            if (BrowserInfo.get().isIE6()) {
-                DOM.setEventListener(captionNode, this);
-                DOM.sinkEvents(captionNode, Event.BUTTON_LEFT);
-            }
             super.add(caption, captionNode);
             DOM.appendChild(captionNode, caption.getElement());
             DOM.appendChild(getElement(), captionNode);
@@ -496,10 +487,6 @@ public class VAccordion extends VTabsheetBase implements
             removeStyleDependentName("open");
             setHeight(-1);
             setWidth("");
-            if (BrowserInfo.get().isIE6()) {
-                // Work around for IE6 layouting problem #3359
-                getElement().getStyle().setProperty("zoom", "1");
-            }
             open = false;
         }
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VButton.java b/src/com/vaadin/terminal/gwt/client/ui/VButton.java
index 442d0709ef..3df623415a 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VButton.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VButton.java
@@ -143,8 +143,8 @@ public class VButton extends FocusWidget implements Paintable, ClickHandler,
             }
             wrapper.insertBefore(errorIndicatorElement, captionElement);
 
-            // Fix for IE6, IE7
-            if (BrowserInfo.get().isIE6() || BrowserInfo.get().isIE7()) {
+            // Fix for IE7
+            if (BrowserInfo.get().isIE7()) {
                 errorIndicatorElement.setInnerText(" ");
             }
 
@@ -453,7 +453,7 @@ public class VButton extends FocusWidget implements Paintable, ClickHandler,
 
     @Override
     public void setWidth(String width) {
-        if (BrowserInfo.get().isIE6() || BrowserInfo.get().isIE7()) {
+        if (BrowserInfo.get().isIE7()) {
             if (width != null && width.length() > 2) {
                 // Assume pixel values are always sent from
                 // ApplicationConnection
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java b/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java
index c519990aee..4c1d644756 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VContextMenu.java
@@ -31,7 +31,6 @@ import com.google.gwt.user.client.ui.MenuBar;
 import com.google.gwt.user.client.ui.MenuItem;
 import com.google.gwt.user.client.ui.PopupPanel;
 import com.google.gwt.user.client.ui.impl.FocusImpl;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.Focusable;
 import com.vaadin.terminal.gwt.client.Util;
 
@@ -218,11 +217,6 @@ public class VContextMenu extends VOverlay implements SubPartAware {
 
         public void onLoad(LoadEvent event) {
             // Handle icon onload events to ensure shadow is resized correctly
-            if (BrowserInfo.get().isIE6()) {
-                // Ensure PNG transparency works in IE6
-                Util.doIE6PngFix((Element) Element.as(event.getNativeEvent()
-                        .getEventTarget()));
-            }
             delayedImageLoadExecutioner.trigger();
         }
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
index 59f0afdd3c..80dc2ef015 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
@@ -87,7 +87,6 @@ public class VEmbedded extends HTML implements Paintable {
                     setHTML("");
                     el = DOM.createImg();
                     created = true;
-                    client.addPngFix(el);
                     DOM.sinkEvents(el, Event.ONLOAD);
                 }
 
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index 7c3d3066ce..6f90a140e8 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -12,7 +12,6 @@ import java.util.List;
 
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
-import com.google.gwt.dom.client.Style.Overflow;
 import com.google.gwt.event.dom.client.BlurEvent;
 import com.google.gwt.event.dom.client.BlurHandler;
 import com.google.gwt.event.dom.client.ClickEvent;
@@ -726,12 +725,6 @@ public class VFilterSelect extends Composite implements Paintable, Field,
         }
 
         public void onLoad(LoadEvent event) {
-            if (BrowserInfo.get().isIE6()) {
-                // Ensure PNG transparency works in IE6
-                Util.doIE6PngFix((Element) Element.as(event.getNativeEvent()
-                        .getEventTarget()));
-            }
-
             // Handle icon onload events to ensure shadow is resized
             // correctly
             delayedImageLoadExecutioner.trigger();
@@ -1315,13 +1308,7 @@ public class VFilterSelect extends Composite implements Paintable, Field,
     private void updateSelectedIconPosition() {
         // Position icon vertically to middle
         int availableHeight = 0;
-        if (BrowserInfo.get().isIE6()) {
-            getElement().getStyle().setOverflow(Overflow.HIDDEN);
-            availableHeight = getOffsetHeight();
-            getElement().getStyle().setProperty("overflow", "");
-        } else {
-            availableHeight = getOffsetHeight();
-        }
+        availableHeight = getOffsetHeight();
 
         int iconHeight = Util.getRequiredHeight(selectedItemIcon);
         int marginTop = (availableHeight - iconHeight) / 2;
@@ -1664,16 +1651,8 @@ public class VFilterSelect extends Composite implements Paintable, Field,
             this.width = width;
         }
 
-        if (BrowserInfo.get().isIE6()) {
-            // Required in IE when textfield is wider than this.width
-            getElement().getStyle().setOverflow(Overflow.HIDDEN);
-            horizPaddingAndBorder = Util.setWidthExcludingPaddingAndBorder(
-                    this, width, horizPaddingAndBorder);
-            getElement().getStyle().setProperty("overflow", "");
-        } else {
-            horizPaddingAndBorder = Util.setWidthExcludingPaddingAndBorder(
-                    this, width, horizPaddingAndBorder);
-        }
+        horizPaddingAndBorder = Util.setWidthExcludingPaddingAndBorder(this,
+                width, horizPaddingAndBorder);
 
         if (initDone) {
             updateRootWidth();
@@ -1763,16 +1742,7 @@ public class VFilterSelect extends Composite implements Paintable, Field,
      * @return The width in pixels
      */
     private int getMainWidth() {
-        int componentWidth;
-        if (BrowserInfo.get().isIE6()) {
-            // Required in IE when textfield is wider than this.width
-            getElement().getStyle().setOverflow(Overflow.HIDDEN);
-            componentWidth = getOffsetWidth();
-            getElement().getStyle().setProperty("overflow", "");
-        } else {
-            componentWidth = getOffsetWidth();
-        }
-        return componentWidth;
+        return getOffsetWidth();
     }
 
     /**
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VForm.java b/src/com/vaadin/terminal/gwt/client/ui/VForm.java
index cabe691a3e..67be713e1a 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VForm.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VForm.java
@@ -16,7 +16,6 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ComplexPanel;

 import com.google.gwt.user.client.ui.Widget;

 import com.vaadin.terminal.gwt.client.ApplicationConnection;

-import com.vaadin.terminal.gwt.client.BrowserInfo;

 import com.vaadin.terminal.gwt.client.Container;

 import com.vaadin.terminal.gwt.client.Paintable;

 import com.vaadin.terminal.gwt.client.RenderInformation;

@@ -214,9 +213,6 @@ public class VForm extends ComplexPanel implements Container, KeyDownHandler {
 

         renderInformation.setContentAreaHeight(renderInformation

                 .getRenderedSize().getHeight() - getSpaceConsumedVertically());

-        if (BrowserInfo.get().isIE6()) {

-            getElement().getStyle().setProperty("overflow", "hidden");

-        }

         renderInformation.setContentAreaWidth(renderInformation

                 .getRenderedSize().getWidth() - borderPaddingHorizontal);

     }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VLabel.java b/src/com/vaadin/terminal/gwt/client/ui/VLabel.java
index 28d16b4a39..76ea1297ea 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VLabel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VLabel.java
@@ -125,7 +125,7 @@ public class VLabel extends HTML implements Paintable {
     @Override
     public void setText(String text) {
         if (BrowserInfo.get().isIE() && BrowserInfo.get().getIEVersion() < 9) {
-            // #3983 - IE6-IE8 incorrectly replaces \n with <br> so we do the
+            // #3983 - IE7,IE8 incorrectly replaces \n with <br> so we do the
             // escaping manually and set as HTML
             super.setHTML(Util.escapeHTML(text));
         } else {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
index a2b49bae05..8b53fb01c1 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
@@ -11,7 +11,6 @@ import java.util.Stack;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
-import com.google.gwt.dom.client.NodeList;
 import com.google.gwt.dom.client.Style;
 import com.google.gwt.dom.client.Style.Overflow;
 import com.google.gwt.dom.client.Style.Unit;
@@ -157,24 +156,9 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable,
         }
 
         this.width = width;
-        if (BrowserInfo.get().isIE6() && width.endsWith("px")) {
-            // IE6 sometimes measures wrong using
-            // Util.setWidthExcludingPaddingAndBorder so this is extracted to a
-            // special case that uses another method. Really should fix the
-            // Util.setWidthExcludingPaddingAndBorder method but that will
-            // probably break additional cases
-            int requestedPixelWidth = Integer.parseInt(width.substring(0,
-                    width.length() - 2));
-            int paddingBorder = Util.measureHorizontalPaddingAndBorder(
-                    getElement(), 0);
-            int w = requestedPixelWidth - paddingBorder;
-            if (w < 0) {
-                w = 0;
-            }
-            getElement().getStyle().setWidth(w, Unit.PX);
-        } else {
-            Util.setWidthExcludingPaddingAndBorder(this, width, 0);
-        }
+
+        Util.setWidthExcludingPaddingAndBorder(this, width, 0);
+
         if (!subMenu) {
             // Only needed for root level menu
             hideChildren();
@@ -478,9 +462,6 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable,
 
         // Handle onload events (icon loaded, size changes)
         if (DOM.eventGetType(e) == Event.ONLOAD) {
-            if (BrowserInfo.get().isIE6()) {
-                Util.doIE6PngFix((Element) Element.as(e.getEventTarget()));
-            }
             VMenuBar parent = getParentMenu();
             if (parent != null) {
                 // The onload event for an image in a popup should be sent to
@@ -780,19 +761,10 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable,
                 style.setHeight(availableHeight, Unit.PX);
                 style.setOverflowY(Overflow.SCROLL);
 
-                // Make room for the scroll bar
-                if (BrowserInfo.get().isIE6()) {
-                    // IE6 renders the sub menu arrow icons on the scroll bar
-                    // unless we add some padding
-                    style.setPaddingRight(Util.getNativeScrollbarSize(),
-                            Unit.PX);
-                } else {
-                    // For other browsers, adjusting the width of the popup is
-                    // enough
-                    style.setWidth(
-                            contentWidth + Util.getNativeScrollbarSize(),
-                            Unit.PX);
-                }
+                // Make room for the scroll bar by adjusting the width of the
+                // popup
+                style.setWidth(contentWidth + Util.getNativeScrollbarSize(),
+                        Unit.PX);
                 popup.updateShadowSizeAndPosition();
             }
         }
@@ -962,6 +934,7 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable,
                 addStyleDependentName("selected");
                 // needed for IE6 to have a single style name to match for an
                 // element
+                // TODO Can be optimized now that IE6 is not supported any more
                 if (checkable) {
                     if (checked) {
                         removeStyleDependentName("selected-unchecked");
@@ -1170,22 +1143,9 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable,
                 paddingWidth = widthBefore - getElement().getClientWidth();
                 getElement().getStyle().setProperty("padding", "");
             }
-            String overflow = "";
-            if (BrowserInfo.get().isIE6()) {
-                // IE6 cannot measure available width correctly without
-                // overflow:hidden
-                overflow = getElement().getStyle().getProperty("overflow");
-                getElement().getStyle().setProperty("overflow", "hidden");
-            }
 
             int availableWidth = getElement().getClientWidth() - paddingWidth;
 
-            if (BrowserInfo.get().isIE6()) {
-                // IE6 cannot measure available width correctly without
-                // overflow:hidden
-                getElement().getStyle().setProperty("overflow", overflow);
-            }
-
             // Used width includes the "more" item if present
             int usedWidth = getConsumedWidth();
             int diff = availableWidth - usedWidth;
@@ -1230,16 +1190,6 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable,
                     } else {
                         widthAvailable = diff;
                     }
-
-                    if (BrowserInfo.get().isIE6()) {
-                        /*
-                         * Handle transparency for IE6 here as we cannot
-                         * implement it in CustomMenuItem.onAttach because
-                         * onAttach is never called for CustomMenuItem due to an
-                         * invalid component hierarchy (#6203)...
-                         */
-                        reloadImages(expand.getElement());
-                    }
                 }
             }
             if (collapsedRootItems.getItems().size() > 0) {
@@ -1636,31 +1586,4 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable,
         return null;
     }
 
-    @Override
-    protected void onLoad() {
-        super.onLoad();
-        if (BrowserInfo.get().isIE6()) {
-            reloadImages(getElement());
-        }
-    }
-
-    /**
-     * Force a new onload event for all images. Used only for IE6 to deal with
-     * PNG transparency.
-     */
-    private void reloadImages(Element root) {
-
-        NodeList<com.google.gwt.dom.client.Element> imgElements = root
-                .getElementsByTagName("img");
-        for (int i = 0; i < imgElements.getLength(); i++) {
-            Element e = (Element) imgElements.getItem(i);
-
-            // IE6 fires onload events for the icons before the listener
-            // is attached (or never). Updating the src force another
-            // onload event
-            String src = e.getAttribute("src");
-            e.setAttribute("src", src);
-        }
-    }
-
 }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
index 3034259353..458c43024c 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
@@ -99,7 +99,9 @@ public class VNativeButton extends Button implements Paintable, ClickHandler,
             }
             getElement().insertBefore(errorIndicatorElement, captionElement);
 
-            // Fix for IE6, IE7
+            // Fix for IE
+            // TODO This was originally for IE6 & IE7 and might not be needed
+            // any more
             if (BrowserInfo.get().isIE()) {
                 errorIndicatorElement.setInnerText(" ");
             }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java
index 6261a3988a..a441fb24bd 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java
@@ -8,9 +8,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 
 import com.google.gwt.event.dom.client.ChangeEvent;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.Util;
 
 public class VNativeSelect extends VOptionGroupBase implements Field {
 
@@ -58,11 +56,6 @@ public class VNativeSelect extends VOptionGroupBase implements Field {
             select.setItemSelected(0, true);
             firstValueIsTemporaryNullItem = true;
         }
-        if (BrowserInfo.get().isIE6()) {
-            // lazy size change - IE6 uses naive dropdown that does not have a
-            // proper size yet
-            Util.notifyParentOfSizeChange(this, true);
-        }
     }
 
     @Override
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroup.java b/src/com/vaadin/terminal/gwt/client/ui/VOptionGroup.java
index e524d4ed9a..f33b905dea 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroup.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VOptionGroup.java
@@ -20,7 +20,6 @@ import com.google.gwt.event.dom.client.LoadEvent;
 import com.google.gwt.event.dom.client.LoadHandler;

 import com.google.gwt.event.shared.HandlerRegistration;

 import com.google.gwt.user.client.Command;

-import com.google.gwt.user.client.Element;

 import com.google.gwt.user.client.ui.CheckBox;

 import com.google.gwt.user.client.ui.FocusWidget;

 import com.google.gwt.user.client.ui.Focusable;

@@ -28,7 +27,6 @@ import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.RadioButton;

 import com.google.gwt.user.client.ui.Widget;

 import com.vaadin.terminal.gwt.client.ApplicationConnection;

-import com.vaadin.terminal.gwt.client.BrowserInfo;

 import com.vaadin.terminal.gwt.client.EventId;

 import com.vaadin.terminal.gwt.client.UIDL;

 import com.vaadin.terminal.gwt.client.Util;

@@ -51,10 +49,6 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler,
 

     private final LoadHandler iconLoadHandler = new LoadHandler() {

         public void onLoad(LoadEvent event) {

-            if (BrowserInfo.get().isIE6()) {

-                Util.doIE6PngFix((Element) Element.as(event.getNativeEvent()

-                        .getEventTarget()));

-            }

             Util.notifyParentOfSizeChange(VOptionGroup.this, true);

         }

     };

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java
index 27b8840823..0957b6270f 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java
@@ -162,9 +162,7 @@ public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> {
 
     private static int adjustByRelativeTopBodyMargin() {
         if (topFix == -1) {
-            boolean ie6OrIe7 = BrowserInfo.get().isIE()
-                    && BrowserInfo.get().getIEVersion() <= 7;
-            topFix = detectRelativeBodyFixes("top", ie6OrIe7);
+            topFix = detectRelativeBodyFixes("top", BrowserInfo.get().isIE7());
         }
         return topFix;
     }
@@ -178,7 +176,7 @@ public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> {
             if(cstyle && cstyle.position == 'relative') {
                 var offset = b.getBoundingClientRect()[axis];
                 if (removeClientLeftOrTop) {
-                    // IE6 and IE7 include the top left border of the client area into the boundingClientRect
+                    // IE7 include the top left border of the client area into the boundingClientRect
                     var clientTopOrLeft = 0;
                     if (axis == "top")
                         clientTopOrLeft = $wnd.document.documentElement.clientTop;
@@ -195,9 +193,7 @@ public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> {
 
     private static int adjustByRelativeLeftBodyMargin() {
         if (leftFix == -1) {
-            boolean ie6OrIe7 = BrowserInfo.get().isIE()
-                    && BrowserInfo.get().getIEVersion() <= 7;
-            leftFix = detectRelativeBodyFixes("left", ie6OrIe7);
+            leftFix = detectRelativeBodyFixes("left", BrowserInfo.get().isIE7());
 
         }
         return leftFix;
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
index 692b8a4858..4611f6e4ab 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
@@ -322,40 +322,6 @@ public class VPanel extends SimplePanel implements Container,
     }
 
     public void runHacks(boolean runGeckoFix) {
-        if (BrowserInfo.get().isIE6() && width != null && !width.equals("")) {
-            /*
-             * IE6 requires overflow-hidden elements to have a width specified
-             * so we calculate the width of the content and caption nodes when
-             * no width has been specified.
-             */
-            /*
-             * Fixes #1923 VPanel: Horizontal scrollbar does not appear in IE6
-             * with wide content
-             */
-
-            /*
-             * Caption must be shrunk for parent measurements to return correct
-             * result in IE6
-             */
-            DOM.setStyleAttribute(captionNode, "width", "1px");
-
-            int parentPadding = Util.measureHorizontalPaddingAndBorder(
-                    getElement(), 0);
-
-            int parentWidthExcludingPadding = getElement().getOffsetWidth()
-                    - parentPadding;
-
-            Util.setWidthExcludingPaddingAndBorder(captionNode,
-                    parentWidthExcludingPadding - getCaptionMarginLeft(), 26,
-                    false);
-
-            int contentMarginLeft = getContentMarginLeft();
-
-            Util.setWidthExcludingPaddingAndBorder(contentNode,
-                    parentWidthExcludingPadding - contentMarginLeft, 2, false);
-
-        }
-
         if ((BrowserInfo.get().isIE() || BrowserInfo.get().isFF2())
                 && (width == null || width.equals(""))) {
             /*
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
index 2cbae57175..06d58fe733 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
@@ -264,7 +264,7 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
                     int l = calendarToggle.getAbsoluteLeft();

 

                     // Add a little extra space to the right to avoid

-                    // problems with IE6/IE7 scrollbars and to make it look

+                    // problems with IE7 scrollbars and to make it look

                     // nicer.

                     int extraSpace = 30;

 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 959b92cffa..c42567f9b1 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -2287,7 +2287,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
          * of the caption container element by the correct amount
          */
         public void resizeCaptionContainer(int rightSpacing) {
-            if (BrowserInfo.get().isIE6() || td.getClassName().contains("-asc")
+            if (td.getClassName().contains("-asc")
                     || td.getClassName().contains("-desc")) {
                 /*
                  * Room for the sort indicator is made by subtracting the styled
@@ -3017,12 +3017,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
         }
 
         public void setHorizontalScrollPosition(int scrollLeft) {
-            if (BrowserInfo.get().isIE6()) {
-                hTableWrapper.getStyle().setPosition(Position.RELATIVE);
-                hTableWrapper.getStyle().setLeft(-scrollLeft, Unit.PX);
-            } else {
-                hTableWrapper.setScrollLeft(scrollLeft);
-            }
+            hTableWrapper.setScrollLeft(scrollLeft);
         }
 
         public void setColumnCollapsingAllowed(boolean cc) {
@@ -3873,12 +3868,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
          *            The value of the leftScroll
          */
         public void setHorizontalScrollPosition(int scrollLeft) {
-            if (BrowserInfo.get().isIE6()) {
-                hTableWrapper.getStyle().setProperty("position", "relative");
-                hTableWrapper.getStyle().setPropertyPx("left", -scrollLeft);
-            } else {
-                hTableWrapper.setScrollLeft(scrollLeft);
-            }
+            hTableWrapper.setScrollLeft(scrollLeft);
         }
 
         /**
@@ -5934,7 +5924,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
      */
     private int getContentAreaBorderHeight() {
         if (contentAreaBorderHeight < 0) {
-            if (BrowserInfo.get().isIE7() || BrowserInfo.get().isIE6()) {
+            if (BrowserInfo.get().isIE7()) {
                 contentAreaBorderHeight = Util
                         .measureVerticalBorder(scrollBodyPanel.getElement());
             } else {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VSlider.java b/src/com/vaadin/terminal/gwt/client/ui/VSlider.java
index f6c9b3ab0d..34838698b5 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VSlider.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VSlider.java
@@ -300,9 +300,7 @@ public class VSlider extends SimpleFocusablePanel implements Paintable, Field,
             p = 0;

         }

         if (vertical) {

-            // IE6 rounding behaves a little unstable, reduce one pixel so the

-            // containing element (base) won't expand without limits

-            p = range - p - (BrowserInfo.get().isIE6() ? 1 : 0);

+            p = range - p;

         }

         final double pos = p;

 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
index 41d48041fc..ec3eeed15c 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
@@ -468,10 +468,6 @@ public class VTextField extends TextBoxBase implements Paintable, Field,
             setText("");
             removeStyleDependentName(CLASSNAME_PROMPT);
             setPrompting(false);
-            if (BrowserInfo.get().isIE6()) {
-                // IE6 does not show the cursor when tabbing into the field
-                setCursorPos(0);
-            }
         }
         focusedTextField = this;
         if (client.hasEventListeners(this, EventId.FOCUS)) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java b/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
index 4a0d6ff0f5..4115f30c37 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
@@ -12,7 +12,6 @@ import com.google.gwt.event.dom.client.ChangeEvent;
 import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.event.dom.client.FocusEvent;
 import com.google.gwt.event.dom.client.FocusHandler;
-import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.TextBox;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
@@ -341,10 +340,6 @@ public class VTextualDate extends VDateField implements Paintable, Field,
     @Override
     public void setWidth(String newWidth) {
         if (!"".equals(newWidth) && (width == null || !newWidth.equals(width))) {
-            if (BrowserInfo.get().isIE6()) {
-                // in IE6 cols ~ min-width
-                DOM.setElementProperty(text.getElement(), "size", "1");
-            }
             needLayout = true;
             width = newWidth;
             super.setWidth(width);
@@ -354,10 +349,6 @@ public class VTextualDate extends VDateField implements Paintable, Field,
             }
         } else {
             if ("".equals(newWidth) && width != null && !"".equals(width)) {
-                if (BrowserInfo.get().isIE6()) {
-                    // revert IE6 hack
-                    DOM.setElementProperty(text.getElement(), "size", "");
-                }
                 super.setWidth("");
                 needLayout = true;
                 iLayout();
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
index f50b722d0c..e959038374 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
@@ -279,13 +279,8 @@ public class VTree extends FocusElementPanel implements Paintable,
                 continue;
             }
             childTree = new TreeNode();
-            if (childTree.ie6compatnode != null) {
-                body.add(childTree);
-            }
             childTree.updateFromUIDL(childUidl, client);
-            if (childTree.ie6compatnode == null) {
-                body.add(childTree);
-            }
+            body.add(childTree);
             childTree.addStyleDependentName("root");
             childTree.childNodeContainer.addStyleDependentName("root");
         }
@@ -582,19 +577,12 @@ public class VTree extends FocusElementPanel implements Paintable,
 
         private Icon icon;
 
-        private Element ie6compatnode;
-
         private Event mouseDownEvent;
 
         private int cachedHeight = -1;
 
         private boolean focused = false;
 
-        /**
-         * Track onload events as IE6 sends two
-         */
-        private boolean onloadHandled = false;
-
         public TreeNode() {
             constructDom();
             sinkEvents(Event.ONCLICK | Event.ONDBLCLICK | Event.MOUSEEVENTS
@@ -692,11 +680,11 @@ public class VTree extends FocusElementPanel implements Paintable,
             // always when clicking an item, focus it
             setFocusedNode(this, false);
 
-            if (!isIE6OrOpera()) {
+            if (!BrowserInfo.get().isOpera()) {
                 /*
                  * Ensure that the tree's focus element also gains focus
                  * (TreeNodes focus is faked using FocusElementPanel in browsers
-                 * other than IE6 and Opera).
+                 * other than Opera).
                  */
                 focus();
             }
@@ -764,14 +752,7 @@ public class VTree extends FocusElementPanel implements Paintable,
             final Element target = DOM.eventGetTarget(event);
 
             if (type == Event.ONLOAD && target == icon.getElement()) {
-                if (onloadHandled) {
-                    return;
-                }
-                if (BrowserInfo.get().isIE6()) {
-                    fixWidth();
-                }
                 iconLoaded.trigger();
-                onloadHandled = true;
             }
 
             if (disabled) {
@@ -792,7 +773,7 @@ public class VTree extends FocusElementPanel implements Paintable,
                 fireClick(event);
             }
             if (type == Event.ONCLICK) {
-                if (getElement() == target || ie6compatnode == target) {
+                if (getElement() == target) {
                     // state change
                     toggleState();
                 } else if (!readonly && inCaption) {
@@ -878,7 +859,7 @@ public class VTree extends FocusElementPanel implements Paintable,
              * previously modified field may contain dirty variables.
              */
             if (!treeHasFocus) {
-                if (isIE6OrOpera()) {
+                if (BrowserInfo.get().isOpera()) {
                     if (focusedNode == null) {
                         getNodeByKey(key).setFocused(true);
                     } else {
@@ -939,15 +920,6 @@ public class VTree extends FocusElementPanel implements Paintable,
 
         protected void constructDom() {
             addStyleName(CLASSNAME);
-            // workaround for a very weird IE6 issue #1245
-            if (BrowserInfo.get().isIE6()) {
-                ie6compatnode = DOM.createDiv();
-                setStyleName(ie6compatnode, CLASSNAME + "-ie6compatnode");
-                DOM.setInnerText(ie6compatnode, " ");
-                DOM.appendChild(getElement(), ie6compatnode);
-
-                DOM.sinkEvents(ie6compatnode, Event.ONCLICK);
-            }
 
             nodeCaptionDiv = DOM.createDiv();
             DOM.setElementProperty(nodeCaptionDiv, "className", CLASSNAME
@@ -959,7 +931,7 @@ public class VTree extends FocusElementPanel implements Paintable,
             DOM.appendChild(nodeCaptionDiv, wrapper);
             DOM.appendChild(wrapper, nodeCaptionSpan);
 
-            if (isIE6OrOpera()) {
+            if (BrowserInfo.get().isOpera()) {
                 /*
                  * Focus the caption div of the node to get keyboard navigation
                  * to work without scrolling up or down when focusing a node.
@@ -1023,7 +995,6 @@ public class VTree extends FocusElementPanel implements Paintable,
 
             if (uidl.hasAttribute("icon")) {
                 if (icon == null) {
-                    onloadHandled = false;
                     icon = new Icon(client);
                     DOM.insertBefore(DOM.getFirstChild(nodeCaptionDiv),
                             icon.getElement(), nodeCaptionSpan);
@@ -1036,10 +1007,6 @@ public class VTree extends FocusElementPanel implements Paintable,
                     icon = null;
                 }
             }
-
-            if (BrowserInfo.get().isIE6() && isAttached()) {
-                fixWidth();
-            }
         }
 
         public boolean isLeaf() {
@@ -1103,13 +1070,8 @@ public class VTree extends FocusElementPanel implements Paintable,
                     continue;
                 }
                 final TreeNode childTree = new TreeNode();
-                if (ie6compatnode != null) {
-                    childNodeContainer.add(childTree);
-                }
                 childTree.updateFromUIDL(childUidl, client);
-                if (ie6compatnode == null) {
-                    childNodeContainer.add(childTree);
-                }
+                childNodeContainer.add(childTree);
                 if (!i.hasNext()) {
                     childTree
                             .addStyleDependentName(childTree.isLeaf() ? "leaf-last"
@@ -1220,32 +1182,6 @@ public class VTree extends FocusElementPanel implements Paintable,
         }
 
         /*
-         * We need to fix the width of TreeNodes so that the float in
-         * ie6compatNode does not wrap (see ticket #1245)
-         */
-        private void fixWidth() {
-            nodeCaptionDiv.getStyle().setProperty("styleFloat", "left");
-            nodeCaptionDiv.getStyle().setProperty("display", "inline");
-            nodeCaptionDiv.getStyle().setProperty("marginLeft", "0");
-            final int captionWidth = ie6compatnode.getOffsetWidth()
-                    + nodeCaptionDiv.getOffsetWidth();
-            setWidth(captionWidth + "px");
-        }
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see com.google.gwt.user.client.ui.Widget#onAttach()
-         */
-        @Override
-        public void onAttach() {
-            super.onAttach();
-            if (ie6compatnode != null) {
-                fixWidth();
-            }
-        }
-
-        /*
          * (non-Javadoc)
          * 
          * @see com.google.gwt.user.client.ui.Widget#onDetach()
@@ -1275,19 +1211,14 @@ public class VTree extends FocusElementPanel implements Paintable,
         public void setFocused(boolean focused) {
             if (!this.focused && focused) {
                 nodeCaptionDiv.addClassName(CLASSNAME_FOCUSED);
-                if (BrowserInfo.get().isIE6()) {
-                    ie6compatnode.addClassName(CLASSNAME_FOCUSED);
-                }
+
                 this.focused = focused;
-                if (isIE6OrOpera()) {
+                if (BrowserInfo.get().isOpera()) {
                     nodeCaptionDiv.focus();
                 }
                 treeHasFocus = true;
             } else if (this.focused && !focused) {
                 nodeCaptionDiv.removeClassName(CLASSNAME_FOCUSED);
-                if (BrowserInfo.get().isIE6()) {
-                    ie6compatnode.removeClassName(CLASSNAME_FOCUSED);
-                }
                 this.focused = focused;
                 treeHasFocus = false;
             }
@@ -2174,7 +2105,7 @@ public class VTree extends FocusElementPanel implements Paintable,
      */
     public Element getSubPartElement(String subPart) {
         if ("fe".equals(subPart)) {
-            if (isIE6OrOpera() && focusedNode != null) {
+            if (BrowserInfo.get().isOpera() && focusedNode != null) {
                 return focusedNode.getElement();
             }
             return getFocusElement();
@@ -2206,11 +2137,7 @@ public class VTree extends FocusElementPanel implements Paintable,
                 }
 
                 if (expandCollapse) {
-                    if (treeNode.ie6compatnode != null) {
-                        return treeNode.ie6compatnode;
-                    } else {
-                        return treeNode.getElement();
-                    }
+                    return treeNode.getElement();
                 } else {
                     return treeNode.nodeCaptionSpan;
                 }
@@ -2254,8 +2181,7 @@ public class VTree extends FocusElementPanel implements Paintable,
             return null;
         }
 
-        if (subElement == treeNode.getElement()
-                || subElement == treeNode.ie6compatnode) {
+        if (subElement == treeNode.getElement()) {
             // Targets expand/collapse arrow
             isExpandCollapse = true;
         }
@@ -2316,8 +2242,4 @@ public class VTree extends FocusElementPanel implements Paintable,
             event.preventDefault();
         }
     }
-
-    private boolean isIE6OrOpera() {
-        return BrowserInfo.get().isIE6() || BrowserInfo.get().isOpera();
-    }
 }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java b/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
index f7bd0b115d..8db320b1da 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
@@ -164,7 +164,7 @@ public class VTreeTable extends VScrollTable {
 
     private boolean browserSupportsAnimation() {
         BrowserInfo bi = BrowserInfo.get();
-        return !(bi.isIE6() || bi.isIE7() || bi.isSafari4());
+        return !(bi.isIE7() || bi.isSafari4());
     }
 
     class VTreeTableScrollBody extends VScrollTable.VScrollTableBody {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java
index 1d02e50032..de2a903187 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java
@@ -27,7 +27,6 @@ import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.ListBox;

 import com.google.gwt.user.client.ui.Panel;

 import com.vaadin.terminal.gwt.client.ApplicationConnection;

-import com.vaadin.terminal.gwt.client.BrowserInfo;

 import com.vaadin.terminal.gwt.client.UIDL;

 import com.vaadin.terminal.gwt.client.Util;

 

@@ -385,16 +384,7 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler,
 

     private void setInternalHeights() {

         int captionHeight = 0;

-        int totalHeight;

-        if (BrowserInfo.get().isIE6()) {

-            String o = getElement().getStyle().getOverflow();

-

-            getElement().getStyle().setOverflow(Overflow.HIDDEN);

-            totalHeight = getOffsetHeight();

-            getElement().getStyle().setProperty("overflow", o);

-        } else {

-            totalHeight = getOffsetHeight();

-        }

+        int totalHeight = getOffsetHeight();

 

         if (optionsCaption != null) {

             captionHeight = Util.getRequiredHeight(optionsCaption);

@@ -424,11 +414,6 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler,
         int bordersAndPaddings = Util.measureHorizontalPaddingAndBorder(

                 buttons.getElement(), 0);

 

-        if (BrowserInfo.get().isIE6()) {

-            // IE6 sets a border on selects by default..

-            bordersAndPaddings += 4;

-        }

-

         int buttonWidth = Util.getRequiredWidth(buttons);

         int totalWidth = getOffsetWidth();

 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
index 25fd1d7604..77d7a7f762 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
@@ -144,8 +144,6 @@ public class VUpload extends SimplePanel implements Paintable {
     private static native void setEncoding(Element form, String encoding)
     /*-{
       form.enctype = encoding;
-      // For IE6
-      form.encoding = encoding;
     }-*/;
 
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java b/src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java
index 535ec16030..3da85e1b2b 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VUriFragmentUtility.java
@@ -10,7 +10,6 @@ import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
-import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 
@@ -30,10 +29,6 @@ public class VUriFragmentUtility extends Widget implements Paintable,
 
     public VUriFragmentUtility() {
         setElement(Document.get().createDivElement());
-        if (BrowserInfo.get().isIE6()) {
-            getElement().getStyle().setProperty("overflow", "hidden");
-            getElement().getStyle().setProperty("height", "0");
-        }
     }
 
     @Override
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
index 8ffb0246a3..cec6bf4581 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
@@ -593,19 +593,6 @@ public class VWindow extends VOverlay implements Container,
 
         DOM.setStyleAttribute(getElement(), "width", "");
 
-        String oldHeaderWidth = ""; // Only for IE6
-        if (BrowserInfo.get().isIE6()) {
-            /*
-             * For some reason IE6 has title DIV set to width 100% which
-             * interferes with the header measuring. Also IE6 has width set to
-             * the contentPanel.
-             */
-            oldHeaderWidth = headerText.getStyle().getProperty("width");
-            DOM.setStyleAttribute(contentPanel.getElement(), "width", "auto");
-            DOM.setStyleAttribute(contentPanel.getElement(), "zoom", "1");
-            headerText.getStyle().setProperty("width", "auto");
-        }
-
         // Content
         int contentWidth = contentPanel.getElement().getScrollWidth();
         contentWidth += getContentAreaToRootDifference();
@@ -616,10 +603,6 @@ public class VWindow extends VOverlay implements Container,
         int naturalWidth = (contentWidth > windowCaptionWidth ? contentWidth
                 : windowCaptionWidth);
 
-        if (BrowserInfo.get().isIE6()) {
-            headerText.getStyle().setProperty("width", oldHeaderWidth);
-        }
-
         setWidth(naturalWidth + "px");
     }
 
@@ -1056,10 +1039,6 @@ public class VWindow extends VOverlay implements Container,
 
             // "width" now contains the new width in pixels
 
-            if (BrowserInfo.get().isIE6()) {
-                getElement().getStyle().setProperty("overflow", "hidden");
-            }
-
             // Apply the new pixel width
             getElement().getStyle().setProperty("width", width);
 
@@ -1073,14 +1052,6 @@ public class VWindow extends VOverlay implements Container,
                 DOM.setStyleAttribute(getElement(), "width", rootWidth + "px");
             }
 
-            // IE6 needs the actual inner content width on the content element,
-            // otherwise it won't wrap the content properly (no scrollbars
-            // appear, content flows out of window)
-            if (BrowserInfo.get().isIE6()) {
-                DOM.setStyleAttribute(contentPanel.getElement(), "width",
-                        contentAreaInnerWidth + "px");
-            }
-
             renderSpace.setWidth(contentAreaInnerWidth);
 
             updateShadowSizeAndPosition();
diff --git a/src/com/vaadin/ui/RichTextArea.java b/src/com/vaadin/ui/RichTextArea.java
index d371e3c181..848e778755 100644
--- a/src/com/vaadin/ui/RichTextArea.java
+++ b/src/com/vaadin/ui/RichTextArea.java
@@ -129,6 +129,7 @@ public class RichTextArea extends AbstractField {
     public void setReadOnly(boolean readOnly) {
         super.setReadOnly(readOnly);
         // IE6 cannot support multi-classname selectors properly
+        // TODO Can be optimized now that support for I6 is dropped
         if (readOnly) {
             addStyleName("v-richtextarea-readonly");
         } else {
diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons.java b/tests/testbench/com/vaadin/tests/components/button/Buttons.java
index afbc90d197..573c95c2b8 100644
--- a/tests/testbench/com/vaadin/tests/components/button/Buttons.java
+++ b/tests/testbench/com/vaadin/tests/components/button/Buttons.java
@@ -46,13 +46,7 @@ public class Buttons extends ComponentTestCase<Button> {
             l.setWidth("100%");
             l.setHeight("65px");
 
-            boolean ie6 = (getBrowser().isIE() && getBrowser()
-                    .getBrowserMajorVersion() == 6);
-            if (!ie6 || !nat) {
-                // Skip this NativeButton for IE6 as it can't decide how to
-                // render it
-                addTestComponent(l);
-            }
+            addTestComponent(l);
         }
 
     }
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
index b0e2444986..4bc409b881 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
+++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.html
@@ -316,12 +316,6 @@
 	<td>vaadin=runcomvaadintestslayoutslayouttesterLayoutTesterApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
 	<td></td>
 </tr>
-<!-- Only for IE6 so it has time to load images and adjust -->
-<tr>
-	<td>pause</td>
-	<td>2000</td>
-	<td></td>
-</tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>