diff --git a/src/App.vue b/src/App.vue
index 84d042f1..36d0915f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,7 +4,9 @@
     :dir="dir"
   >
     <page-header v-if="user" />
-    <main :class="{ 'authorizing': !user }">
+    <main
+      :class="{ 'authorizing': !user, 'bg-dark text-white': nightMode }"
+    >
       <router-view />
     </main>
     <session-expired v-if="user" />
@@ -15,7 +17,7 @@
 import PageHeader from '@/components/PageHeader';
 import SessionExpired from '@/components/SessionExpired';
 import firebase from 'firebase/app';
-import { mapState } from 'vuex';
+import { mapState, mapGetters } from 'vuex';
 import 'firebase/firestore';
 
 // TODO: store in env vars
@@ -46,6 +48,7 @@ export default {
 
   computed: {
     ...mapState(['user', 'wallpaperUrl', 'settings', 'sessionExpired']),
+    ...mapGetters(['nightMode']),
 
     userId() {
       return this.debugUserId || this.user.uid;
@@ -103,17 +106,7 @@ export default {
 
       this.loadWallpapers();
       // TODO: remove onSnapshot? May get costly $$$
-
       // TODO: track progresses as well
-      // TODO: move to actions
-      db.collection('lists').doc(this.userId)
-        .onSnapshot((doc) => {
-          if (doc.exists) {
-            const gameLists = doc.data();
-            this.$store.commit('SET_GAME_LISTS_LEGACY', gameLists);
-          }
-        });
-
 
       // TODO: move to actions
       db.collection('settings').doc(this.userId)
@@ -164,9 +157,6 @@ export default {
 </style>
 
 <style lang="scss" rel="stylesheet/scss" scoped>
-  #app {
-  }
-
   main {
     position: fixed;
     left: 50px;
diff --git a/src/components/Icon.vue b/src/components/Icon.vue
index 228b3f6e..874e477d 100644
--- a/src/components/Icon.vue
+++ b/src/components/Icon.vue
@@ -1,11 +1,13 @@
 <template lang="html">
   <img
     :src="`static/octicons/${name}.svg`"
-    :class="{ white, animated, small }"
+    :class="{ white, animated, small, invert: nightMode }"
   />
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
+
 export default {
   props: {
     name: {
@@ -16,6 +18,10 @@ export default {
     animated: Boolean,
     small: Boolean,
   },
+
+  computed: {
+    ...mapGetters(['nightMode']),
+  },
 };
 </script>
 
@@ -30,11 +36,18 @@ img {
     filter: invert(1);
   }
 
+  width: 22px;
+  height: 22px;
+
   &.small {
     width: 16px;
     height: 16px;
   }
 
+  &.invert {
+    filter: invert(1);
+  }
+
   &.animated {
     animation: spin 500ms linear infinite;
     transform:rotate(360deg);