diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 1ef5ac3fe3..936e1af246 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -71,7 +71,7 @@
 }
 
 #shareWithList .unshare {
-	padding: 4px;
+	padding: 1px 6px;
 	vertical-align: text-bottom;
 }
 #shareWithList .unshare .icon {
@@ -81,6 +81,11 @@
 #shareWithList .unshare .icon-delete {
 	padding-right: 4px;
 	background-position-x: 0;
+	display: inline-block;
+}
+
+#shareWithList .sharingOptionsGroup .popovermenu:after {
+	right: 3px;
 }
 
 #shareWithList label input[type=checkbox] {
@@ -104,12 +109,14 @@
 .shareTabView .icon-loading-small {
 	display: inline-block;
 	z-index: 1;
-	padding: 2px 0;
+	margin-right: 4px;
+	vertical-align: text-top;
 }
 
-.shareTabView .shareWithList .icon-loading-small,
-.shareTabView .linkShareView .icon-loading-small {
-	position: absolute;
+.shareTabView .shareWithList .icon-loading-small:not(.hidden) + span,
+.shareTabView .linkShareView .icon-loading-small:not(.hidden) + input + label:before {
+	/* Hide if loader is visible */
+	display: none !important;
 }
 
 .linkShareView {
diff --git a/core/css/share.css b/core/css/share.css
index 05b6ca3912..eba22cf743 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -132,7 +132,6 @@ a.unshare {
 	display:inline-block;
 	opacity:.5;
 	padding: 10px;
-	margin-top: -5px;
 }
 
 #link {