Move all themes except Valo into a new compatibility-themes package

Change-Id: Ife0707c69bac83f190b5497af5fef1af43af6e46

778 files changed, 462 insertions, 228 deletions

diff --git a/all/pom.xml b/all/pom.xml
index 1630241db7..737c11a980 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -76,6 +76,12 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>vaadin-compatibility-themes</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>vaadin-compatibility-client</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/bom/pom.xml b/bom/pom.xml
index c99cff7c7b..d154f79b4f 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -66,6 +66,11 @@
             </dependency>
             <dependency>
                 <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-compatibility-themes</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.vaadin</groupId>
                 <artifactId>vaadin-compatibility-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
diff --git a/server/src/main/java/com/vaadin/ui/themes/BaseTheme.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/BaseTheme.java
index 3b25f0ee24..237682ba3c 100644
--- a/server/src/main/java/com/vaadin/ui/themes/BaseTheme.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/BaseTheme.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.themes;
+package com.vaadin.v7.ui.themes;
 
 /**
  * <p>
@@ -34,6 +34,7 @@ package com.vaadin.ui.themes;
  * @since 6.3.0
  *
  */
+@Deprecated
 public class BaseTheme {
 
     public static final String THEME_NAME = "base";
diff --git a/server/src/main/java/com/vaadin/ui/themes/ChameleonTheme.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/ChameleonTheme.java
index 5e4f27f24c..2523612bb2 100644
--- a/server/src/main/java/com/vaadin/ui/themes/ChameleonTheme.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/ChameleonTheme.java
@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.themes;
+package com.vaadin.v7.ui.themes;
 
+@Deprecated
 public class ChameleonTheme extends BaseTheme {
 
     public static final String THEME_NAME = "chameleon";
diff --git a/server/src/main/java/com/vaadin/ui/themes/Reindeer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java
index 554bd6a75f..cb22bcae3f 100644
--- a/server/src/main/java/com/vaadin/ui/themes/Reindeer.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Reindeer.java
@@ -13,13 +13,16 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.themes;
+package com.vaadin.v7.ui.themes;
 
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.VerticalSplitPanel;
 
+@Deprecated
 public class Reindeer extends BaseTheme {
 
     public static final String THEME_NAME = "reindeer";
diff --git a/server/src/main/java/com/vaadin/ui/themes/Runo.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Runo.java
index 645b805e7f..d01e1184b8 100644
--- a/server/src/main/java/com/vaadin/ui/themes/Runo.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/themes/Runo.java
@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.ui.themes;
+package com.vaadin.v7.ui.themes;
 
+@Deprecated
 public class Runo extends BaseTheme {
 
     public static final String THEME_NAME = "runo";
diff --git a/compatibility-themes/pom.xml b/compatibility-themes/pom.xml
new file mode 100644
index 0000000000..ed47a260e0
--- /dev/null
+++ b/compatibility-themes/pom.xml
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.vaadin</groupId>
+        <artifactId>vaadin-root</artifactId>
+        <version>8.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>vaadin-compatibility-themes</artifactId>
+    <name>vaadin-compatibility-themes</name>
+    <packaging>jar</packaging>
+
+    <url>https://vaadin.com/</url>
+    <description>Vaadin compatibility themes</description>
+
+    <dependencies>
+        <!-- Maven plugin scans for vaadin-server... -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vaadin-server</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vaadin-buildhelpers</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-sass-compiler</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.carrotsearch</groupId>
+            <artifactId>smartsprites</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- smartsprites dependency -->
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-theme-sources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/themes</directory>
+                                    <filtering>false</filtering>
+                                    <excludes>
+                                        <exclude>**/base.scss</exclude>
+                                    </excludes>
+                                </resource>
+                                <resource>
+                                    <directory>src/main/themes</directory>
+                                    <filtering>true</filtering>
+                                    <includes>
+                                        <include>**/base.scss</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+
+            <plugin>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-maven-plugin</artifactId>
+                <configuration>
+                    <compressTheme>true</compressTheme>
+                    <warSourceDirectory>${project.build.outputDirectory}</warSourceDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>compile-theme</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>compile-legacy-base</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <classpathScope>compile</classpathScope>
+                            <executable>${java.home}/bin/java</executable>
+                            <arguments>
+                                <argument>-classpath</argument>
+                                <classpath />
+
+                                <argument>com.vaadin.sass.SassCompiler</argument>
+                                <argument>
+                                    ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.scss</argument>
+                                <argument>
+                                    ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.css</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>compile-legacy-chameleon</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <classpathScope>compile</classpathScope>
+                            <executable>${java.home}/bin/java</executable>
+                            <arguments>
+                                <argument>-classpath</argument>
+                                <classpath />
+
+                                <argument>com.vaadin.sass.SassCompiler</argument>
+                                <argument>
+                                    ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.scss</argument>
+                                <argument>
+                                    ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.css</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>compile-legacy-reindeer</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <classpathScope>compile</classpathScope>
+                            <executable>${java.home}/bin/java</executable>
+                            <arguments>
+                                <argument>-classpath</argument>
+                                <classpath />
+
+                                <argument>com.vaadin.sass.SassCompiler</argument>
+                                <argument>
+                                    ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.scss</argument>
+                                <argument>
+                                    ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.css</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>compile-legacy-runo</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <classpathScope>compile</classpathScope>
+                            <executable>${java.home}/bin/java</executable>
+                            <arguments>
+                                <argument>-classpath</argument>
+                                <classpath />
+
+                                <argument>com.vaadin.sass.SassCompiler</argument>
+                                <argument>
+                                    ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.scss</argument>
+                                <argument>
+                                    ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.css</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>smart-sprite-reindeer</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <classpathScope>compile</classpathScope>
+                            <executable>${java.home}/bin/java</executable>
+                            <arguments>
+                                <argument>-classpath</argument>
+                                <classpath />
+
+                                <argument>org.carrot2.labs.smartsprites.SmartSprites</argument>
+
+                                <argument>--sprite-png-depth</argument>
+                                <argument>AUTO</argument>
+
+                                <argument>--css-file-encoding</argument>
+                                <argument>UTF-8</argument>
+
+                                <argument>--root-dir-path</argument>
+                                <argument>${project.build.outputDirectory}/VAADIN/themes/reindeer</argument>
+
+                                <argument>--log-level</argument>
+                                <argument>WARN</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>generate-export-package</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <classpathScope>compile</classpathScope>
+                            <executable>${java.home}/bin/java</executable>
+                            <arguments>
+                                <argument>-Dvaadin.version=${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</argument>
+                                <argument>-DincludeNumberPackages=0</argument>
+
+                                <argument>-classpath</argument>
+                                <classpath />
+
+                                <argument>com.vaadin.buildhelpers.GeneratePackageExports</argument>
+
+                                <argument>${project.build.directory}/${project.build.finalName}.${project.packaging}</argument>
+                                <argument>VAADIN/themes</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>repackage-reindeer</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <property name="reindeer.theme.path"
+                                    value="${project.build.outputDirectory}/VAADIN/themes/reindeer/" />
+
+                                <move
+                                    file="${reindeer.theme.path}/styles-sprite.css"
+                                    tofile="${reindeer.theme.path}/styles.css" />
+
+                                <move
+                                    file="${reindeer.theme.path}/legacy-styles-sprite.css"
+                                    tofile="${reindeer.theme.path}/legacy-styles.css" />
+
+                                <gzip
+                                    src="${reindeer.theme.path}/styles.css"
+                                    destfile="${reindeer.theme.path}/styles.css.gz" />
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>${osgi.bundle.version}</Bundle-Version>
+                        <Bundle-RequiredExecutionEnvironment>${osgi.execution.environment}</Bundle-RequiredExecutionEnvironment>
+                        <!-- Export package is handled in exec plugin -->
+                        <Export-Package></Export-Package>
+                        <Import-Package></Import-Package>
+                    </instructions>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <index>false</index>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <configuration>
+                        <skipSource>true</skipSource>
+                    </configuration>
+                </plugin>
+                <!--This plugin's configuration is used to store Eclipse 
+                    m2e settings only. It has no influence on the Maven build itself. -->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.codehaus.mojo
+                                        </groupId>
+                                        <artifactId>
+                                            exec-maven-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [1.4.0,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>exec</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+</project>
diff --git a/themes/src/main/themes/VAADIN/themes/base/absolutelayout/absolutelayout.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/absolutelayout/absolutelayout.scss
index 4f007de9af..4f007de9af 100644
--- a/themes/src/main/themes/VAADIN/themes/base/absolutelayout/absolutelayout.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/absolutelayout/absolutelayout.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/accordion/accordion.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/accordion/accordion.scss
index a8def37d3b..a8def37d3b 100644
--- a/themes/src/main/themes/VAADIN/themes/base/accordion/accordion.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/accordion/accordion.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/base.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/base.scss
index 001d00be49..001d00be49 100644
--- a/themes/src/main/themes/VAADIN/themes/base/base.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/base.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/browserframe/browserframe.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/browserframe/browserframe.scss
index fce9c11513..fce9c11513 100644
--- a/themes/src/main/themes/VAADIN/themes/base/browserframe/browserframe.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/browserframe/browserframe.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/button/button.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/button/button.scss
index 694e49a359..694e49a359 100644
--- a/themes/src/main/themes/VAADIN/themes/base/button/button.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/button/button.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/button/checkbox.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/button/checkbox.scss
index e46d236035..e46d236035 100644
--- a/themes/src/main/themes/VAADIN/themes/base/button/checkbox.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/button/checkbox.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/button/nativebutton.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/button/nativebutton.scss
index f85bd507ab..f85bd507ab 100644
--- a/themes/src/main/themes/VAADIN/themes/base/button/nativebutton.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/button/nativebutton.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/calendar/calendar.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/calendar/calendar.scss
index 8ff97df0f9..8ff97df0f9 100644
--- a/themes/src/main/themes/VAADIN/themes/base/calendar/calendar.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/calendar/calendar.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/calendar/img/arrows.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/calendar/img/arrows.png
index 9905c0b065..9905c0b065 100644
--- a/themes/src/main/themes/VAADIN/themes/base/calendar/img/arrows.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/calendar/img/arrows.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/caption/caption.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/caption/caption.scss
index ec87f71999..ec87f71999 100644
--- a/themes/src/main/themes/VAADIN/themes/base/caption/caption.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/caption/caption.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/colorpicker/colorpicker.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/colorpicker/colorpicker.scss
index 70705dcee3..70705dcee3 100644
--- a/themes/src/main/themes/VAADIN/themes/base/colorpicker/colorpicker.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/colorpicker/colorpicker.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/gradient.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/colorpicker/images/gradient.png
index def063a8ab..def063a8ab 100644
--- a/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/gradient.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/colorpicker/images/gradient.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/gradient2.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/colorpicker/images/gradient2.png
index f51ed752a7..f51ed752a7 100644
--- a/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/gradient2.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/colorpicker/images/gradient2.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/resizebg-selected.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/colorpicker/images/resizebg-selected.png
index 6e56ec0cc7..6e56ec0cc7 100644
--- a/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/resizebg-selected.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/colorpicker/images/resizebg-selected.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/resizebg.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/colorpicker/images/resizebg.png
index b6e3532713..b6e3532713 100644
--- a/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/resizebg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/colorpicker/images/resizebg.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/slider_hue_bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/colorpicker/images/slider_hue_bg.png
index bcef2c5575..bcef2c5575 100644
--- a/themes/src/main/themes/VAADIN/themes/base/colorpicker/images/slider_hue_bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/colorpicker/images/slider_hue_bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/common/common.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/common.scss
index ae811bac79..ae811bac79 100644
--- a/themes/src/main/themes/VAADIN/themes/base/common/common.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/common.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader-big.gif b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader-big.gif
index 73dc88e31f..73dc88e31f 100644
--- a/themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader-big.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader-big.gif
diff --git a/themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader-medium.gif b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader-medium.gif
index 0a0c6aaef0..0a0c6aaef0 100644
--- a/themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader-medium.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader-medium.gif
diff --git a/themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader.gif b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader.gif
index 354dc4685c..354dc4685c 100644
--- a/themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/ajax-loader.gif
diff --git a/themes/src/main/themes/VAADIN/themes/base/common/img/drag-slot-dot.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/drag-slot-dot.png
index f8abcf7e21..f8abcf7e21 100644
--- a/themes/src/main/themes/VAADIN/themes/base/common/img/drag-slot-dot.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/drag-slot-dot.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator-delay.gif b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator-delay.gif
index 831526849e..831526849e 100644
--- a/themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator-delay.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator-delay.gif
diff --git a/themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator-wait.gif b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator-wait.gif
index b10a0720b5..b10a0720b5 100644
--- a/themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator-wait.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator-wait.gif
diff --git a/themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator.gif b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator.gif
index 3fae1b8a6b..3fae1b8a6b 100644
--- a/themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/loading-indicator.gif
diff --git a/themes/src/main/themes/VAADIN/themes/base/common/img/reconnect-spinner.gif b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/reconnect-spinner.gif
index bc1a496d11..bc1a496d11 100644
--- a/themes/src/main/themes/VAADIN/themes/base/common/img/reconnect-spinner.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/reconnect-spinner.gif
diff --git a/themes/src/main/themes/VAADIN/themes/base/common/img/sprites.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/sprites.png
index c5d2e89b97..c5d2e89b97 100644
--- a/themes/src/main/themes/VAADIN/themes/base/common/img/sprites.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/img/sprites.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/common/mixins.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/mixins.scss
index fab97e9565..fab97e9565 100644
--- a/themes/src/main/themes/VAADIN/themes/base/common/mixins.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/mixins.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/common/reconnect-dialog.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/reconnect-dialog.scss
index 15b78800d0..15b78800d0 100644
--- a/themes/src/main/themes/VAADIN/themes/base/common/reconnect-dialog.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/common/reconnect-dialog.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/csslayout/csslayout.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/csslayout/csslayout.scss
index d6df771b85..d6df771b85 100644
--- a/themes/src/main/themes/VAADIN/themes/base/csslayout/csslayout.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/csslayout/csslayout.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/customcomponent/customcomponent.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/customcomponent/customcomponent.scss
index d672254a86..d672254a86 100644
--- a/themes/src/main/themes/VAADIN/themes/base/customcomponent/customcomponent.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/customcomponent/customcomponent.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/customlayout/customlayout.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/customlayout/customlayout.scss
index c8a13da4e9..c8a13da4e9 100644
--- a/themes/src/main/themes/VAADIN/themes/base/customlayout/customlayout.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/customlayout/customlayout.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/datefield/datefield.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/datefield/datefield.scss
index 480f2e56d1..480f2e56d1 100644
--- a/themes/src/main/themes/VAADIN/themes/base/datefield/datefield.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/datefield/datefield.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/dragwrapper/dragwrapper.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/dragwrapper/dragwrapper.scss
index 86000abd7c..86000abd7c 100644
--- a/themes/src/main/themes/VAADIN/themes/base/dragwrapper/dragwrapper.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/dragwrapper/dragwrapper.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/embedded/embedded.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/embedded/embedded.scss
index abb5e7956f..abb5e7956f 100644
--- a/themes/src/main/themes/VAADIN/themes/base/embedded/embedded.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/embedded/embedded.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/escalator/escalator.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/escalator/escalator.scss
index 1abf754584..1abf754584 100644
--- a/themes/src/main/themes/VAADIN/themes/base/escalator/escalator.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/escalator/escalator.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/favicon.ico b/compatibility-themes/src/main/themes/VAADIN/themes/base/favicon.ico
index 1f81f0de76..1f81f0de76 100644
--- a/themes/src/main/themes/VAADIN/themes/base/favicon.ico
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/favicon.ico
diff --git a/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.eot b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.eot
index 9b6afaedc0..9b6afaedc0 100755
--- a/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.eot
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.eot
diff --git a/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.svg b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.svg
index d05688e9e2..d05688e9e2 100755
--- a/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.svg
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.svg
diff --git a/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.ttf b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.ttf
index 26dea7951a..26dea7951a 100755
--- a/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.ttf
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.ttf
diff --git a/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.woff b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.woff
index dc35ce3c2c..dc35ce3c2c 100755
--- a/themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.woff
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/fontawesome-webfont.woff
diff --git a/themes/src/main/themes/VAADIN/themes/base/fonts/fonts.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/fonts.scss
index 1f5c0cf6a2..1f5c0cf6a2 100644
--- a/themes/src/main/themes/VAADIN/themes/base/fonts/fonts.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/fonts.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.eot b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.eot
index 9cc04785e2..9cc04785e2 100644
--- a/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.eot
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.eot
diff --git a/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.svg b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.svg
index 59685c3b3a..59685c3b3a 100644
--- a/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.svg
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.svg
diff --git a/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.ttf b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.ttf
index 1b7dd4a6ad..1b7dd4a6ad 100644
--- a/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.ttf
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.ttf
diff --git a/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.woff b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.woff
index 7d055f6dd0..7d055f6dd0 100644
--- a/themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.woff
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/fonts/themeicons-webfont.woff
diff --git a/themes/src/main/themes/VAADIN/themes/base/formlayout/formlayout.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/formlayout/formlayout.scss
index 2e2a3213f9..2e2a3213f9 100644
--- a/themes/src/main/themes/VAADIN/themes/base/formlayout/formlayout.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/formlayout/formlayout.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/grid/grid.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/grid/grid.scss
index fdbf2a0cf5..fdbf2a0cf5 100644
--- a/themes/src/main/themes/VAADIN/themes/base/grid/grid.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/grid/grid.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/gridlayout/gridlayout.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/gridlayout/gridlayout.scss
index 54a2e8667c..54a2e8667c 100644
--- a/themes/src/main/themes/VAADIN/themes/base/gridlayout/gridlayout.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/gridlayout/gridlayout.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/inlinedatefield/inlinedatefield.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/inlinedatefield/inlinedatefield.scss
index 06a24125c2..06a24125c2 100644
--- a/themes/src/main/themes/VAADIN/themes/base/inlinedatefield/inlinedatefield.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/inlinedatefield/inlinedatefield.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/label/label.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/label/label.scss
index 3c72796828..3c72796828 100644
--- a/themes/src/main/themes/VAADIN/themes/base/label/label.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/label/label.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/layout/layout.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/layout/layout.scss
index fe3fcd17ed..fe3fcd17ed 100644
--- a/themes/src/main/themes/VAADIN/themes/base/layout/layout.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/layout/layout.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/legacy-styles.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/legacy-styles.scss
index 188fc85d46..188fc85d46 100644
--- a/themes/src/main/themes/VAADIN/themes/base/legacy-styles.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/legacy-styles.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/link/link.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/link/link.scss
index bff6fbd5fe..bff6fbd5fe 100644
--- a/themes/src/main/themes/VAADIN/themes/base/link/link.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/link/link.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/loginform/loginform.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/loginform/loginform.scss
index 48fabbf793..48fabbf793 100644
--- a/themes/src/main/themes/VAADIN/themes/base/loginform/loginform.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/loginform/loginform.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/menubar/img/check.gif b/compatibility-themes/src/main/themes/VAADIN/themes/base/menubar/img/check.gif
index 0a89195168..0a89195168 100644
--- a/themes/src/main/themes/VAADIN/themes/base/menubar/img/check.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/menubar/img/check.gif
diff --git a/themes/src/main/themes/VAADIN/themes/base/menubar/menubar.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/menubar/menubar.scss
index 1017e38992..1017e38992 100644
--- a/themes/src/main/themes/VAADIN/themes/base/menubar/menubar.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/menubar/menubar.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/notification/notification.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/notification/notification.scss
index 5deb7e0e84..5deb7e0e84 100644
--- a/themes/src/main/themes/VAADIN/themes/base/notification/notification.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/notification/notification.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/orderedlayout/orderedlayout.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/orderedlayout/orderedlayout.scss
index 7820d842fc..7820d842fc 100644
--- a/themes/src/main/themes/VAADIN/themes/base/orderedlayout/orderedlayout.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/orderedlayout/orderedlayout.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/panel/panel.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/panel/panel.scss
index 16fadfa15d..16fadfa15d 100644
--- a/themes/src/main/themes/VAADIN/themes/base/panel/panel.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/panel/panel.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/popupview/popupview.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/popupview/popupview.scss
index cafcf9b720..cafcf9b720 100644
--- a/themes/src/main/themes/VAADIN/themes/base/popupview/popupview.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/popupview/popupview.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/progressindicator/progressindicator.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/progressindicator/progressindicator.scss
index 0065cf3d07..0065cf3d07 100644
--- a/themes/src/main/themes/VAADIN/themes/base/progressindicator/progressindicator.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/progressindicator/progressindicator.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/select/select.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/select/select.scss
index fc097405b7..fc097405b7 100644
--- a/themes/src/main/themes/VAADIN/themes/base/select/select.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/select/select.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/slider/slider.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/slider/slider.scss
index 60047bc6db..60047bc6db 100644
--- a/themes/src/main/themes/VAADIN/themes/base/slider/slider.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/slider/slider.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/splitpanel/splitpanel.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/splitpanel/splitpanel.scss
index 968894d92d..968894d92d 100644
--- a/themes/src/main/themes/VAADIN/themes/base/splitpanel/splitpanel.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/splitpanel/splitpanel.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/styles.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/styles.scss
index 1b6942944b..1b6942944b 100644
--- a/themes/src/main/themes/VAADIN/themes/base/styles.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/styles.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/table/table.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/table/table.scss
index 22ffdffa4d..22ffdffa4d 100644
--- a/themes/src/main/themes/VAADIN/themes/base/table/table.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/table/table.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/tabsheet/tabsheet.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/tabsheet/tabsheet.scss
index 14def56ab5..14def56ab5 100644
--- a/themes/src/main/themes/VAADIN/themes/base/tabsheet/tabsheet.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/tabsheet/tabsheet.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/textfield/img/richtext-toolbar-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/textfield/img/richtext-toolbar-bg.png
index e92be23e51..e92be23e51 100644
--- a/themes/src/main/themes/VAADIN/themes/base/textfield/img/richtext-toolbar-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/textfield/img/richtext-toolbar-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/textfield/textfield.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/textfield/textfield.scss
index 5c05228ad8..5c05228ad8 100644
--- a/themes/src/main/themes/VAADIN/themes/base/textfield/textfield.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/textfield/textfield.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-collapse-last.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-collapse-last.png
index c03e0839b5..c03e0839b5 100644
--- a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-collapse-last.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-collapse-last.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-collapse.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-collapse.png
index 577a7c9de6..577a7c9de6 100644
--- a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-collapse.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-collapse.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-expand-last.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-expand-last.png
index 3a578681de..3a578681de 100644
--- a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-expand-last.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-expand-last.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-expand.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-expand.png
index f3548875fa..f3548875fa 100644
--- a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-expand.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-expand.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-item-last.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-item-last.png
index 2eb04a32fd..2eb04a32fd 100644
--- a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-item-last.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-item-last.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-item.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-item.png
index 5f88fe1bef..5f88fe1bef 100644
--- a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-item.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-item.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-leaf-last.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-leaf-last.png
index 15a255088a..15a255088a 100644
--- a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-leaf-last.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-leaf-last.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-leaf.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-leaf.png
index 282839bb95..282839bb95 100644
--- a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector-leaf.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector-leaf.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector.png
index 4f0327204e..4f0327204e 100644
--- a/themes/src/main/themes/VAADIN/themes/base/tree/img/connector.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/img/connector.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/tree/tree.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/tree.scss
index ace6d7d2f2..ace6d7d2f2 100644
--- a/themes/src/main/themes/VAADIN/themes/base/tree/tree.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/tree/tree.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-down.gif b/compatibility-themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-down.gif
index ad599674a1..ad599674a1 100644
--- a/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-down.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-down.gif
diff --git a/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-down.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-down.png
index cba812b799..cba812b799 100644
--- a/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-down.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-down.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-right.gif b/compatibility-themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-right.gif
index cbe21ac7c0..cbe21ac7c0 100644
--- a/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-right.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-right.gif
diff --git a/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-right.png
index 7fe6e2b59f..7fe6e2b59f 100644
--- a/themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/treetable/img/arrow-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/base/treetable/treetable.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/treetable/treetable.scss
index e4d41eefa8..e4d41eefa8 100644
--- a/themes/src/main/themes/VAADIN/themes/base/treetable/treetable.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/treetable/treetable.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/upload/upload.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/upload/upload.scss
index f8e707446c..f8e707446c 100644
--- a/themes/src/main/themes/VAADIN/themes/base/upload/upload.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/upload/upload.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/widget/widget.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/widget/widget.scss
index e4f660003c..e4f660003c 100644
--- a/themes/src/main/themes/VAADIN/themes/base/widget/widget.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/widget/widget.scss
diff --git a/themes/src/main/themes/VAADIN/themes/base/window/window.scss b/compatibility-themes/src/main/themes/VAADIN/themes/base/window/window.scss
index a0f68e2523..a0f68e2523 100644
--- a/themes/src/main/themes/VAADIN/themes/base/window/window.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/base/window/window.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/chameleon.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/chameleon.scss
index b315678308..b315678308 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/chameleon.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/chameleon.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/common/common.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/common/common.scss
index 86b65f70fb..86b65f70fb 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/common/common.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/common/common.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/accordion/accordion.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/accordion/accordion.scss
index 2fe0307fe0..2fe0307fe0 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/accordion/accordion.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/accordion/accordion.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/button/button.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/button/button.scss
index a5bb4d44fa..a5bb4d44fa 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/button/button.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/button/button.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/colorpicker/colorpicker.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/colorpicker/colorpicker.scss
index 98f00f0626..98f00f0626 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/colorpicker/colorpicker.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/colorpicker/colorpicker.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/components.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/components.scss
index 578ea23bf3..578ea23bf3 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/components.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/components.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/datefield/datefield.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/datefield/datefield.scss
index 2947a71896..2947a71896 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/datefield/datefield.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/datefield/datefield.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/grid/grid.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/grid/grid.scss
index 5007ad6619..5007ad6619 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/grid/grid.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/grid/grid.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/inlinedatefield/inlinedatefield.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/inlinedatefield/inlinedatefield.scss
index deceee19be..deceee19be 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/inlinedatefield/inlinedatefield.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/inlinedatefield/inlinedatefield.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/label/label.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/label/label.scss
index 5afcbd584a..5afcbd584a 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/label/label.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/label/label.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/menubar/menubar.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/menubar/menubar.scss
index 0db478855d..0db478855d 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/menubar/menubar.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/menubar/menubar.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/notification/notification.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/notification/notification.scss
index a1454ccfad..a1454ccfad 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/notification/notification.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/notification/notification.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/panel/panel.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/panel/panel.scss
index bae827b484..bae827b484 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/panel/panel.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/panel/panel.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/popupview/popupview.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/popupview/popupview.scss
index 978ca56391..978ca56391 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/popupview/popupview.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/popupview/popupview.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/progressindicator/progressindicator.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/progressindicator/progressindicator.scss
index 56eb2cc6c9..56eb2cc6c9 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/progressindicator/progressindicator.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/progressindicator/progressindicator.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/selects/selects.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/selects/selects.scss
index fc51e8a779..fc51e8a779 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/selects/selects.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/selects/selects.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/slider/slider.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/slider/slider.scss
index 30c5eb85cb..30c5eb85cb 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/slider/slider.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/slider/slider.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss
index 2496be6513..2496be6513 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/splitpanel/splitpanel.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/table/table.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/table/table.scss
index f224e898f1..f224e898f1 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/table/table.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/table/table.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss
index d7f968fe43..d7f968fe43 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/tabsheet/tabsheet.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/textfield/textfield.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/textfield/textfield.scss
index dc6500781a..dc6500781a 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/textfield/textfield.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/textfield/textfield.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/tree/tree.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/tree/tree.scss
index 9b33cd0155..9b33cd0155 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/tree/tree.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/tree/tree.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/components/window/window.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/window/window.scss
index 16de81a785..16de81a785 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/components/window/window.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/components/window/window.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/compound/compound.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/compound/compound.scss
index 43a8717dbb..43a8717dbb 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/compound/compound.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/compound/compound.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/favicon.ico b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/favicon.ico
index 1f81f0de76..1f81f0de76 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/favicon.ico
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/favicon.ico
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/icons/bullet-white.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/icons/bullet-white.png
index f0a0b1bfba..f0a0b1bfba 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/icons/bullet-white.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/icons/bullet-white.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/icons/bullet.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/icons/bullet.png
index 5047f6b27c..5047f6b27c 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/icons/bullet.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/icons/bullet.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/app-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/app-bg.png
index 0eb0022781..0eb0022781 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/app-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/app-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/close-btn.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/close-btn.png
index a1337676e1..a1337676e1 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/close-btn.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/close-btn.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/date-btn-big.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/date-btn-big.png
index d4562a1368..d4562a1368 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/date-btn-big.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/date-btn-big.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/date-btn.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/date-btn.png
index 522a77539e..522a77539e 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/date-btn.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/date-btn.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/error-close.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/error-close.png
index 587a680604..587a680604 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/error-close.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/error-close.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/error-indicator.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/error-indicator.png
index ab7b4bb2f0..ab7b4bb2f0 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/error-indicator.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/error-indicator.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-bottom.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-bottom.png
index 3d86693c5f..3d86693c5f 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-bottom.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-bottom.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-bottom2.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-bottom2.png
index 1bf7a557ef..1bf7a557ef 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-bottom2.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-bottom2.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-top2.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-top2.png
index 8509f462e0..8509f462e0 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-top2.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/grad-dark-top2.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-left.png
index a6965e4772..a6965e4772 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-top.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-top.png
index d9479f195e..d9479f195e 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-top.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-top.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-top2.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-top2.png
index 51ec5e60b3..51ec5e60b3 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-top2.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/grad-light-top2.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/indeterminate-progress.gif b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/indeterminate-progress.gif
index 46136f0339..46136f0339 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/indeterminate-progress.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/indeterminate-progress.gif
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/input-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/input-bg.png
index 08b67dd7bd..08b67dd7bd 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/input-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/input-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/label-error-icon-big.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/label-error-icon-big.png
index 6de95c9595..6de95c9595 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/label-error-icon-big.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/label-error-icon-big.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/label-error-icon.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/label-error-icon.png
index 8802ac417c..8802ac417c 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/label-error-icon.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/label-error-icon.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/label-warning-icon-big.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/label-warning-icon-big.png
index e6bb96cbdd..e6bb96cbdd 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/label-warning-icon-big.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/label-warning-icon-big.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/label-warning-icon.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/label-warning-icon.png
index 67886c067c..67886c067c 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/label-warning-icon.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/label-warning-icon.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/magnifier-big.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/magnifier-big.png
index 19d662fe7c..19d662fe7c 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/magnifier-big.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/magnifier-big.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/magnifier.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/magnifier.png
index 3fed5eeaab..3fed5eeaab 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/magnifier.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/magnifier.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/maximize.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/maximize.png
index 5c6488d1a5..5c6488d1a5 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/maximize.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/maximize.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/resize.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/resize.png
index 86ae55eced..86ae55eced 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/resize.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/resize.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/restore.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/restore.png
index 55d004fe53..55d004fe53 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/restore.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/restore.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/split-handle.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/split-handle.png
index 01085cdd4d..01085cdd4d 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/split-handle.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/split-handle.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/img/tab-arrows.png b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/tab-arrows.png
index 8a16d80e55..8a16d80e55 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/img/tab-arrows.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/img/tab-arrows.png
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/legacy-styles.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/legacy-styles.scss
index 843f81475c..843f81475c 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/legacy-styles.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/legacy-styles.scss
diff --git a/themes/src/main/themes/VAADIN/themes/chameleon/styles.scss b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/styles.scss
index 0c55a57239..0c55a57239 100644
--- a/themes/src/main/themes/VAADIN/themes/chameleon/styles.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/chameleon/styles.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.scss
index ffa7ca349a..ffa7ca349a 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/a-sprite-definitions/a-sprite-definitions.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/accordion/accordion.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/accordion/accordion.scss
index cd2ca4b21d..cd2ca4b21d 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/accordion/accordion.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/accordion/accordion.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/button-link-style.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/button-link-style.scss
index 2064cb1650..2064cb1650 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/button-link-style.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/button-link-style.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/button-primary-style.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/button-primary-style.scss
index 238a694e28..238a694e28 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/button-primary-style.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/button-primary-style.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/button-small-style.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/button-small-style.scss
index 5c9e8a32bb..5c9e8a32bb 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/button-small-style.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/button-small-style.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/button-standard.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/button-standard.scss
index 632340f228..632340f228 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/button-standard.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/button-standard.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/button.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/button.scss
index 2fd34ef2c8..2fd34ef2c8 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/button.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/button.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left-focus.png
index 4361800079..4361800079 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left-pressed.png
index ab0d245b15..ab0d245b15 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left.png
index e77900abc5..e77900abc5 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/left.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left-focus.png
index 47bfc36a5b..47bfc36a5b 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left-pressed.png
index d20fa467f8..d20fa467f8 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left.png
index e05e8cf8ae..e05e8cf8ae 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right-focus.png
index ecc06c52ab..ecc06c52ab 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right-pressed.png
index b71eecc3d8..b71eecc3d8 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right.png
index 94d5e93f85..94d5e93f85 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/primary-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right-focus.png
index 43e6edb2b9..43e6edb2b9 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right-pressed.png
index 2612f6869d..2612f6869d 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right.png
index bfeafb779e..bfeafb779e 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/right.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left-focus.png
index 55e76701b8..55e76701b8 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left-pressed.png
index 01eea1ea58..01eea1ea58 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left.png
index 28aca63243..28aca63243 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right-focus.png
index 4415262cb6..4415262cb6 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right-pressed.png
index 7095241499..7095241499 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right.png
index 1be4b2c327..1be4b2c327 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/black/small-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/left-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/left-focus.png
index 636cf840c3..636cf840c3 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/left-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/left-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/left-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/left-pressed.png
index e70f56b84b..e70f56b84b 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/left-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/left-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/left.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/left.png
index c4209e8119..c4209e8119 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/left.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left-focus.png
index 7952ae5022..7952ae5022 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left-pressed.png
index 7ff5296025..7ff5296025 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left.png
index abb6bcc5af..abb6bcc5af 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right-focus.png
index 7b7ae32d84..7b7ae32d84 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right-pressed.png
index dbcc59c906..dbcc59c906 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right.png
index a600b84c34..a600b84c34 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/primary-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/right-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/right-focus.png
index fa59dfefa3..fa59dfefa3 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/right-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/right-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/right-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/right-pressed.png
index 2cbe6c010f..2cbe6c010f 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/right-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/right-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/right.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/right.png
index af80f785e8..af80f785e8 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/right.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left-focus.png
index 96408f225f..96408f225f 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left-pressed.png
index 90f0d5cbef..90f0d5cbef 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left.png
index 4efaa98ac2..4efaa98ac2 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right-focus.png
index 03c4c92e68..03c4c92e68 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right-pressed.png
index 90a22c8b8b..90a22c8b8b 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right.png
index 96f11915c1..96f11915c1 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/img/small-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/button/nativebutton.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/nativebutton.scss
index 5d13f3b56e..5d13f3b56e 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/button/nativebutton.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/button/nativebutton.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/colorpicker/colorpicker.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/colorpicker/colorpicker.scss
index 4224691d12..4224691d12 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/colorpicker/colorpicker.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/colorpicker/colorpicker.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/common/common.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/common/common.scss
index 5e85cb09bc..5e85cb09bc 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/common/common.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/common/common.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/common/icons/bullet-white.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/common/icons/bullet-white.png
index f0a0b1bfba..f0a0b1bfba 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/common/icons/bullet-white.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/common/icons/bullet-white.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/common/icons/bullet.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/common/icons/bullet.png
index 5047f6b27c..5047f6b27c 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/common/icons/bullet.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/common/icons/bullet.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/common/icons/error.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/common/icons/error.png
index 14200fcfda..14200fcfda 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/common/icons/error.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/common/icons/error.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/common/img/sel-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/common/img/sel-bg.png
index 272db0e9f5..272db0e9f5 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/common/img/sel-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/common/img/sel-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/datefield.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/datefield.scss
index d486316419..d486316419 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/datefield.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/datefield.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-black-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-black-pressed.png
index 4da33f2113..4da33f2113 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-black-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-black-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-black.png
index 94517547c0..94517547c0 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-pressed.png
index 48a3bc8ff5..48a3bc8ff5 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg.png
index f033b5316d..f033b5316d 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/header-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-black-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-black-pressed.png
index f4c54cd177..f4c54cd177 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-black-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-black-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-black.png
index 37001e2794..37001e2794 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-pressed.png
index 22393c7973..22393c7973 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next.png
index 50732c44ad..50732c44ad 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-next.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-black-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-black-pressed.png
index d57ed56a45..d57ed56a45 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-black-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-black-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-black.png
index 2d525f5751..2d525f5751 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-pressed.png
index ad39a9ae22..ad39a9ae22 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev.png
index 19bb013151..19bb013151 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/month-prev.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-black-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-black-pressed.png
index 393b1c5d5f..393b1c5d5f 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-black-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-black-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-black.png
index 927fba5b31..927fba5b31 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-pressed.png
index 26f237ba0b..26f237ba0b 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn.png
index e51b1f0602..e51b1f0602 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/popup-btn.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-bg-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-bg-black.png
index f64cdafd5c..f64cdafd5c 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-bg-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-bg-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-bg.png
index 19fd2b4288..19fd2b4288 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-first-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-first-black.png
index ff6ee7ba1b..ff6ee7ba1b 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-first-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-first-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-first.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-first.png
index f77ed233ae..f77ed233ae 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-first.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-first.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-last-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-last-black.png
index 984d2c2129..984d2c2129 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-last-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-last-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-last.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-last.png
index 500dc8bdaa..500dc8bdaa 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-last.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/weekday-last.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-black-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-black-pressed.png
index 038f46149b..038f46149b 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-black-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-black-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-black.png
index 45c762fbcd..45c762fbcd 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-pressed.png
index 60b57c370b..60b57c370b 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next.png
index bb015ef73d..bb015ef73d 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-next.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-black-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-black-pressed.png
index 3df767e493..3df767e493 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-black-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-black-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-black.png
index 05b7178722..05b7178722 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-pressed.png
index c760d022e8..c760d022e8 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev.png
index 3cd62e4e95..3cd62e4e95 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/datefield/img/year-prev.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/favicon.ico b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/favicon.ico
index 1f81f0de76..1f81f0de76 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/favicon.ico
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/favicon.ico
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/formlayout/formlayout.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/formlayout/formlayout.scss
index 7f8871fdac..7f8871fdac 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/formlayout/formlayout.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/formlayout/formlayout.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/grid/grid.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/grid.scss
index 05b93c1259..05b93c1259 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/grid/grid.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/grid.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/asc-light.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/img/asc-light.png
index 44ed76001a..44ed76001a 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/asc-light.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/img/asc-light.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/desc-light.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/img/desc-light.png
index 84d15a0628..84d15a0628 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/desc-light.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/img/desc-light.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-bg-light.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-bg-light.png
index 20b34474c7..20b34474c7 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-bg-light.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-bg-light.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-header-bg-light.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-header-bg-light.png
index 4e83df03cb..4e83df03cb 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-header-bg-light.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-header-bg-light.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-sel-bg-light.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-sel-bg-light.png
index 249fd5917c..249fd5917c 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-sel-bg-light.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/img/focus-sel-bg-light.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/header-bg-light.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/img/header-bg-light.png
index 0b913e2ef1..0b913e2ef1 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/grid/img/header-bg-light.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/grid/img/header-bg-light.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/inlinedatefield/inlinedatefield.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/inlinedatefield/inlinedatefield.scss
index 8ad3c1a012..8ad3c1a012 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/inlinedatefield/inlinedatefield.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/inlinedatefield/inlinedatefield.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/label/label.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/label/label.scss
index b18eb7432f..b18eb7432f 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/label/label.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/label/label.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/layouts/img/black-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/layouts/img/black-bg.png
index f2e0ac0537..f2e0ac0537 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/layouts/img/black-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/layouts/img/black-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/layouts/layouts.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/layouts/layouts.scss
index 0b0b311daa..0b0b311daa 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/layouts/layouts.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/layouts/layouts.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/legacy-styles.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/legacy-styles.scss
index 6c59b887d8..6c59b887d8 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/legacy-styles.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/legacy-styles.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/link/link.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/link/link.scss
index f1d2a31d83..f1d2a31d83 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/link/link.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/link/link.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/bg.png
index 0ce20b9aca..0ce20b9aca 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/checked-selected.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/checked-selected.png
index 192c404617..192c404617 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/checked-selected.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/checked-selected.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/checked.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/checked.png
index 418e951166..418e951166 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/checked.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/checked.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/menu-sel-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/menu-sel-bg.png
index d61d9ad6df..d61d9ad6df 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/menu-sel-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/menu-sel-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/submenu-icon-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/submenu-icon-hover.png
index dcf5e1ac55..dcf5e1ac55 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/submenu-icon-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/submenu-icon-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/submenu-icon.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/submenu-icon.png
index 4dc376b78e..4dc376b78e 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/submenu-icon.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/submenu-icon.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png
index bac6587c20..bac6587c20 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/unchecked.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/unchecked.png
index 92a2b582c5..92a2b582c5 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/unchecked.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/img/unchecked.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/menubar.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/menubar.scss
index 0b1672dab1..0b1672dab1 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/menubar/menubar.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/menubar/menubar.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/notification/img/error-close.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/notification/img/error-close.png
index 2ce85b628a..2ce85b628a 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/notification/img/error-close.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/notification/img/error-close.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/notification/notification.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/notification/notification.scss
index 7aed10d46c..7aed10d46c 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/notification/notification.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/notification/notification.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/panel/panel.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/panel/panel.scss
index 2499c8c4ab..2499c8c4ab 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/panel/panel.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/panel/panel.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/popupview/popupview.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/popupview/popupview.scss
index a6e7ad9843..a6e7ad9843 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/popupview/popupview.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/popupview/popupview.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/base-static.gif b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/base-static.gif
index 474b684196..474b684196 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/base-static.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/base-static.gif
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/base.gif b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/base.gif
index 6c6f15ef9e..6c6f15ef9e 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/base.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/base.gif
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/disabled.gif b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/disabled.gif
index 7a64d034b2..7a64d034b2 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/disabled.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/disabled.gif
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/progress.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/progress.png
index 4a9803308c..4a9803308c 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/progress.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/img/progress.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/progressindicator.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/progressindicator.scss
index 2417202828..2417202828 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/progressindicator.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/progressindicator/progressindicator.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/reindeer.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/reindeer.scss
index c5d88f4a02..c5d88f4a02 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/reindeer.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/reindeer.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-down-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-down-hover.png
index 2061e31bee..2061e31bee 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-down-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-down-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-down.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-down.png
index 6fba8ab906..6fba8ab906 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-down.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-down.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-up-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-up-hover.png
index a2d3ea6706..a2d3ea6706 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-up-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-up-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-up.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-up.png
index 3c9b52c9fc..3c9b52c9fc 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-up.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/arrow-up.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/center-black-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/center-black-focus.png
index 1d47349076..1d47349076 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/center-black-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/center-black-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/center-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/center-black.png
index a5cfcebf3b..a5cfcebf3b 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/center-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/center-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/left-black-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/left-black-focus.png
index 720c310c35..720c310c35 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/left-black-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/left-black-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/left-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/left-black.png
index 9908a79990..9908a79990 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/left-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/left-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus-hover.png
index 2f98d641d2..2f98d641d2 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus-pressed.png
index 5a8012b861..5a8012b861 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus.png
index a5c88ed7cb..a5c88ed7cb 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-hover.png
index 8113640f15..8113640f15 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-pressed.png
index ef5ee44451..ef5ee44451 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black.png
index 1bd04abb46..1bd04abb46 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/black/right-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/center-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/center-focus.png
index e236f2a24d..e236f2a24d 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/center-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/center-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/center.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/center.png
index fae6766cce..fae6766cce 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/center.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/center.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/left-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/left-focus.png
index 528d53203b..528d53203b 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/left-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/left-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/left.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/left.png
index e4179a0078..e4179a0078 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/left.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-down-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-down-hover.png
index 5479c21ee9..5479c21ee9 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-down-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-down-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-down-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-down-pressed.png
index 8d621bd96e..8d621bd96e 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-down-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-down-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-up-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-up-hover.png
index ba08d141fd..ba08d141fd 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-up-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-up-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-up-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-up-pressed.png
index 08c044abc6..08c044abc6 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-up-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/page-up-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus-hover.png
index 9b8ddc7676..9b8ddc7676 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus-pressed.png
index 9c7b6dc0ac..9c7b6dc0ac 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus.png
index 127c3e03d2..127c3e03d2 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-hover.png
index 5d1c8f8153..5d1c8f8153 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-pressed.png
index f9450d2d43..f9450d2d43 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/right-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/right.png
index d341745cce..d341745cce 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/right.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/status-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/status-bg.png
index c93bfeb350..c93bfeb350 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/img/status-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/img/status-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/select/select.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/select.scss
index 818c33b460..818c33b460 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/select/select.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/select/select.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/slider/img/knob-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/slider/img/knob-pressed.png
index d5afcb71a0..d5afcb71a0 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/slider/img/knob-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/slider/img/knob-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/slider/img/knob.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/slider/img/knob.png
index 897d45b415..897d45b415 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/slider/img/knob.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/slider/img/knob.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/slider/slider.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/slider/slider.scss
index ed286d7c68..ed286d7c68 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/slider/slider.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/slider/slider.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/hor-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/hor-bg.png
index 4ce1cabffc..4ce1cabffc 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/hor-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/hor-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/hor-handle.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/hor-handle.png
index 50645f41f1..50645f41f1 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/hor-handle.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/hor-handle.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/ver-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/ver-bg.png
index 1e6968dd1c..1e6968dd1c 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/ver-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/ver-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/ver-handle.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/ver-handle.png
index bf5ca89ca5..bf5ca89ca5 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/ver-handle.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/img/ver-handle.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/splitpanel.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/splitpanel.scss
index 2e612e2e21..2e612e2e21 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/splitpanel.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/splitpanel/splitpanel.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/styles.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/styles.scss
index 89ddb29341..89ddb29341 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/styles.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/styles.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/asc-light.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/asc-light.png
index 44ed76001a..44ed76001a 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/asc-light.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/asc-light.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/asc.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/asc.png
index 050d6c715b..050d6c715b 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/asc.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/asc.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-black-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-black-pressed.png
index 69ed19c41f..69ed19c41f 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-black-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-black-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-black.png
index 6cf004991d..6cf004991d 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-light-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-light-pressed.png
index 02afc74e14..02afc74e14 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-light-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-light-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-light.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-light.png
index 7b15cb5605..7b15cb5605 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-light.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-light.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-pressed.png
index 774248c447..774248c447 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel.png
index 3a2a0b3f44..3a2a0b3f44 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/col-sel.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/desc-light.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/desc-light.png
index 84d15a0628..84d15a0628 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/desc-light.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/desc-light.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/desc.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/desc.png
index c3edfa25b9..c3edfa25b9 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/desc.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/desc.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg-black.png
index 1ccbca7168..1ccbca7168 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg-light.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg-light.png
index 0b913e2ef1..0b913e2ef1 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg-light.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg-light.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg.png
index a6b897199a..a6b897199a 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/header-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/scroll-indic-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/scroll-indic-bg.png
index 060eadee5f..060eadee5f 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/img/scroll-indic-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/img/scroll-indic-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/table/table.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/table.scss
index 5896bef014..5896bef014 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/table/table.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/table/table.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg-sel.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg-sel.png
index 3c6b3a8efb..3c6b3a8efb 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg-sel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg-sel.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg.png
index 033e1cbd6d..033e1cbd6d 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left-sel.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left-sel.png
index 30188fb070..30188fb070 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left-sel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left-sel.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left.png
index 207a0a9040..207a0a9040 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-first-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left-sel.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left-sel.png
index 5aa0df6736..5aa0df6736 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left-sel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left-sel.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left.png
index 78a0bd6ff6..78a0bd6ff6 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right-sel.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right-sel.png
index acb8aceacf..acb8aceacf 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right-sel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right-sel.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right.png
index 7aedf4c443..7aedf4c443 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/bar/tab-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-hover.png
index f548db838a..f548db838a 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-pressed.png
index a39a4431b3..a39a4431b3 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-hover.png
index 31a0d1f3f5..31a0d1f3f5 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-pressed.png
index 9aae58c427..9aae58c427 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel.png
index e0cd398707..e0cd398707 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn-sel.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn.png
index 9407f7b82c..9407f7b82c 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/close-btn.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg-sel.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg-sel.png
index 69cb79bb07..69cb79bb07 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg-sel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg-sel.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg.png
index ba6ce2d1f6..ba6ce2d1f6 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left-sel.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left-sel.png
index 39e2eb907d..39e2eb907d 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left-sel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left-sel.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left.png
index 5da4f354a7..5da4f354a7 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-first-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left-sel.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left-sel.png
index 36bda281a2..36bda281a2 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left-sel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left-sel.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left.png
index 8debec889c..8debec889c 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right-sel.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right-sel.png
index 8dd605495f..8dd605495f 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right-sel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right-sel.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right.png
index f02e91260e..f02e91260e 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-spacer-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-spacer-right.png
index a4d36b63d6..a4d36b63d6 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-spacer-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/framed/tab-spacer-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next-disabled.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next-disabled.png
index bfdb3d60b9..bfdb3d60b9 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next-disabled.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next-disabled.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next-pressed.png
index 3b1d688ea0..3b1d688ea0 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next.png
index 10d8dd96de..10d8dd96de 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-next.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev-disabled.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev-disabled.png
index fbd08f74b2..fbd08f74b2 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev-disabled.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev-disabled.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev-pressed.png
index 22923aa7e9..22923aa7e9 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev.png
index aaa748424f..aaa748424f 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tab-prev.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg-sel.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg-sel.png
index 7084ff1af3..7084ff1af3 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg-sel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg-sel.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg.png
index 76cf520e04..76cf520e04 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/img/tabbar-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.scss
index e2a92730b4..e2a92730b4 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-borderless-style.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.scss
index 706aea151b..706aea151b 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-hover-closable-style.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss
index 1446b5b93c..1446b5b93c 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss
index a2091130a1..a2091130a1 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-normal-style.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.scss
index 070bb2d724..070bb2d724 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.scss
index ed1ddcd693..ed1ddcd693 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-selected-closable-style.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss
index 4e84176cd4..4e84176cd4 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet-small-style.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet.scss
index 35001daf4d..35001daf4d 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tabsheet/tabsheet.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-black.png
index 54c41f8bd5..54c41f8bd5 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-black-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-black-focus.png
index 9defe8108a..9defe8108a 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-black-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-black-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-black.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-black.png
index 2f501f3866..2f501f3866 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-black.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-black.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-focus.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-focus.png
index 673212b408..673212b408 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-focus.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image-focus.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image.png
index 38fe3e6d7b..38fe3e6d7b 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg-border-image.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg.png
index 4096e9d524..4096e9d524 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/img/bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/textfield.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/textfield.scss
index 0d19cb5591..0d19cb5591 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/textfield/textfield.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/textfield/textfield.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tree/img/arrows.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tree/img/arrows.png
index 3f657e34c9..3f657e34c9 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tree/img/arrows.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tree/img/arrows.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/tree/tree.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tree/tree.scss
index 15e7092dd6..15e7092dd6 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/tree/tree.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/tree/tree.scss
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close-hover.png
index bb0a080373..bb0a080373 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close-pressed.png
index 07a837b619..07a837b619 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close.png
index b26cfb5d57..b26cfb5d57 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/close.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/content-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/content-bg.png
index caaee49b32..caaee49b32 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/content-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/content-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/header-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/header-bg.png
index a956a6b27d..a956a6b27d 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/header-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/header-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize-active.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize-active.png
index 526563c94f..526563c94f 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize-active.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize-active.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize-hover.png
index 76d0fdf040..76d0fdf040 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize.png
index ecf4cbed35..ecf4cbed35 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/maximize.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/resize.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/resize.png
index 91e0b742d9..91e0b742d9 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/resize.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/resize.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore-active.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore-active.png
index 96f9672605..96f9672605 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore-active.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore-active.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore-hover.png
index b319f07684..b319f07684 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore.png
index b440383b91..b440383b91 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/black/restore.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/close-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/close-hover.png
index 78bb84d869..78bb84d869 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/close-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/close-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/close-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/close-pressed.png
index 4618ad5e0d..4618ad5e0d 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/close-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/close-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/close.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/close.png
index e04f31d882..e04f31d882 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/close.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/close.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/footer-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/footer-bg.png
index 28839748e6..28839748e6 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/footer-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/footer-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/header-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/header-bg.png
index 27f1bf92a7..27f1bf92a7 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/header-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/header-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close-hover.png
index 17ac9b8457..17ac9b8457 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close-pressed.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close-pressed.png
index 2c84b5bcfb..2c84b5bcfb 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close-pressed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close-pressed.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close.png
index 4bbc89cee9..4bbc89cee9 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/close.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/content-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/content-bg.png
index b38c902d83..b38c902d83 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/content-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/content-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize-active.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize-active.png
index 5ca4e2e6eb..5ca4e2e6eb 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize-active.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize-active.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize-hover.png
index c7930c2f4a..c7930c2f4a 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize.png
index a4965ef19c..a4965ef19c 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/maximize.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/resize.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/resize.png
index 0c0c9123b9..0c0c9123b9 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/resize.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/resize.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore-active.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore-active.png
index d135c4d66c..d135c4d66c 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore-active.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore-active.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore-hover.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore-hover.png
index b03639c001..b03639c001 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore-hover.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore-hover.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore.png
index 1c3fba4020..1c3fba4020 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/light/restore.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/maximize.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/maximize.png
index 86ffff9760..86ffff9760 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/maximize.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/maximize.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/resize.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/resize.png
index 828bb346cc..828bb346cc 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/resize.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/resize.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/restore.png b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/restore.png
index 119ea04259..119ea04259 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/img/restore.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/img/restore.png
diff --git a/themes/src/main/themes/VAADIN/themes/reindeer/window/window.scss b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/window.scss
index 66c80c6a44..66c80c6a44 100644
--- a/themes/src/main/themes/VAADIN/themes/reindeer/window/window.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/reindeer/window/window.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/absolutelayout/absolutelayout.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/absolutelayout/absolutelayout.scss
index e87d9f64ad..e87d9f64ad 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/absolutelayout/absolutelayout.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/absolutelayout/absolutelayout.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/accordion/accordion.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/accordion/accordion.scss
index 69a52dd22a..69a52dd22a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/accordion/accordion.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/accordion/accordion.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/accordion/img/bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/accordion/img/bg.png
index 0015e4cd0e..0015e4cd0e 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/accordion/img/bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/accordion/img/bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/accordion/img/collapsed-icon.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/accordion/img/collapsed-icon.png
index dc13f0f786..dc13f0f786 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/accordion/img/collapsed-icon.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/accordion/img/collapsed-icon.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/accordion/img/expanded-icon.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/accordion/img/expanded-icon.png
index 0ad8eb074f..0ad8eb074f 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/accordion/img/expanded-icon.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/accordion/img/expanded-icon.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/accordion/img/selected-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/accordion/img/selected-bg.png
index 1c599db14e..1c599db14e 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/accordion/img/selected-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/accordion/img/selected-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/button/button.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/button/button.scss
index b303dd2e02..b303dd2e02 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/button/button.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/button/button.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/button/img/bg-default.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/button/img/bg-default.png
index bb655872e3..bb655872e3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/button/img/bg-default.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/button/img/bg-default.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/button/img/bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/button/img/bg.png
index 4552879208..4552879208 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/button/img/bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/button/img/bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/caption/caption.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/caption/caption.scss
index dab33c99c7..dab33c99c7 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/caption/caption.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/caption/caption.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/colorpicker/colorpicker.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/colorpicker/colorpicker.scss
index df48c10a86..df48c10a86 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/colorpicker/colorpicker.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/colorpicker/colorpicker.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/common/common.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/common/common.scss
index 207660c08e..207660c08e 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/common/common.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/common/common.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/common/img/blank.gif b/compatibility-themes/src/main/themes/VAADIN/themes/runo/common/img/blank.gif
index 3776af0784..3776af0784 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/common/img/blank.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/common/img/blank.gif
diff --git a/themes/src/main/themes/VAADIN/themes/runo/common/img/main-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/common/img/main-bg.png
index a6cd9288f7..a6cd9288f7 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/common/img/main-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/common/img/main-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/datefield/datefield.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/datefield.scss
index d89fdf786e..d89fdf786e 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/datefield/datefield.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/datefield.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/datefield/img/nextmonth.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/img/nextmonth.png
index 3315125dd1..3315125dd1 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/datefield/img/nextmonth.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/img/nextmonth.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/datefield/img/nextyear.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/img/nextyear.png
index 22633fd31a..22633fd31a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/datefield/img/nextyear.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/img/nextyear.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/datefield/img/open-button.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/img/open-button.png
index 548ca12f70..548ca12f70 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/datefield/img/open-button.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/img/open-button.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/datefield/img/prevmonth.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/img/prevmonth.png
index d114632fef..d114632fef 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/datefield/img/prevmonth.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/img/prevmonth.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/datefield/img/prevyear.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/img/prevyear.png
index f174713092..f174713092 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/datefield/img/prevyear.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/img/prevyear.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/datefield/img/selected-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/img/selected-bg.png
index 799915ab8f..799915ab8f 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/datefield/img/selected-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/datefield/img/selected-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/favicon.ico b/compatibility-themes/src/main/themes/VAADIN/themes/runo/favicon.ico
index 1f81f0de76..1f81f0de76 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/favicon.ico
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/favicon.ico
diff --git a/themes/src/main/themes/VAADIN/themes/runo/formlayout/formlayout.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/formlayout/formlayout.scss
index 59151feeb7..59151feeb7 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/formlayout/formlayout.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/formlayout/formlayout.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/grid/grid.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/grid/grid.scss
index 87fe88b9a2..87fe88b9a2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/grid/grid.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/grid/grid.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/grid/img/header-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/grid/img/header-bg.png
index 275fbc4382..275fbc4382 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/grid/img/header-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/grid/img/header-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/grid/img/resizer-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/grid/img/resizer-bg.png
index d9089775cb..d9089775cb 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/grid/img/resizer-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/grid/img/resizer-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/grid/img/sort-asc.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/grid/img/sort-asc.png
index 44e17d5446..44e17d5446 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/grid/img/sort-asc.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/grid/img/sort-asc.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/grid/img/sort-desc.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/grid/img/sort-desc.png
index 35fd0595f8..35fd0595f8 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/grid/img/sort-desc.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/grid/img/sort-desc.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/gridlayout/gridlayout.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/gridlayout/gridlayout.scss
index e3fb628a6b..e3fb628a6b 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/gridlayout/gridlayout.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/gridlayout/gridlayout.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-down.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-down.png
index ffd0ee50a5..ffd0ee50a5 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-down.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-down.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-left.png
index 27dd25110d..27dd25110d 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-right.png
index 69bf88da8a..69bf88da8a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-up.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-up.png
index 76e5b43e08..76e5b43e08 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-up.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/arrow-up.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/attention.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/attention.png
index 350de56aa5..350de56aa5 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/attention.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/attention.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/calendar.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/calendar.png
index 7717a5e220..7717a5e220 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/calendar.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/calendar.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/cancel.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/cancel.png
index 19a0783733..19a0783733 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/cancel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/cancel.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-add.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-add.png
index d84e349526..d84e349526 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-add.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-add.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-delete.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-delete.png
index cc3172224a..cc3172224a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-delete.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-delete.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-doc.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-doc.png
index 7def77428a..7def77428a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-doc.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-doc.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-image.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-image.png
index 8a1bf253e8..8a1bf253e8 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-image.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-image.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-pdf.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-pdf.png
index b58ccf7567..b58ccf7567 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-pdf.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-pdf.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-ppt.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-ppt.png
index b60f429be2..b60f429be2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-ppt.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-ppt.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-txt.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-txt.png
index 05659b19b2..05659b19b2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-txt.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-txt.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-web.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-web.png
index fcfd8685f0..fcfd8685f0 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-web.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-web.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-xsl.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-xsl.png
index 571823847f..571823847f 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document-xsl.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document-xsl.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document.png
index a2bab1bb0b..a2bab1bb0b 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/document.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/document.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/email-reply.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/email-reply.png
index be7fd2244d..be7fd2244d 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/email-reply.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/email-reply.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/email-send.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/email-send.png
index 0ef7a1c398..0ef7a1c398 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/email-send.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/email-send.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/email.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/email.png
index 68d6c93465..68d6c93465 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/email.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/email.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/error.gif b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/error.gif
index c9582b2c28..c9582b2c28 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/error.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/error.gif
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/error.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/error.png
index 0141e4dfc3..0141e4dfc3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/error.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/error.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/folder-add.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/folder-add.png
index 48aa7c9220..48aa7c9220 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/folder-add.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/folder-add.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/folder-delete.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/folder-delete.png
index 7cc389d6b2..7cc389d6b2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/folder-delete.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/folder-delete.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/folder.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/folder.png
index f4fec377c6..f4fec377c6 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/folder.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/folder.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/globe.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/globe.png
index ea4034c149..ea4034c149 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/globe.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/globe.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/help.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/help.png
index d82a8852bf..d82a8852bf 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/help.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/help.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/lock.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/lock.png
index 29f1023613..29f1023613 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/lock.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/lock.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/note.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/note.png
index efafae5570..efafae5570 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/note.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/note.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/ok.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/ok.png
index 89591faef2..89591faef2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/ok.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/ok.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/reload.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/reload.png
index 2c54836bff..2c54836bff 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/reload.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/reload.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/settings.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/settings.png
index 019f0df663..019f0df663 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/settings.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/settings.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/trash-full.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/trash-full.png
index 7d790e6c9a..7d790e6c9a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/trash-full.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/trash-full.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/trash.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/trash.png
index 8875ae322e..8875ae322e 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/trash.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/trash.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/user.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/user.png
index 522f864884..522f864884 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/user.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/user.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/16/users.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/users.png
index 01f2a1251c..01f2a1251c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/16/users.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/16/users.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-down.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-down.png
index 20c33b70fb..20c33b70fb 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-down.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-down.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-left.png
index ed2aae2cb0..ed2aae2cb0 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-right.png
index bd7707ec8a..bd7707ec8a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-up.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-up.png
index 01c1a8ec83..01c1a8ec83 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-up.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/arrow-up.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/attention.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/attention.png
index 6b00733567..6b00733567 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/attention.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/attention.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/calendar.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/calendar.png
index 789ad9031c..789ad9031c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/calendar.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/calendar.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/cancel.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/cancel.png
index 725240d558..725240d558 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/cancel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/cancel.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-add.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-add.png
index 26bca0d112..26bca0d112 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-add.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-add.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-delete.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-delete.png
index 43e9a43e5b..43e9a43e5b 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-delete.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-delete.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-doc.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-doc.png
index 8df20cfdcf..8df20cfdcf 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-doc.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-doc.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-edit.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-edit.png
index 1d17383ca7..1d17383ca7 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-edit.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-edit.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-image.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-image.png
index 88c78665b8..88c78665b8 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-image.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-image.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-pdf.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-pdf.png
index 048a02fddf..048a02fddf 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-pdf.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-pdf.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-ppt.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-ppt.png
index 7fd7385cbd..7fd7385cbd 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-ppt.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-ppt.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-txt.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-txt.png
index 25264732c6..25264732c6 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-txt.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-txt.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-web.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-web.png
index 72fd847ac3..72fd847ac3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-web.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-web.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-xsl.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-xsl.png
index 2ff4607ad3..2ff4607ad3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document-xsl.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document-xsl.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document.png
index 1a38dcc304..1a38dcc304 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/document.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/document.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/email-reply.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/email-reply.png
index fd0203f768..fd0203f768 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/email-reply.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/email-reply.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/email-send.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/email-send.png
index dc34ac694d..dc34ac694d 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/email-send.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/email-send.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/email.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/email.png
index bef86e6cbb..bef86e6cbb 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/email.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/email.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/folder-add.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/folder-add.png
index e0b78d6e1d..e0b78d6e1d 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/folder-add.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/folder-add.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/folder-delete.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/folder-delete.png
index 8e3c4a404c..8e3c4a404c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/folder-delete.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/folder-delete.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/folder.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/folder.png
index 7577a17ac3..7577a17ac3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/folder.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/folder.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/globe.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/globe.png
index 6c7d469ba2..6c7d469ba2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/globe.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/globe.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/help.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/help.png
index 218910c98d..218910c98d 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/help.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/help.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/lock.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/lock.png
index 4fc16565f0..4fc16565f0 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/lock.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/lock.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/note.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/note.png
index e7e035dc8c..e7e035dc8c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/note.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/note.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/ok.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/ok.png
index ac0438828c..ac0438828c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/ok.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/ok.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/reload.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/reload.png
index c3556ec890..c3556ec890 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/reload.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/reload.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/settings.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/settings.png
index 92eda74c54..92eda74c54 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/settings.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/settings.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/trash-full.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/trash-full.png
index a9707e76d6..a9707e76d6 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/trash-full.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/trash-full.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/trash.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/trash.png
index 6eaac86166..6eaac86166 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/trash.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/trash.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/user.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/user.png
index ebb5a7f9f8..ebb5a7f9f8 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/user.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/user.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/32/users.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/users.png
index af225a9e46..af225a9e46 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/32/users.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/32/users.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-down.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-down.png
index bdf5d0474e..bdf5d0474e 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-down.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-down.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-left.png
index b90ed88840..b90ed88840 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-right.png
index 6331a5ddf3..6331a5ddf3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-up.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-up.png
index 821fbe348f..821fbe348f 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-up.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/arrow-up.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/attention.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/attention.png
index 77265e48ee..77265e48ee 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/attention.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/attention.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/calendar.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/calendar.png
index f13fbd6efb..f13fbd6efb 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/calendar.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/calendar.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/cancel.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/cancel.png
index 1d1a719a6c..1d1a719a6c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/cancel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/cancel.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-add.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-add.png
index acdcb06123..acdcb06123 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-add.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-add.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-delete.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-delete.png
index 2a46863b7f..2a46863b7f 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-delete.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-delete.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-doc.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-doc.png
index 455c1f15bd..455c1f15bd 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-doc.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-doc.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-edit.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-edit.png
index 6af96c9b77..6af96c9b77 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-edit.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-edit.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-image.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-image.png
index 079978e850..079978e850 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-image.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-image.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-pdf.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-pdf.png
index cb6bc59675..cb6bc59675 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-pdf.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-pdf.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-ppt.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-ppt.png
index dd501bfbc9..dd501bfbc9 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-ppt.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-ppt.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-txt.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-txt.png
index e64f746bd9..e64f746bd9 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-txt.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-txt.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-web.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-web.png
index 9d81eb5702..9d81eb5702 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-web.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-web.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-xsl.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-xsl.png
index 6008085a34..6008085a34 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document-xsl.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document-xsl.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document.png
index 224de0bc84..224de0bc84 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/document.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/document.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/email-reply.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/email-reply.png
index 2c6f7b690d..2c6f7b690d 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/email-reply.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/email-reply.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/email-send.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/email-send.png
index 9ec7198853..9ec7198853 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/email-send.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/email-send.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/email.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/email.png
index e11245b2f5..e11245b2f5 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/email.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/email.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/folder-add.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/folder-add.png
index 111318cc3c..111318cc3c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/folder-add.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/folder-add.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/folder-delete.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/folder-delete.png
index d249983eac..d249983eac 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/folder-delete.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/folder-delete.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/folder.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/folder.png
index edb7b9f786..edb7b9f786 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/folder.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/folder.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/globe.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/globe.png
index 1786635b45..1786635b45 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/globe.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/globe.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/help.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/help.png
index a66e8aafa6..a66e8aafa6 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/help.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/help.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/lock.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/lock.png
index deaf7db0a4..deaf7db0a4 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/lock.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/lock.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/note.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/note.png
index 1383847ed1..1383847ed1 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/note.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/note.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/ok.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/ok.png
index dc0d00c38b..dc0d00c38b 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/ok.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/ok.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/reload.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/reload.png
index b91f51c67f..b91f51c67f 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/reload.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/reload.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/settings.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/settings.png
index 1c9b794ab0..1c9b794ab0 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/settings.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/settings.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/trash-full.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/trash-full.png
index 81d060e509..81d060e509 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/trash-full.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/trash-full.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/trash.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/trash.png
index 41ef761061..41ef761061 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/trash.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/trash.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/user.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/user.png
index 60d6c6e1b3..60d6c6e1b3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/user.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/user.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/64/users.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/users.png
index 3a42c17790..3a42c17790 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/64/users.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/64/users.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-down.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-down.png
index ffd0ee50a5..ffd0ee50a5 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-down.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-down.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-left.png
index 27dd25110d..27dd25110d 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-right.png
index 69bf88da8a..69bf88da8a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-up.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-up.png
index 76e5b43e08..76e5b43e08 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-up.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/arrow-up.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/attention.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/attention.png
index 350de56aa5..350de56aa5 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/attention.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/attention.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/calendar.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/calendar.png
index 7717a5e220..7717a5e220 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/calendar.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/calendar.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/cancel.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/cancel.png
index 19a0783733..19a0783733 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/cancel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/cancel.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-add.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-add.png
index d84e349526..d84e349526 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-add.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-add.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-delete.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-delete.png
index cc3172224a..cc3172224a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-delete.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-delete.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-doc.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-doc.png
index 7def77428a..7def77428a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-doc.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-doc.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-image.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-image.png
index 8a1bf253e8..8a1bf253e8 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-image.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-image.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-pdf.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-pdf.png
index b58ccf7567..b58ccf7567 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-pdf.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-pdf.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-ppt.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-ppt.png
index b60f429be2..b60f429be2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-ppt.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-ppt.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-txt.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-txt.png
index 05659b19b2..05659b19b2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-txt.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-txt.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-web.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-web.png
index fcfd8685f0..fcfd8685f0 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-web.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-web.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-xsl.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-xsl.png
index 571823847f..571823847f 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-xsl.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document-xsl.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document.png
index a2bab1bb0b..a2bab1bb0b 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/document.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email-reply.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email-reply.png
index be7fd2244d..be7fd2244d 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email-reply.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email-reply.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email-send.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email-send.png
index 0ef7a1c398..0ef7a1c398 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email-send.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email-send.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email.png
index 68d6c93465..68d6c93465 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/email.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/error.gif b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/error.gif
index c9582b2c28..c9582b2c28 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/error.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/error.gif
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/error.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/error.png
index 0141e4dfc3..0141e4dfc3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/error.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/error.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder-add.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder-add.png
index 48aa7c9220..48aa7c9220 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder-add.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder-add.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder-delete.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder-delete.png
index 7cc389d6b2..7cc389d6b2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder-delete.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder-delete.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder.png
index f4fec377c6..f4fec377c6 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/folder.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/globe.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/globe.png
index ea4034c149..ea4034c149 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/globe.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/globe.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/help.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/help.png
index d82a8852bf..d82a8852bf 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/help.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/help.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/lock.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/lock.png
index 29f1023613..29f1023613 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/lock.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/lock.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/note.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/note.png
index efafae5570..efafae5570 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/note.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/note.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/ok.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/ok.png
index 89591faef2..89591faef2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/ok.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/ok.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/reload.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/reload.png
index 2c54836bff..2c54836bff 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/reload.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/reload.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/settings.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/settings.png
index 019f0df663..019f0df663 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/settings.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/settings.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/trash-full.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/trash-full.png
index 7d790e6c9a..7d790e6c9a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/trash-full.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/trash-full.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/trash.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/trash.png
index 8875ae322e..8875ae322e 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/trash.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/trash.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/user.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/user.png
index 522f864884..522f864884 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/user.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/user.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/users.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/users.png
index 01f2a1251c..01f2a1251c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons16/users.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons16/users.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-down.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-down.png
index 20c33b70fb..20c33b70fb 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-down.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-down.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-left.png
index ed2aae2cb0..ed2aae2cb0 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-right.png
index bd7707ec8a..bd7707ec8a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-up.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-up.png
index 01c1a8ec83..01c1a8ec83 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-up.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/arrow-up.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/attention.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/attention.png
index 6b00733567..6b00733567 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/attention.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/attention.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/calendar.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/calendar.png
index 789ad9031c..789ad9031c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/calendar.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/calendar.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/cancel.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/cancel.png
index 725240d558..725240d558 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/cancel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/cancel.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-add.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-add.png
index 26bca0d112..26bca0d112 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-add.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-add.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-delete.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-delete.png
index 43e9a43e5b..43e9a43e5b 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-delete.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-delete.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-doc.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-doc.png
index 8df20cfdcf..8df20cfdcf 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-doc.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-doc.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-edit.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-edit.png
index 1d17383ca7..1d17383ca7 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-edit.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-edit.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-image.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-image.png
index 88c78665b8..88c78665b8 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-image.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-image.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-pdf.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-pdf.png
index 048a02fddf..048a02fddf 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-pdf.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-pdf.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-ppt.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-ppt.png
index 7fd7385cbd..7fd7385cbd 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-ppt.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-ppt.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-txt.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-txt.png
index 25264732c6..25264732c6 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-txt.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-txt.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-web.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-web.png
index 72fd847ac3..72fd847ac3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-web.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-web.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-xsl.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-xsl.png
index 2ff4607ad3..2ff4607ad3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-xsl.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document-xsl.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document.png
index 1a38dcc304..1a38dcc304 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/document.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email-reply.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email-reply.png
index fd0203f768..fd0203f768 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email-reply.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email-reply.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email-send.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email-send.png
index dc34ac694d..dc34ac694d 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email-send.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email-send.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email.png
index bef86e6cbb..bef86e6cbb 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/email.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder-add.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder-add.png
index e0b78d6e1d..e0b78d6e1d 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder-add.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder-add.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder-delete.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder-delete.png
index 8e3c4a404c..8e3c4a404c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder-delete.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder-delete.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder.png
index 7577a17ac3..7577a17ac3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/folder.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/globe.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/globe.png
index 6c7d469ba2..6c7d469ba2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/globe.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/globe.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/help.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/help.png
index 218910c98d..218910c98d 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/help.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/help.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/lock.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/lock.png
index 4fc16565f0..4fc16565f0 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/lock.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/lock.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/note.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/note.png
index e7e035dc8c..e7e035dc8c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/note.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/note.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/ok.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/ok.png
index ac0438828c..ac0438828c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/ok.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/ok.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/reload.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/reload.png
index c3556ec890..c3556ec890 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/reload.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/reload.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/settings.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/settings.png
index 92eda74c54..92eda74c54 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/settings.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/settings.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/trash-full.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/trash-full.png
index a9707e76d6..a9707e76d6 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/trash-full.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/trash-full.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/trash.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/trash.png
index 6eaac86166..6eaac86166 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/trash.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/trash.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/user.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/user.png
index ebb5a7f9f8..ebb5a7f9f8 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/user.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/user.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/users.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/users.png
index af225a9e46..af225a9e46 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons32/users.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons32/users.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-down.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-down.png
index bdf5d0474e..bdf5d0474e 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-down.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-down.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-left.png
index b90ed88840..b90ed88840 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-right.png
index 6331a5ddf3..6331a5ddf3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-up.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-up.png
index 821fbe348f..821fbe348f 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-up.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/arrow-up.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/attention.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/attention.png
index 77265e48ee..77265e48ee 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/attention.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/attention.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/calendar.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/calendar.png
index f13fbd6efb..f13fbd6efb 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/calendar.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/calendar.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/cancel.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/cancel.png
index 1d1a719a6c..1d1a719a6c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/cancel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/cancel.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-add.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-add.png
index acdcb06123..acdcb06123 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-add.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-add.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-delete.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-delete.png
index 2a46863b7f..2a46863b7f 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-delete.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-delete.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-doc.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-doc.png
index 455c1f15bd..455c1f15bd 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-doc.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-doc.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-edit.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-edit.png
index 6af96c9b77..6af96c9b77 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-edit.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-edit.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-image.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-image.png
index 079978e850..079978e850 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-image.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-image.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-pdf.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-pdf.png
index cb6bc59675..cb6bc59675 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-pdf.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-pdf.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-ppt.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-ppt.png
index dd501bfbc9..dd501bfbc9 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-ppt.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-ppt.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-txt.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-txt.png
index e64f746bd9..e64f746bd9 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-txt.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-txt.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-web.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-web.png
index 9d81eb5702..9d81eb5702 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-web.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-web.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-xsl.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-xsl.png
index 6008085a34..6008085a34 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-xsl.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document-xsl.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document.png
index 224de0bc84..224de0bc84 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/document.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email-reply.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email-reply.png
index 2c6f7b690d..2c6f7b690d 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email-reply.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email-reply.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email-send.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email-send.png
index 9ec7198853..9ec7198853 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email-send.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email-send.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email.png
index e11245b2f5..e11245b2f5 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/email.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder-add.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder-add.png
index 111318cc3c..111318cc3c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder-add.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder-add.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder-delete.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder-delete.png
index d249983eac..d249983eac 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder-delete.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder-delete.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder.png
index edb7b9f786..edb7b9f786 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/folder.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/globe.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/globe.png
index 1786635b45..1786635b45 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/globe.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/globe.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/help.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/help.png
index a66e8aafa6..a66e8aafa6 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/help.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/help.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/lock.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/lock.png
index deaf7db0a4..deaf7db0a4 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/lock.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/lock.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/note.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/note.png
index 1383847ed1..1383847ed1 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/note.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/note.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/ok.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/ok.png
index dc0d00c38b..dc0d00c38b 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/ok.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/ok.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/reload.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/reload.png
index b91f51c67f..b91f51c67f 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/reload.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/reload.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/settings.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/settings.png
index 1c9b794ab0..1c9b794ab0 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/settings.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/settings.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/trash-full.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/trash-full.png
index 81d060e509..81d060e509 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/trash-full.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/trash-full.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/trash.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/trash.png
index 41ef761061..41ef761061 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/trash.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/trash.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/user.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/user.png
index 60d6c6e1b3..60d6c6e1b3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/user.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/user.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/users.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/users.png
index 3a42c17790..3a42c17790 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/icons/icons64/users.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/icons/icons64/users.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/inlinedatefield/inlinedatefield.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/inlinedatefield/inlinedatefield.scss
index ff0d5f5bb1..ff0d5f5bb1 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/inlinedatefield/inlinedatefield.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/inlinedatefield/inlinedatefield.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/label/label.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/label/label.scss
index bd16f91902..bd16f91902 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/label/label.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/label/label.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/legacy-styles.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/legacy-styles.scss
index 29ccb22aa5..29ccb22aa5 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/legacy-styles.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/legacy-styles.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/link/link.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/link/link.scss
index 6970c6b2d8..6970c6b2d8 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/link/link.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/link/link.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/menubar/menubar.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/menubar/menubar.scss
index d4cb22794b..d4cb22794b 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/menubar/menubar.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/menubar/menubar.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/notification/img/close-error.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/notification/img/close-error.png
index f52c922111..f52c922111 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/notification/img/close-error.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/notification/img/close-error.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/notification/notification.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/notification/notification.scss
index 1bf77a68ba..1bf77a68ba 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/notification/notification.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/notification/notification.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/orderedlayout/orderedlayout.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/orderedlayout/orderedlayout.scss
index d01371599c..d01371599c 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/orderedlayout/orderedlayout.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/orderedlayout/orderedlayout.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/panel/img/bottom-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/panel/img/bottom-left.png
index 9306fac21e..9306fac21e 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/panel/img/bottom-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/panel/img/bottom-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/panel/img/bottom-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/panel/img/bottom-right.png
index 08f53ff470..08f53ff470 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/panel/img/bottom-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/panel/img/bottom-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/panel/img/top-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/panel/img/top-left.png
index 2d59a76c06..2d59a76c06 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/panel/img/top-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/panel/img/top-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/panel/img/top-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/panel/img/top-right.png
index e981d430ce..e981d430ce 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/panel/img/top-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/panel/img/top-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/panel/panel.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/panel/panel.scss
index 180ab93b41..180ab93b41 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/panel/panel.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/panel/panel.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/popupview/popupview.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/popupview/popupview.scss
index e5bc664fdd..e5bc664fdd 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/popupview/popupview.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/popupview/popupview.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/base-static.gif b/compatibility-themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/base-static.gif
index 474b684196..474b684196 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/base-static.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/base-static.gif
diff --git a/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/base.gif b/compatibility-themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/base.gif
index 6c6f15ef9e..6c6f15ef9e 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/base.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/base.gif
diff --git a/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/disabled.gif b/compatibility-themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/disabled.gif
index 7a64d034b2..7a64d034b2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/disabled.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/disabled.gif
diff --git a/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/progress.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/progress.png
index c1aca57369..c1aca57369 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/progress.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/progressindicator/img/progress.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/progressindicator/progressindicator.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/progressindicator/progressindicator.scss
index 432123cf1f..432123cf1f 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/progressindicator/progressindicator.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/progressindicator/progressindicator.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/runo.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/runo.scss
index 3c1110968b..3c1110968b 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/runo.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/runo.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/select/img/arrow-down.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/arrow-down.png
index ee795fd069..ee795fd069 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/select/img/arrow-down.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/arrow-down.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/select/img/arrow-up.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/arrow-up.png
index 055ad61ef1..055ad61ef1 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/select/img/arrow-up.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/arrow-up.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-center-filter-error.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/bg-center-filter-error.png
index 72f74f16ab..72f74f16ab 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-center-filter-error.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/bg-center-filter-error.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-center-filter.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/bg-center-filter.png
index 03e7384343..03e7384343 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-center-filter.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/bg-center-filter.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-left-filter-error.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/bg-left-filter-error.png
index da4a4e4cc9..da4a4e4cc9 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-left-filter-error.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/bg-left-filter-error.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-left-filter.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/bg-left-filter.png
index 4a1d2a2966..4a1d2a2966 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-left-filter.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/bg-left-filter.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-right-filter-error.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/bg-right-filter-error.png
index 72ed791760..72ed791760 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-right-filter-error.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/bg-right-filter-error.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-right-filter.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/bg-right-filter.png
index 04cb8e4089..04cb8e4089 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/select/img/bg-right-filter.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/bg-right-filter.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/select/img/button-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/button-bg.png
index 9653ed949b..9653ed949b 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/select/img/button-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/img/button-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/select/select.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/select.scss
index ac8e22b429..ac8e22b429 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/select/select.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/select/select.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/slider/img/handle-horizontal.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/slider/img/handle-horizontal.png
index 620b86f1da..620b86f1da 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/slider/img/handle-horizontal.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/slider/img/handle-horizontal.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/slider/img/handle-vertical.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/slider/img/handle-vertical.png
index b7f63b91b7..b7f63b91b7 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/slider/img/handle-vertical.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/slider/img/handle-vertical.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/slider/slider.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/slider/slider.scss
index aa8cbe3e7a..aa8cbe3e7a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/slider/slider.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/slider/slider.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/splitpanel/img/bg_hor.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/splitpanel/img/bg_hor.png
index f50f81aa35..f50f81aa35 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/splitpanel/img/bg_hor.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/splitpanel/img/bg_hor.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/splitpanel/img/bg_ver.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/splitpanel/img/bg_ver.png
index 6846e47096..6846e47096 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/splitpanel/img/bg_ver.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/splitpanel/img/bg_ver.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/splitpanel/splitpanel.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/splitpanel/splitpanel.scss
index 84b8f5cd44..84b8f5cd44 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/splitpanel/splitpanel.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/splitpanel/splitpanel.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/styles.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/styles.scss
index cfcb8bfa78..cfcb8bfa78 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/styles.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/styles.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/table/img/check.gif b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/check.gif
index 0a89195168..0a89195168 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/table/img/check.gif
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/check.gif
diff --git a/themes/src/main/themes/VAADIN/themes/runo/table/img/colsel.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/colsel.png
index 7cf5abc8b2..7cf5abc8b2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/table/img/colsel.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/colsel.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/table/img/header-bg-over.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/header-bg-over.png
index 6c888676e9..6c888676e9 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/table/img/header-bg-over.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/header-bg-over.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/table/img/header-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/header-bg.png
index 275fbc4382..275fbc4382 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/table/img/header-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/header-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/table/img/resizer-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/resizer-bg.png
index d9089775cb..d9089775cb 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/table/img/resizer-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/resizer-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/table/img/scroll-position-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/scroll-position-bg.png
index d5968fdf51..d5968fdf51 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/table/img/scroll-position-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/scroll-position-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/table/img/sort-asc.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/sort-asc.png
index 44e17d5446..44e17d5446 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/table/img/sort-asc.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/sort-asc.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/table/img/sort-desc.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/sort-desc.png
index 35fd0595f8..35fd0595f8 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/table/img/sort-desc.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/img/sort-desc.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/table/table.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/table.scss
index 3902ed7cb0..3902ed7cb0 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/table/table.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/table/table.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-bg.png
index 501876fb36..501876fb36 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-border.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-border.png
index 26c63f6882..26c63f6882 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-border.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-border.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-left.png
index 0e0a841a87..0e0a841a87 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-right.png
index 0696ff8c3b..0696ff8c3b 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/inline-tab-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/next.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/next.png
index f43dd1abf0..f43dd1abf0 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/next.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/next.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/prev.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/prev.png
index 5e111b4aa0..5e111b4aa0 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/prev.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/prev.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/tab-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/tab-bg.png
index a4235e9a83..a4235e9a83 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/tab-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/img/tab-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/tabsheet.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/tabsheet.scss
index ab4afb1c69..ab4afb1c69 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tabsheet/tabsheet.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tabsheet/tabsheet.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/textfield/img/bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/textfield/img/bg.png
index 43c7ac7b47..43c7ac7b47 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/textfield/img/bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/textfield/img/bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/textfield/textfield.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/textfield/textfield.scss
index 680c3d68ec..680c3d68ec 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/textfield/textfield.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/textfield/textfield.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tree/img/collapsed.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/collapsed.png
index 8d4064de0a..8d4064de0a 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tree/img/collapsed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/collapsed.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png
index 28b3626d79..28b3626d79 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/collapsed.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/collapsed.png
index db4d41cccd..db4d41cccd 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/collapsed.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/collapsed.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/connector-item.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/connector-item.png
index b4d0d7aa56..b4d0d7aa56 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/connector-item.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/connector-item.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/connector.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/connector.png
index a93f458787..a93f458787 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/connector.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/connector.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/expanded-last.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/expanded-last.png
index 504b715122..504b715122 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/expanded-last.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/expanded-last.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/expanded.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/expanded.png
index 5c036ed038..5c036ed038 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/expanded.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/connectors/expanded.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tree/img/expanded.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/expanded.png
index 4ac2554eac..4ac2554eac 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tree/img/expanded.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/img/expanded.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/tree/tree.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/tree.scss
index 677e0e8a93..677e0e8a93 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/tree/tree.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/tree/tree.scss
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/bg-color.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/bg-color.png
index 08cdb43bce..08cdb43bce 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/bg-color.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/bg-color.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/bottom-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/bottom-left.png
index e7728b5172..e7728b5172 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/bottom-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/bottom-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/bottom-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/bottom-right.png
index 56c654f41d..56c654f41d 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/bottom-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/bottom-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/close.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/close.png
index 55f1a686dd..55f1a686dd 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/close.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/close.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/bottom-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/bottom-left.png
index 438b50f419..438b50f419 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/bottom-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/bottom-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/bottom-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/bottom-right.png
index 3ceb3c92fe..3ceb3c92fe 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/bottom-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/bottom-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/close.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/close.png
index bb39f7a1f8..bb39f7a1f8 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/close.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/close.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/maximize.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/maximize.png
index cbbc0f6691..cbbc0f6691 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/maximize.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/maximize.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/restore.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/restore.png
index a4e9d257e1..a4e9d257e1 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/restore.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/dialog/restore.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/left-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/left-bg.png
index e9fd861993..e9fd861993 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/left-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/left-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/maximize.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/maximize.png
index c7a1a8d418..c7a1a8d418 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/maximize.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/maximize.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/notification-error.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/notification-error.png
index 32852d5907..32852d5907 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/notification-error.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/notification-error.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/resize.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/resize.png
index e0a8759f64..e0a8759f64 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/resize.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/resize.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/restore.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/restore.png
index 15ac00ddb2..15ac00ddb2 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/restore.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/restore.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/right-bg.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/right-bg.png
index 35d39c772f..35d39c772f 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/right-bg.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/right-bg.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/top-left.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/top-left.png
index ae8aee8ade..ae8aee8ade 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/top-left.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/top-left.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/img/top-right.png b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/top-right.png
index 7030dc30e0..7030dc30e0 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/img/top-right.png
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/img/top-right.png
diff --git a/themes/src/main/themes/VAADIN/themes/runo/window/window.scss b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/window.scss
index 9b298309c3..9b298309c3 100644
--- a/themes/src/main/themes/VAADIN/themes/runo/window/window.scss
+++ b/compatibility-themes/src/main/themes/VAADIN/themes/runo/window/window.scss
diff --git a/pom.xml b/pom.xml
index e896fb7f5b..8e978a7e68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -553,6 +553,7 @@
                 <module>compatibility-client</module>
                 <module>compatibility-client-compiled</module>
                 <module>compatibility-shared</module>
+                <module>compatibility-themes</module>
                 <!-- Nexus staging bug needs the last module to be deployed. -->
                 <module>bom</module>
             </modules>
diff --git a/server/src/main/java/com/vaadin/ui/TabSheet.java b/server/src/main/java/com/vaadin/ui/TabSheet.java
index 747f294666..7a154dd752 100644
--- a/server/src/main/java/com/vaadin/ui/TabSheet.java
+++ b/server/src/main/java/com/vaadin/ui/TabSheet.java
@@ -48,8 +48,6 @@ import com.vaadin.ui.Component.Focusable;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
-import com.vaadin.ui.themes.Reindeer;
-import com.vaadin.ui.themes.Runo;
 
 /**
  * TabSheet component.
@@ -68,9 +66,7 @@ import com.vaadin.ui.themes.Runo;
  * TabSheet.
  *
  * The {@link TabSheet} can be styled with the .v-tabsheet, .v-tabsheet-tabs and
- * .v-tabsheet-content styles. Themes may also have pre-defined variations of
- * the tab sheet presentation, such as {@link Reindeer#TABSHEET_BORDERLESS},
- * {@link Runo#TABSHEET_SMALL} and several other styles in {@link Reindeer}.
+ * .v-tabsheet-content styles.
  *
  * The current implementation does not load the tabs to the UI before the first
  * time they are shown, but this may change in future releases.
diff --git a/server/src/test/java/com/vaadin/tests/VaadinClasses.java b/server/src/test/java/com/vaadin/tests/VaadinClasses.java
index 8c8fbaf7f1..ac40622a02 100644
--- a/server/src/test/java/com/vaadin/tests/VaadinClasses.java
+++ b/server/src/test/java/com/vaadin/tests/VaadinClasses.java
@@ -28,7 +28,6 @@ import com.vaadin.ui.PopupView;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalSplitPanel;
 import com.vaadin.ui.Window;
-import com.vaadin.ui.themes.BaseTheme;
 
 @SuppressWarnings("deprecation")
 public class VaadinClasses {
@@ -62,9 +61,9 @@ public class VaadinClasses {
         }
     }
 
-    public static List<Class<? extends BaseTheme>> getThemeClasses() {
+    public static List<Class<? extends Object>> getThemeClasses() {
         try {
-            return findClasses(BaseTheme.class, "com.vaadin.ui.themes");
+            return findClasses(Object.class, "com.vaadin.ui.themes");
         } catch (IOException e) {
             e.printStackTrace();
             return null;
diff --git a/themes/pom.xml b/themes/pom.xml
index b0d3d87360..76af861d0c 100644
--- a/themes/pom.xml
+++ b/themes/pom.xml
@@ -66,7 +66,6 @@
                                     <directory>src/main/themes</directory>
                                     <filtering>false</filtering>
                                     <excludes>
-                                        <exclude>**/base.scss</exclude>
                                         <exclude>**/valo/shared/_global.scss</exclude>
                                     </excludes>
                                 </resource>
@@ -74,7 +73,6 @@
                                     <directory>src/main/themes</directory>
                                     <filtering>true</filtering>
                                     <includes>
-                                        <include>**/base.scss</include>
                                         <include>**/valo/shared/_global.scss</include>
                                     </includes>
                                 </resource>
@@ -107,120 +105,6 @@
                 <artifactId>exec-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>compile-legacy-base</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <classpathScope>compile</classpathScope>
-                            <executable>${java.home}/bin/java</executable>
-                            <arguments>
-                                <argument>-classpath</argument>
-                                <classpath />
-
-                                <argument>com.vaadin.sass.SassCompiler</argument>
-                                <argument>
-                                    ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.scss</argument>
-                                <argument>
-                                    ${project.build.outputDirectory}/VAADIN/themes/base/legacy-styles.css</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>compile-legacy-chameleon</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <classpathScope>compile</classpathScope>
-                            <executable>${java.home}/bin/java</executable>
-                            <arguments>
-                                <argument>-classpath</argument>
-                                <classpath />
-
-                                <argument>com.vaadin.sass.SassCompiler</argument>
-                                <argument>
-                                    ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.scss</argument>
-                                <argument>
-                                    ${project.build.outputDirectory}/VAADIN/themes/chameleon/legacy-styles.css</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>compile-legacy-reindeer</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <classpathScope>compile</classpathScope>
-                            <executable>${java.home}/bin/java</executable>
-                            <arguments>
-                                <argument>-classpath</argument>
-                                <classpath />
-
-                                <argument>com.vaadin.sass.SassCompiler</argument>
-                                <argument>
-                                    ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.scss</argument>
-                                <argument>
-                                    ${project.build.outputDirectory}/VAADIN/themes/reindeer/legacy-styles.css</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>compile-legacy-runo</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <classpathScope>compile</classpathScope>
-                            <executable>${java.home}/bin/java</executable>
-                            <arguments>
-                                <argument>-classpath</argument>
-                                <classpath />
-
-                                <argument>com.vaadin.sass.SassCompiler</argument>
-                                <argument>
-                                    ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.scss</argument>
-                                <argument>
-                                    ${project.build.outputDirectory}/VAADIN/themes/runo/legacy-styles.css</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>smart-sprite-reindeer</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <classpathScope>compile</classpathScope>
-                            <executable>${java.home}/bin/java</executable>
-                            <arguments>
-                                <argument>-classpath</argument>
-                                <classpath />
-
-                                <argument>org.carrot2.labs.smartsprites.SmartSprites</argument>
-
-                                <argument>--sprite-png-depth</argument>
-                                <argument>AUTO</argument>
-
-                                <argument>--css-file-encoding</argument>
-                                <argument>UTF-8</argument>
-
-                                <argument>--root-dir-path</argument>
-                                <argument>${project.build.outputDirectory}/VAADIN/themes/reindeer</argument>
-
-                                <argument>--log-level</argument>
-                                <argument>WARN</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                    <execution>
                         <id>generate-export-package</id>
                         <phase>package</phase>
                         <goals>
@@ -247,37 +131,6 @@
             </plugin>
 
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>repackage-reindeer</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="reindeer.theme.path"
-                                    value="${project.build.outputDirectory}/VAADIN/themes/reindeer/" />
-
-                                <move
-                                    file="${reindeer.theme.path}/styles-sprite.css"
-                                    tofile="${reindeer.theme.path}/styles.css" />
-
-                                <move
-                                    file="${reindeer.theme.path}/legacy-styles-sprite.css"
-                                    tofile="${reindeer.theme.path}/legacy-styles.css" />
-
-                                <gzip
-                                    src="${reindeer.theme.path}/styles.css"
-                                    destfile="${reindeer.theme.path}/styles.css.gz" />
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
diff --git a/uitest/pom.xml b/uitest/pom.xml
index afef955576..6055d84d97 100644
--- a/uitest/pom.xml
+++ b/uitest/pom.xml
@@ -157,6 +157,11 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>vaadin-compatibility-themes</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>vaadin-compatibility-client</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java b/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java
index a0127631d7..9280c48d19 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java
@@ -10,7 +10,6 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
@@ -20,6 +19,7 @@ import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.ListSelect;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 /**
  * @author marc
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java b/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
index d5d70f65f5..b61f8274b2 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2000-2016 Vaadin Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -31,8 +31,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class TestForBasicApplicationLayout extends CustomComponent {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java
index e18fabee5b..6fbb489c1f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java
@@ -26,7 +26,7 @@ import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.MenuItem;
-import com.vaadin.ui.themes.BaseTheme;
+import com.vaadin.v7.ui.themes.BaseTheme;
 
 @Theme("tests-components")
 public abstract class AbstractComponentTest<T extends AbstractComponent> extends
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/Buttons2.java b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons2.java
index df344b1a45..872c320c79 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/Buttons2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/Buttons2.java
@@ -6,7 +6,7 @@ import com.vaadin.tests.components.AbstractComponentTest;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class Buttons2<T extends Button> extends AbstractComponentTest<T>
         implements ClickListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java
index fc59147654..c39e30be48 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java
@@ -22,7 +22,7 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.Image;
-import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 /**
  * Tests that {@link Embedded} uses correct theme when the theme is set with
diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/LabelStyles.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelStyles.java
index 7cfc8be714..4c8bc1e1da 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/label/LabelStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelStyles.java
@@ -20,7 +20,7 @@ import com.vaadin.tests.components.AbstractReindeerTestUI;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
-import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class LabelStyles extends AbstractReindeerTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
index 61512eabbf..3cb7ba417f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
@@ -23,12 +23,12 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
 import com.vaadin.v7.ui.AbstractField;
 import com.vaadin.v7.ui.NativeSelect;
 import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 @Theme("tests-components")
 @PreserveOnRefresh
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
index 5fef63ce86..4594778c54 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class LayoutRenderTimeTest extends LegacyApplication {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
index 931ebfa5e1..f9c298c217 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
@@ -12,8 +12,8 @@ import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.VerticalSplitPanel;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class LayoutResizeTest extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java b/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java
index 4fc83a96ad..bf645a8303 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java
@@ -9,8 +9,8 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class BasicPanelTest extends TestBase {
     private final Label scrollPosition = new Label();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
index 06cc314cb8..9303ec9fb3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java
@@ -15,7 +15,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.PopupView;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.BaseTheme;
+import com.vaadin.v7.ui.themes.BaseTheme;
 
 public class PopupViewOffScreen extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java
index 0288340484..818fef5db6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeer.java
@@ -19,7 +19,7 @@ import com.vaadin.annotations.Theme;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractReindeerTestUI;
 import com.vaadin.ui.ProgressBar;
-import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 @Theme(Reindeer.THEME_NAME)
 public class ProgressBarStaticReindeer extends AbstractReindeerTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java
index ad03a9ca7e..827e524d8a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRuno.java
@@ -19,7 +19,7 @@ import com.vaadin.annotations.Theme;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractReindeerTestUI;
 import com.vaadin.ui.ProgressBar;
-import com.vaadin.ui.themes.Runo;
+import com.vaadin.v7.ui.themes.Runo;
 
 @Theme(Runo.THEME_NAME)
 public class ProgressBarStaticRuno extends AbstractReindeerTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java
index 97c5202be5..36d7a610f2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java
@@ -10,9 +10,9 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.Table.Align;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class TableInTabsheet extends AbstractReindeerTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java
index 5943044883..c4508d8797 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java
@@ -5,9 +5,9 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractReindeerTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.themes.BaseTheme;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.themes.BaseTheme;
 
 @Theme("tests-tickets")
 public class TableRowHeight2 extends AbstractReindeerTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java
index f079380159..80012d0503 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.table;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.themes.BaseTheme;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.themes.BaseTheme;
 
 public class TableRowHeight3 extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
index 27577ce449..8edb3c8167 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
@@ -8,12 +8,13 @@ import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Component;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.data.util.BeanContainer;
 import com.vaadin.v7.data.util.BeanItem;
 import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.themes.Reindeer;
 
-public class TableWithContainerRequiringEqualsForItemId extends AbstractReindeerTestUI {
+public class TableWithContainerRequiringEqualsForItemId
+        extends AbstractReindeerTestUI {
 
     private MyEntityContainer container = new MyEntityContainer();
     private Log log = new Log(10);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ExtraScrollbarsInTabSheet.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ExtraScrollbarsInTabSheet.java
index 63d50e0464..f1dbb621af 100755
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ExtraScrollbarsInTabSheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ExtraScrollbarsInTabSheet.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.Runo;
+import com.vaadin.v7.ui.themes.Runo;
 
 @Theme("runo")
 public class ExtraScrollbarsInTabSheet extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java
index ebfee0adb0..71d71cf48e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java
@@ -5,7 +5,7 @@ import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.TabSheet.Tab;
-import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class TabsheetMinimalClosableTabs extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java
index 1c75961795..d06fbb85ee 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java
@@ -7,11 +7,11 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.themes.BaseTheme;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.util.HierarchicalContainer;
 import com.vaadin.v7.ui.Tree;
 import com.vaadin.v7.ui.Tree.TreeDragMode;
+import com.vaadin.v7.ui.themes.BaseTheme;
 
 @SuppressWarnings("serial")
 public class TreeConnectors extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithIcons.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithIcons.java
index e9921c1d46..916866038b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithIcons.java
@@ -8,8 +8,8 @@ import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Panel;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class TreeWithIcons extends TestBase {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/AccordionsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/AccordionsCssTest.java
index e3128d501f..bca119815d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/AccordionsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/AccordionsCssTest.java
@@ -5,8 +5,8 @@ import com.vaadin.server.UserError;
 import com.vaadin.tests.components.uitest.TestSampler;
 import com.vaadin.ui.Accordion;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.themes.ChameleonTheme;
-import com.vaadin.ui.themes.Runo;
+import com.vaadin.v7.ui.themes.ChameleonTheme;
+import com.vaadin.v7.ui.themes.Runo;
 
 public class AccordionsCssTest {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/ButtonsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/ButtonsCssTest.java
index d18b0b0c8c..7811e5e79b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/ButtonsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/ButtonsCssTest.java
@@ -8,10 +8,10 @@ import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Link;
-import com.vaadin.ui.themes.BaseTheme;
-import com.vaadin.ui.themes.ChameleonTheme;
-import com.vaadin.ui.themes.Reindeer;
-import com.vaadin.ui.themes.Runo;
+import com.vaadin.v7.ui.themes.BaseTheme;
+import com.vaadin.v7.ui.themes.ChameleonTheme;
+import com.vaadin.v7.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Runo;
 
 public class ButtonsCssTest extends GridLayout {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/DatesCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/DatesCssTest.java
index 26e45e7541..485bf9cafc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/DatesCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/DatesCssTest.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.InlineDateField;
-import com.vaadin.ui.themes.ChameleonTheme;
+import com.vaadin.v7.ui.themes.ChameleonTheme;
 
 public class DatesCssTest extends GridLayout {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LabelsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LabelsCssTest.java
index a7655d15a0..1564d9d5b5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LabelsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LabelsCssTest.java
@@ -5,8 +5,8 @@ import com.vaadin.tests.components.uitest.TestSampler;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.themes.ChameleonTheme;
-import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.ChameleonTheme;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class LabelsCssTest extends GridLayout {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java
index 0e4cc931f3..11c9bc62bf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/LayoutsCssTest.java
@@ -16,8 +16,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.VerticalSplitPanel;
-import com.vaadin.ui.themes.ChameleonTheme;
-import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.ChameleonTheme;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class LayoutsCssTest extends GridLayout {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java
index 86458d0890..039135c4b2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java
@@ -3,7 +3,6 @@ package com.vaadin.tests.components.uitest.components;
 import com.vaadin.tests.components.uitest.TestSampler;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.themes.ChameleonTheme;
 import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.ListSelect;
@@ -11,6 +10,7 @@ import com.vaadin.v7.ui.NativeSelect;
 import com.vaadin.v7.ui.OptionGroup;
 import com.vaadin.v7.ui.Select;
 import com.vaadin.v7.ui.TwinColSelect;
+import com.vaadin.v7.ui.themes.ChameleonTheme;
 
 public class SelectsCssTest extends GridLayout {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java
index 40fcac0d82..f94e87c813 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TabSheetsCssTest.java
@@ -5,8 +5,8 @@ import com.vaadin.server.UserError;
 import com.vaadin.tests.components.uitest.TestSampler;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.themes.Reindeer;
-import com.vaadin.ui.themes.Runo;
+import com.vaadin.v7.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Runo;
 
 public class TabSheetsCssTest {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java
index 7441544a13..520722ba7b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java
@@ -7,9 +7,9 @@ import com.vaadin.server.ThemeResource;
 import com.vaadin.tests.components.uitest.TestSampler;
 import com.vaadin.tests.util.TestUtils;
 import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.themes.ChameleonTheme;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.themes.ChameleonTheme;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class TablesCssTest extends GridLayout {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
index 284914f264..15001e7189 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
@@ -4,11 +4,11 @@ import com.vaadin.tests.components.uitest.TestSampler;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.PasswordField;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.themes.ChameleonTheme;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.ui.RichTextArea;
+import com.vaadin.ui.TextField;
 import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.themes.ChameleonTheme;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class TextFieldsCssTest extends GridLayout {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/WindowsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/WindowsCssTest.java
index 18db56ea36..c65a40b946 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/WindowsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/WindowsCssTest.java
@@ -6,9 +6,9 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
-import com.vaadin.ui.themes.ChameleonTheme;
-import com.vaadin.ui.themes.Reindeer;
-import com.vaadin.ui.themes.Runo;
+import com.vaadin.v7.ui.themes.ChameleonTheme;
+import com.vaadin.v7.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Runo;
 
 public class WindowsCssTest extends VerticalLayout {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowThemes.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowThemes.java
index 3a5a21dddc..b7f8491837 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowThemes.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowThemes.java
@@ -23,7 +23,7 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractReindeerTestUI;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Window;
-import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class WindowThemes extends AbstractReindeerTestUI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.java b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.java
index 77f0d6cdda..49d32a9f43 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutSlotExpansionAndAlignment.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 @SuppressWarnings("serial")
 public class VerticalLayoutSlotExpansionAndAlignment extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
index e57fae53e2..97ec3ce616 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
@@ -8,11 +8,11 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.data.validator.AbstractValidator;
 import com.vaadin.v7.data.validator.EmailValidator;
 import com.vaadin.v7.ui.PasswordField;
 import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class SimpleLoginView extends CustomComponent
         implements View, Button.ClickListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java
index b4091e8930..3078571cf7 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java
@@ -13,12 +13,12 @@ import com.vaadin.ui.Notification;
 import com.vaadin.ui.Notification.Type;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
 import com.vaadin.v7.data.util.ObjectProperty;
 import com.vaadin.v7.ui.DateField;
 import com.vaadin.v7.ui.InlineDateField;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class SettingsView extends Panel implements View {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java b/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java
index a858d408bd..7b37a12ace 100644
--- a/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java
@@ -14,8 +14,8 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class BasicPerformanceTest extends UI {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/chameleon/ChameleonNotification.java b/uitest/src/main/java/com/vaadin/tests/themes/chameleon/ChameleonNotification.java
index 527553e4ae..ee626ef5f0 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/chameleon/ChameleonNotification.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/chameleon/ChameleonNotification.java
@@ -5,7 +5,7 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractReindeerTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Notification;
-import com.vaadin.ui.themes.ChameleonTheme;
+import com.vaadin.v7.ui.themes.ChameleonTheme;
 
 @Theme(ChameleonTheme.THEME_NAME)
 public class ChameleonNotification extends AbstractReindeerTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
index 19012a6019..d1e8fb9acc 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
@@ -16,6 +16,7 @@ import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.FormLayout;
@@ -25,7 +26,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
-import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
@@ -1214,4 +1214,4 @@ public class CalendarTest extends GridLayout implements View {
         // TODO Auto-generated method stub
 
     }
-}
\ No newline at end of file
+}
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java
index b36e53d55d..6370762e69 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java
@@ -19,11 +19,11 @@ import com.vaadin.navigator.View;
 import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.shared.ui.colorpicker.Color;
 import com.vaadin.ui.AbstractColorPicker.PopupStyle;
+import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.ui.ColorPicker;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.ValoTheme;
 
 public class ColorPickers extends VerticalLayout implements View {
     public ColorPickers() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
index b92461be8b..96c14a26aa 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
@@ -28,13 +28,13 @@ import com.vaadin.ui.AbstractDateField;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.InlineDateField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.v7.data.fieldgroup.FieldGroup;
 import com.vaadin.v7.data.util.ObjectProperty;
 import com.vaadin.v7.data.util.PropertysetItem;
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java
index df34961973..d4608a89be 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Dragging.java
@@ -44,9 +44,9 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.MenuItem;
+import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.ValoTheme;
 
 /**
  *
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
index b6eb923cb3..1332ec67ad 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
@@ -27,13 +27,13 @@ import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.RichTextArea;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.OptionGroup;
 import com.vaadin.v7.ui.TextArea;
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java
index 9d4f0a1f61..27001ed453 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/MenuBars.java
@@ -23,9 +23,9 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.Command;
 import com.vaadin.ui.MenuBar.MenuItem;
+import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.ValoTheme;
 
 public class MenuBars extends VerticalLayout implements View {
     public MenuBars() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java
index c8a75c17b1..cbd1040718 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Panels.java
@@ -25,9 +25,9 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.MenuItem;
+import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.ValoTheme;
 
 public class Panels extends VerticalLayout implements View {
     public Panels() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java
index 2bcbf1ab7a..3e8d87b353 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java
@@ -23,8 +23,8 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.PopupView;
 import com.vaadin.ui.PopupView.Content;
-import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.ui.VerticalLayout;
 
 public class PopupViews extends VerticalLayout implements View {
     public PopupViews() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java
index 642ebfd28e..309a627dbc 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tabsheets.java
@@ -26,8 +26,8 @@ import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
 import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
 import com.vaadin.ui.TabSheet.Tab;
-import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.ui.VerticalLayout;
 
 public class Tabsheets extends VerticalLayout implements View {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
index 1a84fd8718..c01d456614 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
@@ -46,9 +46,9 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.MenuItem;
+import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.UI;
-import com.vaadin.ui.themes.ValoTheme;
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.Container.Hierarchical;
 import com.vaadin.v7.data.Item;
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnExpand.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnExpand.java
index bc266d8435..d3c71ed3e4 100644
--- a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnExpand.java
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridColumnExpand.java
@@ -25,9 +25,9 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.ui.Grid;
 import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 @Theme(Reindeer.THEME_NAME)
 public class GridColumnExpand extends AbstractReindeerTestUI {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java
index 798feec48f..5c68f2f49e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java
@@ -20,7 +20,7 @@ import static org.hamcrest.Matchers.closeTo;
 
 import org.junit.Test;
 
-import com.vaadin.ui.themes.ChameleonTheme;
+import com.vaadin.v7.ui.themes.ChameleonTheme;
 
 public class UploadImmediateButtonWidthChameleonTest
         extends UploadImmediateButtonWidthTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java
index a4b0a52af7..4257a5975a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java
@@ -20,7 +20,7 @@ import static org.hamcrest.Matchers.closeTo;
 
 import org.junit.Test;
 
-import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Reindeer;
 
 public class UploadImmediateButtonWidthReindeerTest
         extends UploadImmediateButtonWidthTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java
index 71e0dde74e..6be63c856a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java
@@ -20,7 +20,7 @@ import static org.hamcrest.Matchers.closeTo;
 
 import org.junit.Test;
 
-import com.vaadin.ui.themes.Runo;
+import com.vaadin.v7.ui.themes.Runo;
 
 public class UploadImmediateButtonWidthRunoTest
         extends UploadImmediateButtonWidthTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java
index 8ae3b53f11..3cf2ef6aa7 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/MenuBarTooltipTest.java
@@ -8,10 +8,10 @@ import org.openqa.selenium.By;
 
 import com.vaadin.testbench.elements.MenuBarElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.ui.themes.ChameleonTheme;
-import com.vaadin.ui.themes.Reindeer;
-import com.vaadin.ui.themes.Runo;
 import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.themes.ChameleonTheme;
+import com.vaadin.v7.ui.themes.Reindeer;
+import com.vaadin.v7.ui.themes.Runo;
 
 public class MenuBarTooltipTest extends MultiBrowserTest {