diff --git a/filemanager/templates/default/sharing.css b/filemanager/templates/default/sharing.css
index 62424577c9..1100c449b6 100644
--- a/filemanager/templates/default/sharing.css
+++ b/filemanager/templates/default/sharing.css
@@ -19,7 +19,8 @@ div#popupMainDiv {
  * simplify NM UI for sharing
  */
 div#filemanager-index_buttons img, div#filemanager-index_favorite_wrapper,
-div.header_row_right, span.header_count, select#filemanager-index_filter, span.selectcols {
+span.header_count, #filemanager-index_button\[edit\], #filemanager-index_button\[symlink\],
+select#filemanager-index_filter, span.selectcols, #filemanager-index_filemanager-index-header_right > button:last-child {
 	display: none !important;
 }
 div#filemanager-index_buttons img#filemanager-index_button\[change_view\] {
@@ -62,8 +63,8 @@ div.nextmatch_header {
 
 div.search {
   position: relative;
-  width: 40%;
-  right: 30px;
+  width: 35%;
+  right: 6px;
   max-width: 98%;
   top: 0;
   float: right !important;
diff --git a/filemanager/templates/pixelegg/sharing.css b/filemanager/templates/pixelegg/sharing.css
index 261b1d21f6..54ed08fdea 100644
--- a/filemanager/templates/pixelegg/sharing.css
+++ b/filemanager/templates/pixelegg/sharing.css
@@ -18,10 +18,12 @@ div#popupMainDiv {
  */
 div#filemanager-index_buttons img,
 div#filemanager-index_favorite_wrapper,
-div.header_row_right,
 span.header_count,
+#filemanager-index_button\[edit\],
+#filemanager-index_button\[symlink\],
 select#filemanager-index_filter,
-span.selectcols {
+span.selectcols,
+#filemanager-index_filemanager-index-header_right > button:last-child {
   display: none !important;
 }
 div#filemanager-index_buttons img#filemanager-index_button\[change_view\] {
@@ -58,8 +60,8 @@ div.nextmatch_header {
 }
 div.search {
   position: relative;
-  width: 40%;
-  right: 30px;
+  width: 35%;
+  right: 6px;
   max-width: 98%;
   top: 0;
   float: right !important;
@@ -79,32 +81,9 @@ div.search .et2_searchbox .flex {
  * @copyright (c) 2014/15 by Ralf Becker <rb@stylite.de>
  * @version $Id$
  */
-div#filemanager-index_buttons img#filemanager-index_button\[change_view\] {
-  right: 418px;
-  top: 10px;
-}
-div.filemanager_navigation {
-  margin: 0px !important;
-}
-div.search {
-  position: relative;
-  width: 40%;
-  right: 30px;
-  max-width: 98%;
-  top: 0;
-  float: right !important;
-}
-div.search .et2_searchbox .flex {
-  width: 100%;
-  float: right;
-  padding-right: 0;
-}
 div#filemanager-index_buttons div.et2_file {
   margin-top: 6px;
 }
-div.filemanager_navigation > label {
-  right: 485px !important;
-}
 div#popupMainDiv:before {
   content: ' ';
   width: 100%;
diff --git a/filemanager/templates/pixelegg/sharing.less b/filemanager/templates/pixelegg/sharing.less
index 55f67a8435..af50b9d1c1 100644
--- a/filemanager/templates/pixelegg/sharing.less
+++ b/filemanager/templates/pixelegg/sharing.less
@@ -11,39 +11,10 @@
  * @version $Id$
  */
 
-div#filemanager-index_buttons img#filemanager-index_button\[change_view\] {
-	right: 418px;
-	top: 10px;
-}
-
-div.filemanager_navigation {
-	margin: 0px !important;
-}
-
-div.search {
-    position: relative;
-    width: 40%;
-    right: 30px;
-    max-width: 98%;
-    top: 0;
-	float:right !important;
-	.et2_searchbox {
-		.flex {
-			width: 100%;
-			float: right;
-			padding-right: 0;
-
-		}
-	}
-}
-
 div#filemanager-index_buttons div.et2_file {
 	margin-top: 6px;
 }
 
-div.filemanager_navigation > label {
-  right: 485px !important;
-}
 div#popupMainDiv {
 	&:before {
 		content: ' ';
@@ -71,8 +42,6 @@ form#filemanager-index {
 		bottom: 0;
 		left: 0;
 	}
-
 	margin-left: 200px !important;
 	margin-right: 200px !important;
-
 }