6 files changed, 24 insertions, 10 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 3bc6640481c..287dedc23f2 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -230,10 +230,9 @@ table td.filename a.name {
 }
 table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
 table td.filename input.filename {
-	width: 80%;
-	font-size: 14px;
-	margin-top: 0;
-	margin-left: 2px;
+	width: 70%;
+	margin-top: 1px;
+	margin-left: 48px;
 	cursor: text;
 }
 table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:3px 8px 8px 3px; }
@@ -326,6 +325,7 @@ table td.filename .uploadtext {
 	filter: alpha(opacity=0);
 	opacity: 0;
 	float: left;
+	top: 0;
 	margin: 32px 0 4px 32px; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/
 }
 /* Show checkbox when hovering, checked, or selected */
@@ -356,6 +356,7 @@ table td.filename .uploadtext {
 }
 #fileList tr td.filename>input[type="checkbox"] + label {
 	left: 0;
+	top: 0;
 }
 .select-all + label {
 	top: 0;
@@ -472,12 +473,12 @@ a.action>img {
 }
 
 .summary td {
-	padding-top: 8px;
-	padding-bottom: 8px;
+	padding-top: 20px;
+	padding-bottom: 250px;
 	border-bottom: none;
 }
 .summary .info {
-	margin-left: 55px;
+	margin-left: 40px;
 }
 
 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index fe876899b4a..780b7ac8443 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -22,6 +22,10 @@ table td.date {
 table td {
 	padding: 0;
 }
+/* and accordingly fix left margin of file list summary on mobile */
+.summary .info {
+	margin-left: 55px;
+}
 
 /* remove shift for multiselect bar to account for missing navigation */
 table.multiselect thead {
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 3944d8438dd..2476beac1fb 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -13,7 +13,7 @@
 <header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
 		<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
 			title="" id="owncloud">
-			<div class="logo-icon svg"></div>
+			<div class="logo-wide svg"></div>
 		</a>
 		<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 		<div class="header-right">
diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css
index 64e462e2e8a..15a9249d7b2 100644
--- a/apps/files_trashbin/css/trash.css
+++ b/apps/files_trashbin/css/trash.css
@@ -15,3 +15,6 @@
 #app-content-trashbin .summary :last-child {
 	padding: 0;
 }
+#app-content-trashbin #filestable .summary .filesize {
+	display: none;
+}
diff --git a/core/css/mobile.css b/core/css/mobile.css
index 0a74178937d..6e2172ddbb7 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -21,6 +21,14 @@
 	box-align: center;
 }
 
+/* on mobile, show logo-icon instead of logo-wide */
+#header .logo-wide {
+	background-image: url(../img/logo-icon.svg);
+	background-repeat: no-repeat;
+	width: 62px;
+	height: 34px;
+}
+
 /* compress search box on mobile, expand when focused */
 .searchbox input[type="search"] {
 	width: 15%;
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index e7a9f249363..1c0f3eef840 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -282,7 +282,6 @@ var UserList = {
 		if (UserList.updating) {
 			return;
 		}
-		$userList.css('display', 'none');
 		$userList.siblings('.loading').css('visibility', 'visible');
 		UserList.updating = true;
 		if(gid === undefined) {
@@ -311,7 +310,6 @@ var UserList = {
 					});
 					if (result.data.length > 0) {
 						UserList.doSort();
-						$userList.css('display', 'block');
 						$userList.siblings('.loading').css('visibility', 'hidden');
 					}
 					else {