diff --git a/bower.json b/bower.json
index 0aaa129adc..5db2c707cf 100644
--- a/bower.json
+++ b/bower.json
@@ -48,71 +48,11 @@
     "paper-toast": "PolymerElements/paper-toast#^2.0.0",
     "paper-toggle-button": "PolymerElements/paper-toggle-button#^2.0.0",
     "polymer": "Polymer/polymer#~2.0.2",
-    "polymer-sortablejs": "^0.1.3",
     "vaadin-combo-box": "vaadin/vaadin-combo-box#^2.0.0",
     "vaadin-date-picker": "vaadin/vaadin-date-picker#^2.0.0",
     "web-animations-js": "^2.2.5",
     "webcomponentsjs": "1.0.4"
   },
-  "resolutions": {
-    "iron-a11y-announcer": "^2.0.0",
-    "iron-a11y-keys-behavior": "^2.0.0",
-    "iron-ajax": "^2.0.0",
-    "iron-autogrow-textarea": "^2.0.0",
-    "iron-behaviors": "^2.0.0",
-    "iron-checked-element-behavior": "^2.0.0",
-    "iron-dropdown": "^2.0.0",
-    "iron-fit-behavior": "^2.0.0",
-    "iron-flex-layout": "^2.0.0",
-    "iron-form": "2.0-preview",
-    "iron-form-element-behavior": "^2.0.0",
-    "iron-icon": "^2.0.0",
-    "iron-iconset-svg": "^2.0.1",
-    "iron-image": "^2.0.0",
-    "iron-input": "^2.0.0",
-    "iron-jsonp-library": "^2.0.0",
-    "iron-list": "^2.0.4",
-    "iron-location": "^2.0.1",
-    "iron-media-query": "^2.0.0",
-    "iron-menu-behavior": "^2.0.0",
-    "iron-meta": "^2.0.2",
-    "iron-overlay-behavior": "^2.0.0",
-    "iron-pages": "^2.0.0",
-    "iron-range-behavior": "^2.0.0",
-    "iron-resizable-behavior": "^2.0.1",
-    "iron-scroll-target-behavior": "^2.0.0",
-    "iron-selector": "^2.0.0",
-    "iron-validatable-behavior": "^2.0.0",
-    "paper-behaviors": "^2.0.0",
-    "paper-button": "^2.0.0",
-    "paper-card": "^2.0.0",
-    "paper-checkbox": "^2.0.0",
-    "paper-dialog": "^2.0.0",
-    "paper-dialog-behavior": "^2.0.0",
-    "paper-dialog-scrollable": "^2.0.0",
-    "paper-drawer-panel": "^2.0.0",
-    "paper-dropdown-menu": "^2.0.0",
-    "paper-fab": "^2.0.0",
-    "paper-icon-button": "^2.0.0",
-    "paper-input": "^2.0.1",
-    "paper-item": "^2.0.0",
-    "paper-listbox": "^2.0.0",
-    "paper-material": "^2.0.0",
-    "paper-menu-button": "^2.0.0",
-    "paper-progress": "^2.0.0",
-    "paper-radio-button": "^2.0.0",
-    "paper-radio-group": "^2.0.0",
-    "paper-ripple": "^2.0.0",
-    "paper-scroll-header-panel": "^2.0.0",
-    "paper-slider": "^2.0.0",
-    "paper-spinner": "^2.0.0",
-    "paper-styles": "^2.0.0",
-    "paper-tabs": "^2.0.0",
-    "paper-toast": "^2.0.0",
-    "paper-toggle-button": "^2.0.0",
-    "polymer": "^2.0.2",
-    "webcomponentsjs": "1.0.4"
-  },
   "devDependencies": {
     "web-component-tester": "^6.0.0"
   }
diff --git a/src/components/ha-label-badge.html b/src/components/ha-label-badge.html
index 18beeb1753..bfb2537735 100644
--- a/src/components/ha-label-badge.html
+++ b/src/components/ha-label-badge.html
@@ -67,10 +67,6 @@
       line-height: normal;
     }
 
-    iron-image {
-      border-radius: 50%;
-    }
-
     [hidden] {
       display: none !important;
     }
diff --git a/src/components/ha-service-description.html b/src/components/ha-service-description.html
index af3f6c9a2c..dc296f4095 100644
--- a/src/components/ha-service-description.html
+++ b/src/components/ha-service-description.html
@@ -1,4 +1,4 @@
-<link rel="import" href="../../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../bower_components/polymer/polymer.html">
 
 <dom-module id='ha-service-description'>
   <template>