diff --git a/client/index.html b/client/index.html
index 66402ae..f6deb56 100644
--- a/client/index.html
+++ b/client/index.html
@@ -201,14 +201,14 @@
             <path d="M0 0h24v24H0z" fill="none" />
             <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1.41 16.09V20h-2.67v-1.93c-1.71-.36-3.16-1.46-3.27-3.4h1.96c.1 1.05.82 1.87 2.65 1.87 1.96 0 2.4-.98 2.4-1.59 0-.83-.44-1.61-2.67-2.14-2.48-.6-4.18-1.62-4.18-3.67 0-1.72 1.39-2.84 3.11-3.21V4h2.67v1.95c1.86.45 2.79 1.86 2.85 3.39H14.3c-.05-1.11-.64-1.87-2.22-1.87-1.5 0-2.4.68-2.4 1.64 0 .84.65 1.39 2.67 1.91s4.18 1.39 4.18 3.91c-.01 1.83-1.38 2.83-3.12 3.16z" />
         </symbol>
-        <symbol id="icon-theme" viewBox="0 0 40 40">
-          <circle cx="20" cy="20" r="16"/>
+        <symbol id="icon-theme" viewBox="0 0 24 24">
+         <rect fill="none" height="24" width="24"/><path d="M12,3c-4.97,0-9,4.03-9,9s4.03,9,9,9s9-4.03,9-9c0-0.46-0.04-0.92-0.1-1.36c-0.98,1.37-2.58,2.26-4.4,2.26 c-2.98,0-5.4-2.42-5.4-5.4c0-1.81,0.89-3.42,2.26-4.4C12.92,3.04,12.46,3,12,3L12,3z"/>
         </symbol>
     </svg>
     <!-- Scripts -->
     <script src="scripts/network.js"></script>
-    <script src="scripts/theme.js"></script>
     <script src="scripts/ui.js"></script>
+    <script src="scripts/theme.js" async></script>
     <script src="scripts/clipboard.js" async></script>
     <!-- Sounds -->
     <audio id="blop" autobuffer="true">
diff --git a/client/service-worker.js b/client/service-worker.js
index 9cec2d7..67bab2a 100644
--- a/client/service-worker.js
+++ b/client/service-worker.js
@@ -5,6 +5,7 @@ var urlsToCache = [
   '/scripts/network.js',
   '/scripts/ui.js',
   '/scripts/clipboard.js',
+  '/scripts/theme.js',
   '/sounds/blop.mp3',
   '/images/favicon-96x96.png'
 ];