diff --git a/client/src/components/Header.vue b/client/src/components/Header.vue
index 9b1965c..d776925 100644
--- a/client/src/components/Header.vue
+++ b/client/src/components/Header.vue
@@ -8,14 +8,16 @@
 
         <img class="title-image" v-if="configLoaded && titleImageUrl" v-bind:src="titleImageUrl" v-bind:alt="indexName" />
       </h1>
+    
+      <template v-if="!smallFormat">
+        <h4>
+          <div v-translate>A search engine of <a href="https://joinpeertube.org" target="_blank">PeerTube</a> videos and channels</div>
 
-      <h4>
-        <div v-translate>A search engine of <a href="https://joinpeertube.org" target="_blank">PeerTube</a> videos and channels</div>
+          <div v-translate>Developed by <a href="https://framasoft.org" target="_blank">Framasoft</a></div>
+        </h4>
 
-        <div v-translate>Developed by <a href="https://framasoft.org" target="_blank">Framasoft</a></div>
-      </h4>
-
-      <img class="search-home" v-bind:src="searchImageUrl" alt="">
+        <img class="search-home" v-bind:src="searchImageUrl" alt="">
+      </template>
     </header>
   </div>
 </template>
@@ -119,7 +121,8 @@
     },
 
     props: {
-      indexName: String
+      indexName: String,
+      smallFormat: Boolean,
     },
 
     async mounted () {
diff --git a/client/src/components/InterfaceLanguageDropdown.vue b/client/src/components/InterfaceLanguageDropdown.vue
index c707963..66cf6b8 100644
--- a/client/src/components/InterfaceLanguageDropdown.vue
+++ b/client/src/components/InterfaceLanguageDropdown.vue
@@ -3,7 +3,7 @@
     <img :title="imgTitle" v-on:click="toggleShow()" class="interface-language" src="/img/interface-languages.svg" alt="Change interface language">
 
     <div v-if="showMenu" class="menu">
-      <a v-for="(lang, locale) in $language.available" :key="locale" :href="'/' + locale + '/'" class="menu-item">
+      <a v-for="(lang, locale) in $language.available" :key="locale" :href="buildLanguageRoute(locale)" class="menu-item">
         {{lang}}
       </a>
 
@@ -87,6 +87,15 @@
     methods: {
       toggleShow () {
         this.showMenu = !this.showMenu;
+      },
+      buildLanguageRoute(locale: string) {
+        const paths = this.$route.fullPath.split('/')
+
+        if (paths.length > 0 && this.$language.available.hasOwnProperty(paths[0])) {
+          return "/" + locale + "/" + paths.slice(1).join("/")
+        } else {
+          return "/" + locale + this.$route.fullPath
+        }
       }
     }
   })
diff --git a/client/src/views/Search.vue b/client/src/views/Search.vue
index 7a637e7..082e317 100644
--- a/client/src/views/Search.vue
+++ b/client/src/views/Search.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <my-header v-if="!searchDone" v-bind:indexName="indexName"></my-header>
-    <router-link v-else class="header-left-logo" to="/" @click.native="simpleFormReset(false)" :title="homeTitleMessage">
+    <my-header v-bind:indexName="indexName" v-bind:smallFormat="searchDone"></my-header>
+    <router-link v-if="searchDone" class="header-left-logo" to="/" @click.native="simpleFormReset(false)" :title="homeTitleMessage">
       <img src="/img/peertube-logo.svg" alt="">
     </router-link>