diff --git a/src/App.js b/src/App.js
index c326ddfc..03421c62 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,15 +1,13 @@
 import UserPanel from './components/user_panel/user_panel.vue'
 import NavPanel from './components/nav_panel/nav_panel.vue'
 import Notifications from './components/notifications/notifications.vue'
-import StyleSwitcher from './components/style_switcher/style_switcher.vue'
 
 export default {
   name: 'app',
   components: {
     UserPanel,
     NavPanel,
-    Notifications,
-    StyleSwitcher
+    Notifications
   },
   data: () => ({
     mobileActivePanel: 'timeline'
diff --git a/src/App.scss b/src/App.scss
index c820779a..e5d4c74f 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -256,3 +256,8 @@ nav {
         display: flex;
     }
 }
+
+.item.right {
+    text-align: right;
+    padding-right: 20px;
+}
diff --git a/src/App.vue b/src/App.vue
index d2b07d2b..fc510fda 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,9 @@
         <div class='item'>
           <a route-to='friends-timeline' href="#">{{sitename}}</a>
         </div>
-        <style-switcher></style-switcher>
+        <div class='item right'>
+          <router-link :to="{ name: 'settings'}"><i class="icon-cog"></i></router-link>
+        </div>
       </div>
     </nav>
     <div class="container" id="content">
diff --git a/src/main.js b/src/main.js
index 84db5c86..9917ccd9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,7 @@ import FriendsTimeline from './components/friends_timeline/friends_timeline.vue'
 import ConversationPage from './components/conversation-page/conversation-page.vue'
 import Mentions from './components/mentions/mentions.vue'
 import UserProfile from './components/user_profile/user_profile.vue'
+import Settings from './components/settings/settings.vue'
 
 import statusesModule from './modules/statuses.js'
 import usersModule from './modules/users.js'
@@ -48,7 +49,8 @@ const routes = [
   { path: '/main/friends', component: FriendsTimeline },
   { name: 'conversation', path: '/notice/:id', component: ConversationPage },
   { name: 'user-profile', path: '/users/:id', component: UserProfile },
-  { name: 'mentions', path: '/:username/mentions', component: Mentions }
+  { name: 'mentions', path: '/:username/mentions', component: Mentions },
+  { name: 'settings', path: '/settings', component: Settings }
 ]
 
 const router = new VueRouter({