diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index c41255b9868bf..bd57f1907f512 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -52,10 +52,6 @@
 	min-width: 500px;
 }
 
-#filestable tbody tr {
-	height: 51px;
-}
-
 /* fit app list view heights */
 .app-files #app-content>.viewcontainer {
 	min-height: 0%;
@@ -132,7 +128,7 @@
 
 #filestable tbody tr {
 	transition: background-color 0.3s ease;
-	height: 40px;
+	height: 51px;
 }
 #filestable tbody tr:hover,
 #filestable tbody tr:focus,
diff --git a/apps/files/css/upload.scss b/apps/files/css/upload.scss
index 0df2e39a61332..00c77100a239c 100644
--- a/apps/files/css/upload.scss
+++ b/apps/files/css/upload.scss
@@ -172,12 +172,14 @@
 .oc-dialog .fileexists #allfiles + span{
 	vertical-align: bottom;
 }
+
 .oc-dialog .oc-dialog-buttonrow {
 	width:100%;
 	text-align:right;
-}
-.oc-dialog .oc-dialog-buttonrow .cancel {
-	float:left;
+
+	.cancel {
+		float:left;
+	}
 }
 
 .highlightUploaded {
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 8ce8eddb0b052..4fcb290ca8bc9 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -662,7 +662,7 @@
 					if (permissions & OC.PERMISSION_UPDATE) {
 						actions = OC.dialogs.FILEPICKER_TYPE_COPY_MOVE;
 					}
-					OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath, type) {
+					OC.dialogs.filepicker(t('files', 'Choose target folder'), function(targetPath, type) {
 						if (type === OC.dialogs.FILEPICKER_TYPE_COPY) {
 							context.fileList.copy(filename, targetPath, false, context.dir);
 						}
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 8fb8a02181127..154209ca9754b 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -849,7 +849,7 @@
 			};
 
 			var actions = this.isSelectedMovable() ? OC.dialogs.FILEPICKER_TYPE_COPY_MOVE : OC.dialogs.FILEPICKER_TYPE_COPY;
-			OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath, type) {
+			OC.dialogs.filepicker(t('files', 'Choose target folder'), function(targetPath, type) {
 				self.fileMultiSelectMenu.toggleLoading('copyMove', true);
 				if (type === OC.dialogs.FILEPICKER_TYPE_COPY) {
 					self.copy(files, targetPath, disableLoadingState);
diff --git a/core/css/css-variables.scss b/core/css/css-variables.scss
index b1b7df3115fd3..058e018b41512 100644
--- a/core/css/css-variables.scss
+++ b/core/css/css-variables.scss
@@ -34,6 +34,7 @@
 	--color-border: $color-border;
 	--color-border-dark: $color-border-dark;
 	--border-radius: $border-radius;
+	--border-radius-large: $border-radius-large;
 
 	--font-face: $font-face;
 }
diff --git a/core/css/jquery.ocdialog.scss b/core/css/jquery.ocdialog.scss
index 0a0222497bcf5..b5ae27034af35 100644
--- a/core/css/jquery.ocdialog.scss
+++ b/core/css/jquery.ocdialog.scss
@@ -1,8 +1,8 @@
 .oc-dialog {
 	background: var(--color-main-background);
 	color: var(--color-text-light);
-	border-radius: var(--border-radius);
-	box-shadow: 0 0 7px var(--color-box-shadow);
+	border-radius: var(--border-radius-large);
+	box-shadow: 0 0 30px var(--color-box-shadow);
 	padding: 15px;
 	z-index: 10000;
 	font-size: 100%;
@@ -25,8 +25,8 @@
 	background: transparent;
 	right: 0;
 	bottom: 0;
-	padding: 10px;
-	padding-bottom: 0;
+	padding: 0;
+	padding-top: 10px;
 	box-sizing: border-box;
 	width: 100%;
 	background-image: linear-gradient(rgba(255, 255, 255, 0.0), var(--color-main-background));
@@ -41,6 +41,12 @@
 	&.twobuttons.aside {
 		justify-content: flex-end;
 	}
+
+	button {
+	    white-space: nowrap;
+	    overflow: hidden;
+	    text-overflow: ellipsis;
+	}
 }
 
 .oc-dialog-close {
@@ -49,6 +55,13 @@
 	right: 0;
 	padding: 25px;
 	background: url('../img/actions/close.svg') no-repeat center;
+	opacity: .5;
+
+	&:hover,
+	&:focus,
+	&:active {
+		opacity: 1;
+	}
 }
 
 .oc-dialog-dim {
@@ -76,4 +89,4 @@
 			display: none;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/core/css/mobile.scss b/core/css/mobile.scss
index e4a4f53367bb3..f7f3827eba52e 100644
--- a/core/css/mobile.scss
+++ b/core/css/mobile.scss
@@ -123,7 +123,7 @@
 		display: none;
 	}
 	#oc-dialog-filepicker-content .filelist .filename {
-		max-width: 80%;
+		max-width: 100%;
 	}
 
 	.snapjs-left table.multiselect thead {
diff --git a/core/css/styles.scss b/core/css/styles.scss
index 2d6df4c3932c3..dc217fb8f22f3 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -700,8 +700,10 @@ code {
 
 #oc-dialog-filepicker-content {
 	.dirtree {
-		width: 92%;
+		width: 96%;
 		flex-wrap: wrap;
+		padding-left: 12px;
+
 		div:first-child a {
 			background-image: url('../img/places/home.svg?v=1');
 			background-repeat: no-repeat;
@@ -725,8 +727,9 @@ code {
 		display: inline-block;
 		overflow-y: auto;
 		height: 100%;
-		/** overflow under the button row */
+		/* overflow under the button row */
 		width: 100%;
+		overflow-x: hidden;
 	}
 	.emptycontent {
 		color: var(--color-text-details);
@@ -1007,6 +1010,9 @@ div.crumb {
 		white-space: nowrap;
 		overflow: hidden;
 		flex: 0 0 auto;
+		// Some sane max-width for each folder name
+		max-width: 200px;
+
 		&.icon-home {
 			// Hide home text
 			text-indent: -9999px;
diff --git a/core/css/variables.scss b/core/css/variables.scss
index 3bfc37484c48c..f5b97c9b8795d 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -66,13 +66,14 @@ $image-login-background: url('../img/background.png?v=2') !default;
 $color-loading-light: #ccc !default;
 $color-loading-dark: #777 !default;
 
-$color-box-shadow: rgba(nc-darken($color-main-background, 70%), 0.75) !default;
+$color-box-shadow: rgba(nc-darken($color-main-background, 70%), 0.5) !default;
 
 // light border like file table or app-content list
 $color-border: nc-darken($color-main-background, 7%) !default;
 // darker border like inputs or very visible elements
 $color-border-dark: nc-darken($color-main-background, 14%) !default;
 $border-radius: 3px !default;
+$border-radius-large: 20px;
 
 $font-face: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif !default;