diff --git a/app/assets/stylesheets/darkswarm/menu.css.scss b/app/assets/stylesheets/darkswarm/menu.css.scss
index 87e731133c8..6d9724d8541 100644
--- a/app/assets/stylesheets/darkswarm/menu.css.scss
+++ b/app/assets/stylesheets/darkswarm/menu.css.scss
@@ -13,6 +13,33 @@ nav.top-bar {
   height: $topbar-height;
 }
 
+@media #{$large-only} {
+  .top-bar__menu-item-with-icon span {
+    display: none;
+  }
+
+  .top-bar__current-hub-prefix {
+    display: none;
+  }
+
+  .top-bar__current-hub-name {
+    display: inline-block;
+    max-width: 10em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.top-bar-section ul li > a.top-bar__menu-item-with-icon {
+  display: inline;
+}
+
+.top-bar__menu-item-with-icon i,
+.top-bar__menu-item-with-icon img {
+  line-height: $topbar-height;
+}
+
 .top-bar-section {
   a.icon {
     &:hover {
diff --git a/app/assets/stylesheets/darkswarm/variables.css.scss b/app/assets/stylesheets/darkswarm/variables.css.scss
index bf1db3eadcf..58973f47eba 100644
--- a/app/assets/stylesheets/darkswarm/variables.css.scss
+++ b/app/assets/stylesheets/darkswarm/variables.css.scss
@@ -15,6 +15,7 @@ $brand-colour: #f27052;
 // Topbar
 $topbar-height: rem-calc(64);
 $topbar-link-padding: $topbar-height / 3;
+$topbar-arrows: false;
 
 $topbar-bg: $white;
 $topbar-bg-color: $topbar-bg;
diff --git a/app/views/shared/menu/_language_selector.html.haml b/app/views/shared/menu/_language_selector.html.haml
index 3e38095272a..2a5dd1439e6 100644
--- a/app/views/shared/menu/_language_selector.html.haml
+++ b/app/views/shared/menu/_language_selector.html.haml
@@ -1,8 +1,8 @@
 %li.language-switcher.has-dropdown
-  %a{href: '#'}
+  %a{href: '#', class: "top-bar__menu-item-with-icon"}
     %i.ofn-i_071-globe
     %span= t 'language_name'
   %ul.dropdown
     - OpenFoodNetwork::I18nConfig.selectable_locales.each do |l|
       %li
-        %a{href: "?locale=#{l.to_s}" }= t('language_name', locale: l)
\ No newline at end of file
+        %a{href: "?locale=#{l.to_s}" }= t('language_name', locale: l)
diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml
index 933fee7d93d..a756ebfc11d 100644
--- a/app/views/shared/menu/_large_menu.html.haml
+++ b/app/views/shared/menu/_large_menu.html.haml
@@ -29,8 +29,9 @@
 
       %li.current_hub{"ng-controller" => "CurrentHubCtrl", "ng-show" => "CurrentHub.hub.id", "ng-cloak" => true}
         %a{href: main_app.shop_path}
-          = t 'label_shopping'
-          = '@'
-          %span {{ CurrentHub.hub.name | truncate:25 }}
+          %span{ class: "top-bar__current-hub-prefix" }
+            = t 'label_shopping'
+            = '@'
+          %span{ class: "top-bar__current-hub-name" } {{ CurrentHub.hub.name | truncate:25 }}
       %li.cart{"ng-cloak" => true}
         = render partial: "shared/menu/cart"
diff --git a/app/views/shared/menu/_signed_in.html.haml b/app/views/shared/menu/_signed_in.html.haml
index 404600046df..063e98e9cc2 100644
--- a/app/views/shared/menu/_signed_in.html.haml
+++ b/app/views/shared/menu/_signed_in.html.haml
@@ -6,7 +6,7 @@
 
 %li.user-menu.has-dropdown.not-click
 
-  %a{href: "#"}
+  %a{href: "#", class: "top-bar__menu-item-with-icon"}
     %img{ src: "/assets/menu/icn-profile.svg" }
     %span
       = t '.profile'