diff --git a/src/components/Autocomplete.vue b/src/components/Autocomplete.vue
index c4c2c98b77495177fd771f591346c8b0575ede1e..6d6e04664f0047588b5643338de5ba9f6cf2c9df 100644
--- a/src/components/Autocomplete.vue
+++ b/src/components/Autocomplete.vue
@@ -24,15 +24,15 @@
         placeholder="Søk her"
         ref="autocomplete"
         color="primary"
-        :dense="$vuetify.breakpoint.smAndDown"
+        :dense="$vuetify.breakpoint.mobile"
       >
       <template v-slot:append>
         <v-divider vertical/>
         <v-menu allowOverflow: true>
         <template v-slot:activator="{ on, attrs }">
-        <v-btn min-width="0px" v-bind="attrs" v-on="on" plain depressed color = "primary" text><span v-if="$vuetify.breakpoint.mdAndUp">
+        <v-btn min-width="0px" v-bind="attrs" v-on="on" plain depressed color = "primary" text><span v-if="!$vuetify.breakpoint.mobile">
           {{$t(`dicts.${$parent.lang}`)}}
-          </span><v-icon>expand_more</v-icon></v-btn>
+          </span><span v-if="$vuetify.breakpoint.mobile">{{$parent.lang}}</span><v-icon>expand_more</v-icon></v-btn>
                 </template>
         <v-list>
           <v-list-item  v-for="item in ['bm,nn','bm','nn'].map(l => {return {label: $t(`dicts.${l}`), tag: l}})" :key="item.tag"
@@ -46,7 +46,7 @@
                 <v-dialog max-width="1200" width="1200" v-model="menuDialog" hide-overlay :fullscreen="$vuetify.breakpoint.mobile"
         :close-on-content-click="false" transition="dialog-top-transition">
           <template v-slot:activator="{ on, attrs }">
-            <v-btn v-bind="attrs" v-on="on" min-width="0px" class = "search-field-button" plain depressed color = "primary" text><span v-if="$vuetify.breakpoint.mdAndUp"></span><v-icon>more_vert</v-icon></v-btn>
+            <v-btn v-bind="attrs" v-on="on" min-width="0px" class = "search-field-button" plain depressed color = "primary" text><span v-if="!$vuetify.breakpoint.mobile"></span><v-icon>more_vert</v-icon></v-btn>
           </template>
         <Menu @close="menuDialog=false"/>
                 </v-dialog>
diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
index c8bf42adaa1645fcb4303c85632bca31ace67ec0..dccfabf45f8fd71edbfb982ceb03862b682d3092 100644
--- a/src/components/TopBar.vue
+++ b/src/components/TopBar.vue
@@ -2,7 +2,7 @@
         <v-toolbar class = "top-bar" dense dark color="primary">
       <div class="beta" :title="release">{{version_label}}</div>
       <v-spacer/>
-      <v-toolbar-items class="hidden-sm-and-down">
+      <v-toolbar-items v-if="!$vuetify.breakpoint.mobile">
       <v-divider vertical/>
       <v-btn text width="210" v-if="false" :class="$vuetify.breakpoint.name"><v-icon left>language</v-icon>Norsk (Bokmål)<v-icon right>expand_more</v-icon></v-btn>
       <v-divider vertical/>
@@ -32,7 +32,7 @@
         :close-on-content-click="false" transition="dialog-top-transition">
           <template v-slot:activator="{ on, attrs }">
             <v-btn text v-bind="attrs" v-on="on">
-              <span v-if="$vuetify.breakpoint.mdAndUp">{{$t('menu.title')}}</span><v-icon :right="!$vuetify.breakpoint.mobile">menu</v-icon></v-btn>
+              <span v-if="$vuetify.breakpoint.mobile">{{$t('menu.title')}}</span><v-icon :right="$vuetify.breakpoint.mobile">menu</v-icon></v-btn>
           </template>
         <Menu @close="menuDialog=false"/>
         </v-dialog>