diff --git a/filemanager/js/app.js b/filemanager/js/app.js
index 98e011cdae..c426abe233 100644
--- a/filemanager/js/app.js
+++ b/filemanager/js/app.js
@@ -720,7 +720,7 @@ app.classes.filemanager = AppJS.extend(
 			// Toggle button icon to the other view
 			button_widget.set_image("list_"+(view == nm.controller.VIEW_ROW ? nm.controller.VIEW_TILE : nm.controller.VIEW_ROW));
 
-			button_widget.set_label(view == nm.controller.VIEW_ROW ? this.egw.lang("Tile view") : this.egw.lang('List view'));
+			button_widget.set_statustext(view == nm.controller.VIEW_ROW ? this.egw.lang("Tile view") : this.egw.lang('List view'));
 		}
 
 		nm.set_view(view);
@@ -737,7 +737,7 @@ app.classes.filemanager = AppJS.extend(
 		{
 			template.loading.done(function() {
 				nm.applyFilters({view: view});
-			})
+			});
 		}
 	},
 
@@ -853,7 +853,7 @@ app.classes.filemanager = AppJS.extend(
 		widget.options.onFinish = function() {
 			widget.options.onFinish = old_onfinish;
 			widget.options.onFinishOne = old_onfinishone;
-		}
+		};
 		// This triggers the upload
 		widget.set_value(files);
 
@@ -893,8 +893,14 @@ app.classes.filemanager = AppJS.extend(
 						{
 							widget.set_readonly(_ro);
 						}
-						else
+						// upload
+						else if (widget.disabled != _ro)
 						{
+							// fix width of path-widget to kope with hidden/shown upload
+							var path_parent = jQuery(this.path_widget[id].getDOMNode().parentNode);
+							var width = jQuery(widget.getDOMNode()).outerWidth(true);
+							path_parent.css('right', (parseInt(path_parent.css('right'))+(_ro?-1:1)*width)+'px');
+
 							widget.set_disabled(_ro);
 						}
 					}
diff --git a/filemanager/templates/default/app.css b/filemanager/templates/default/app.css
index d85fb99fb7..6707332301 100644
--- a/filemanager/templates/default/app.css
+++ b/filemanager/templates/default/app.css
@@ -24,7 +24,7 @@
 #filemanager-index_filemanager-index-header_left {
 	float: left;
 	width: 100%;
-	margin-bottom: 1px;
+	margin-bottom: 2px;
 }
 div.filemanager_navigation {
 	position: relative;
@@ -40,13 +40,13 @@ div.filemanager_navigation > img {
 #filemanager-index_buttons {
 	float: right;
 }
-img#filemanager-index_tarp {
-	height: 22px;
+button#filemanager-index_button\[change_view\] {
+	margin-right: 20px;
 }
 div.filemanager_navigation > label {
 	position: absolute;
 	left: 56px;
-	right: 475px;
+	right: 456px;
 	font-size: 140%;
 	white-space: nowrap;
 }
diff --git a/filemanager/templates/default/index.xet b/filemanager/templates/default/index.xet
index bddb99401f..3437949c87 100644
--- a/filemanager/templates/default/index.xet
+++ b/filemanager/templates/default/index.xet
@@ -52,7 +52,6 @@
 			<hbox id="buttons">
 				<button statustext="Go to" id="button[go]" image="key_enter" background_image="true"/>
 				<buttononly statustext="Tile view" id="button[change_view]" onclick="app.filemanager.change_view" image="list_tile" background_image="true"/>
-				<image id="tarp" src="buttonseparator"/>
 				<buttononly statustext="Rename, change permissions or ownership" id="button[edit]" onclick="app.filemanager.editprefs();" image="edit" background_image="true"/>
 				<buttononly statustext="Create directory" id="button[createdir]" onclick="app.filemanager.createdir();" image="button_createdir" ro_image="createdir_disabled" background_image="true"/>
 				<buttononly statustext="Create a link" id="button[symlink]" onclick="app.filemanager.symlink();" image="link" ro_image="link_disabled" background_image="true"/>
diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css
index 69af8f1938..6c1cf06bf7 100755
--- a/filemanager/templates/pixelegg/app.css
+++ b/filemanager/templates/pixelegg/app.css
@@ -53,7 +53,7 @@
 #filemanager-index_filemanager-index-header_left {
   float: left;
   width: 100%;
-  margin-bottom: 1px;
+  margin-bottom: 2px;
 }
 div.filemanager_navigation {
   position: relative;
@@ -69,13 +69,13 @@ div.filemanager_navigation > img {
 #filemanager-index_buttons {
   float: right;
 }
-img#filemanager-index_tarp {
-  height: 22px;
+button#filemanager-index_button\[change_view\] {
+  margin-right: 20px;
 }
 div.filemanager_navigation > label {
   position: absolute;
   left: 56px;
-  right: 475px;
+  right: 456px;
   font-size: 140%;
   white-space: nowrap;
 }