diff --git a/dashboard-ui/thirdparty/emby-icons.html b/dashboard-ui/bower_components/emby-icons/emby-icons.html
similarity index 99%
rename from dashboard-ui/thirdparty/emby-icons.html
rename to dashboard-ui/bower_components/emby-icons/emby-icons.html
index 76200f572..a95f5abbe 100644
--- a/dashboard-ui/thirdparty/emby-icons.html
+++ b/dashboard-ui/bower_components/emby-icons/emby-icons.html
@@ -31,8 +31,8 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
 @demo demo/index.html
 -->
 
-<link rel="import" href="../bower_components/iron-icon/iron-icon.html">
-<link rel="import" href="../bower_components/iron-iconset-svg/iron-iconset-svg.html">
+<link rel="import" href="../iron-icon/iron-icon.html">
+<link rel="import" href="../iron-iconset-svg/iron-iconset-svg.html">
 <iron-iconset-svg name="icons" size="24">
     <svg>
         <defs>
diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json
index ebb18c5b7..52d44c190 100644
--- a/dashboard-ui/bower_components/iron-selector/.bower.json
+++ b/dashboard-ui/bower_components/iron-selector/.bower.json
@@ -36,7 +36,7 @@
     "tag": "v1.0.8",
     "commit": "e9a66727f3da0446f04956d4e4f1dcd51cdec2ff"
   },
-  "_source": "git://github.com/polymerelements/iron-selector.git",
+  "_source": "git://github.com/PolymerElements/iron-selector.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-selector"
+  "_originalSource": "PolymerElements/iron-selector"
 }
\ No newline at end of file
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index fb773a06b..260f75130 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1765,6 +1765,12 @@ var AppInfo = {};
 
         var bowerPath = "bower_components";
 
+        // Put the version into the bower path since we can't easily put a query string param on html imports
+        // Emby server will handle this
+        if (!Dashboard.isRunningInCordova()) {
+            bowerPath += window.dashboardVersion;
+        }
+
         var paths = {
             velocity: bowerPath + "/velocity/velocity.min",
             tvguide: 'components/tvguide/tvguide',
@@ -1809,6 +1815,8 @@ var AppInfo = {};
         define("cryptojs-md5", ["apiclient/md5"]);
 
         // Done
+        define("emby-icons", ["html!" + bowerPath + "/emby-icons/emby-icons.html"]);
+
         define("paper-spinner", ["html!" + bowerPath + "/paper-spinner/paper-spinner.html"]);
         define("paper-toast", ["html!" + bowerPath + "/paper-toast/paper-toast.html"]);
         define("paper-slider", ["html!" + bowerPath + "/paper-slider/paper-slider.html"]);
@@ -2069,7 +2077,7 @@ var AppInfo = {};
             var promises = [];
             deps = [];
             deps.push('thirdparty/jquery.unveil-custom.js');
-            deps.push('html!thirdparty/emby-icons.html');
+            deps.push('emby-icons');
             deps.push('paper-icon-button');
             deps.push('paper-button');
             deps.push('thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js');