diff --git a/app/assets/stylesheets/content/work_packages/fullscreen/_back_button.sass b/app/assets/stylesheets/content/work_packages/fullscreen/_back_button.sass
index a920cfb144..0f8338aff0 100644
--- a/app/assets/stylesheets/content/work_packages/fullscreen/_back_button.sass
+++ b/app/assets/stylesheets/content/work_packages/fullscreen/_back_button.sass
@@ -15,8 +15,9 @@
 
   @media only screen and (max-width: 679px)
     // Move button in the current reverse order to front
-    order: +1
-    padding-right: 0px
+    position: absolute
+    top: 10px
+    z-index: 1
 
     a
       width: 100%
diff --git a/app/assets/stylesheets/layout/_breadcrumb.sass b/app/assets/stylesheets/layout/_breadcrumb.sass
index 5e424ac0a3..f525bffb1a 100644
--- a/app/assets/stylesheets/layout/_breadcrumb.sass
+++ b/app/assets/stylesheets/layout/_breadcrumb.sass
@@ -117,3 +117,18 @@ body.action-show .wp-breadcrumb
 // Hide projects in normal mode
 body:not(.accessibility-mode) .breadcrumb .breadcrumb-project-element
   display: none
+
+@media only screen and (max-width: 679px)
+  wp-breadcrumb
+    margin-top: 40px
+  .wp-breadcrumb
+    margin: 10px 0 0 0
+    ul.breadcrumb
+      line-height: 1.25
+      li
+        display: inline
+        float: unset
+        line-height: inherit
+        white-space: normal
+        margin: 0 10px 0 0
+
diff --git a/app/assets/stylesheets/layout/_work_package_mobile.sass b/app/assets/stylesheets/layout/_work_package_mobile.sass
index 06fa24a95b..df752ceda6 100644
--- a/app/assets/stylesheets/layout/_work_package_mobile.sass
+++ b/app/assets/stylesheets/layout/_work_package_mobile.sass
@@ -175,7 +175,5 @@
       justify-content: flex-end
       .toolbar-item
         flex-grow: 0
-    .wp-show--header-container
-      z-index: 2
     .work-packages-full-view--split-container
       border-top: none
diff --git a/frontend/app/components/routing/wp-show/wp.show.html b/frontend/app/components/routing/wp-show/wp.show.html
index d7c5e31e87..8aa67434e2 100644
--- a/frontend/app/components/routing/wp-show/wp.show.html
+++ b/frontend/app/components/routing/wp-show/wp.show.html
@@ -2,7 +2,7 @@
      class="work-packages--show-view"
      ng-if="$ctrl.workPackage">
 
-    <wp-breadcrumb work-package="$ctrl.workPackage" class="hidden-for-mobile"></wp-breadcrumb>
+    <wp-breadcrumb work-package="$ctrl.workPackage"></wp-breadcrumb>
 
     <div class="toolbar-container">
       <div id="toolbar">
@@ -42,7 +42,6 @@
                     locals="permittedActions,actionsAvailable,triggerMoreMenuAction"
                     title="{{I18n.t('js.button_more')}}">
               <op-icon icon-classes="button--icon icon-show-more"></op-icon>
-              <span class="button--text hidden-for-desktop">{{I18n.t('js.button_more')}}</span>
             </button>
           </li>
         </ul>
diff --git a/frontend/app/components/work-packages/wp-watcher-button/wp-watcher-button.directive.html b/frontend/app/components/work-packages/wp-watcher-button/wp-watcher-button.directive.html
index ca42922bf6..c821c633d4 100644
--- a/frontend/app/components/work-packages/wp-watcher-button/wp-watcher-button.directive.html
+++ b/frontend/app/components/work-packages/wp-watcher-button/wp-watcher-button.directive.html
@@ -3,5 +3,5 @@
 
   <op-icon icon-classes="button--icon {{vm.watchIconClass}}"></op-icon>
 
-  <span class="button--text" ng-class="vm.showText ? ''  : 'hidden-for-desktop'" ng-bind="vm.buttonText"></span>
+  <span class="button--text" ng-if="vm.showText" ng-bind="vm.buttonText"></span>
 </button>