diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 0cc812e917..fe7a194750 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -12,22 +12,25 @@
 }
 
 .shareTabView .shareWithRemoteInfo {
-	padding: 11px 0 11px 10px
+	padding: 11px 20px;
 }
 
 .shareTabView label {
-	font-weight:400;
 	white-space: nowrap;
 }
 
 .shareTabView input[type="checkbox"] {
-	margin:0 3px 0 8px;
+	margin: 0 3px 0 8px;
 	vertical-align: middle;
 }
 
-.shareTabView input[type="text"], .shareTabView input[type="password"] {
-	width: 91%;
-	margin-left: 7px;
+.shareTabView input[type="text"],
+.shareTabView input[type="password"] {
+	width: 94%;
+	margin-left: 0;
+}
+.shareTabView #shareWith {
+	width: 80%;
 }
 
 .shareTabView form {
@@ -37,15 +40,14 @@
 }
 
 #shareWithList {
-	list-style-type:none;
-	padding:8px;
+	list-style-type: none;
+	padding: 0 0 16px;
 }
 
 #shareWithList li {
-	padding-top: 10px;
-	padding-bottom: 10px;
+	padding-top: 5px;
+	padding-bottom: 5px;
 	font-weight: bold;
-	line-height: 21px;
 	white-space: normal;
 }
 
diff --git a/core/css/share.css b/core/css/share.css
index 6467cc0239..15f8061b06 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -41,10 +41,6 @@
 	display: none !important;
 }
 
-.shareTabView .shareWithRemoteInfo {
-	padding: 11px 20px;
-}
-
 .shareTabView .avatar {
 	margin-right: 8px;
 	display: inline-block;
@@ -106,8 +102,9 @@ a.unshare {
 	display:inline;
 	float:right;
 	opacity:.5;
-	padding:5px 0 0 5px !important;
-	margin-top:-5px;
+	padding: 10px;
+	margin-top: -5px;
+	margin-right: -10px;
 }
 
 #link {
@@ -115,17 +112,10 @@ a.unshare {
 	padding-top:8px;
 }
 
-.shareTabView input[type="text"],
-.shareTabView input[type="password"],
 .shareTabView input[type="submit"] {
 	margin-left: 7px;
 }
 
-.shareTabView input[type="text"],
-.shareTabView input[type="password"] {
-	width: 86%;
-}
-
 .shareTabView form {
 	font-size: 100%;
 	margin-left: 0;