diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 78c75e5..e403441 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -17,9 +17,12 @@
     <div class="ui divider"></div>
     </template>
     <router-view/>
-    <button @click="language = 'en'">EN</button>
-    <button @click="language = 'de'">DE</button>
-    <button @click="language = 'fr'">FR</button>
+
+    <div class="lang-switcher">
+      <a @click="language = 'en'"><i class="gb flag"></i></a>
+      <a @click="language = 'de'"><i class="de flag"></i></a>
+      <a @click="language = 'fr'"><i class="fr flag"></i></a>
+    </div>
     <notifications position="bottom left" />
   </div>
 </template>
@@ -77,4 +80,12 @@ export default {
     -moz-border-radius: 3px;
     border-radius: 3px;
   }
+
+  a, a:hover, a:focus, a:active{
+    cursor: pointer;
+  }
+
+  .lang-switcher{
+    float: right;
+  }
 </style>