diff --git a/Gruntfile.js b/Gruntfile.js
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -17,5 +17,5 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-webpack');
-  grunt.registerTask('default', ['less:production', 'less:components',  'concat:polymercss', 'copy', 'webpack', 'concat:dist']);
+  grunt.registerTask('default', ['less:production', 'less:components', 'copy', 'webpack', 'concat:dist']);
 };
diff --git a/grunt_config.json b/grunt_config.json
--- a/grunt_config.json
+++ b/grunt_config.json
@@ -1,8 +1,8 @@
 {
   "dirs": {
     "css": {
-      "src":"rhodecode/public/css",
-      "dest":"rhodecode/public/css"
+      "src": "rhodecode/public/css",
+      "dest": "rhodecode/public/css"
     },
     "js": {
       "src": "rhodecode/public/js/src",
@@ -13,22 +13,21 @@
   },
   "copy": {
     "main": {
-      "expand": true,
-      "cwd": "node_modules/@webcomponents",
-      "src": "webcomponentsjs/*.*",
-      "dest": "<%= dirs.js.dest %>/vendors"
+      "files": [
+        {
+          "expand": true,
+          "cwd": "node_modules/@webcomponents",
+          "src": "webcomponentsjs/*.*",
+          "dest": "<%= dirs.js.dest %>/vendors"
+        },
+        {
+          "src": "<%= dirs.css.src %>/style-polymer.css",
+          "dest": "<%= dirs.js.dest %>/src/components/style-polymer.css"
+        }
+      ]
     }
   },
   "concat": {
-    "polymercss": {
-      "src": [
-        "<%= dirs.js.src %>/components/root-styles-prefix.html",
-        "<%= dirs.css.src %>/style-polymer.css",
-        "<%= dirs.js.src %>/components/root-styles-suffix.html"
-      ],
-      "dest": "<%= dirs.js.dest %>/src/components/root-styles.gen.html",
-      "nonull": true
-    },
     "dist": {
       "src": [
         "<%= dirs.js.node_modules %>/jquery/dist/jquery.min.js",
diff --git a/rhodecode/public/js/src/components/index.js b/rhodecode/public/js/src/components/index.js
--- a/rhodecode/public/js/src/components/index.js
+++ b/rhodecode/public/js/src/components/index.js
@@ -1,5 +1,5 @@
 import '@polymer/iron-ajax/iron-ajax.js';
-import './root-styles.gen.html';
+import './shared-styles.js';
 import './channelstream-connection/channelstream-connection.js';
 import './rhodecode-toast/rhodecode-toast.js';
 import './rhodecode-toggle/rhodecode-toggle.js';
diff --git a/rhodecode/public/js/src/components/root-styles-prefix.html b/rhodecode/public/js/src/components/root-styles-prefix.html
deleted file mode 100644
--- a/rhodecode/public/js/src/components/root-styles-prefix.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<dom-module id="shared-styles">
-    <template>
-        <style>
diff --git a/rhodecode/public/js/src/components/root-styles-suffix.html b/rhodecode/public/js/src/components/root-styles-suffix.html
deleted file mode 100644
--- a/rhodecode/public/js/src/components/root-styles-suffix.html
+++ /dev/null
@@ -1,3 +0,0 @@
-        </style>
-    </template>
-</dom-module>
diff --git a/rhodecode/public/js/src/components/shared-styles.js b/rhodecode/public/js/src/components/shared-styles.js
new file mode 100644
--- /dev/null
+++ b/rhodecode/public/js/src/components/shared-styles.js
@@ -0,0 +1,11 @@
+const styleElement = document.createElement('dom-module');
+import sharedCSS from 'raw-loader!./style-polymer.css';
+
+styleElement.innerHTML =
+    `<template>
+   <style>
+   ${sharedCSS}
+</style>
+ </template>`;
+
+styleElement.register('shared-styles');