3 files changed, 8 insertions, 33 deletions

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 9b844919c4e..c0460ff6058 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -550,7 +550,7 @@ html.ie8 #fileList tr.selected td.filename>.selectCheckBox {
 }
 .bubble:after,
 #app-navigation .app-navigation-entry-menu:after {
-	right: 6px;
+	right: 12px;
 }
 .bubble:before,
 #app-navigation .app-navigation-entry-menu:before {
@@ -625,13 +625,6 @@ html.ie8 .column-mtime .selectedActions {
 	padding-right: 14px;
 }
 
-#fileList .popovermenu {
-	margin-right: 6px;
-}
-.ie8 #fileList .popovermenu {
-	margin-top: -10px;
-}
-
 .ie8 #fileList a.action img,
 #fileList tr:hover a.action,
 #fileList a.action.permanent,
@@ -649,7 +642,6 @@ html.ie8 .column-mtime .selectedActions {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
 	filter: alpha(opacity=30);
 	opacity: .3;
-	display:inline;
 }
 .ie8 #fileList a.action:hover img,
 #fileList tr a.action.disabled.action-download,
@@ -673,6 +665,7 @@ html.ie8 .column-mtime .selectedActions {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
 	filter: alpha(opacity=70) !important;
 	opacity: .7 !important;
+	display:inline;
 }
 /* always show actions on mobile, not only on hover */
 #fileList a.action.action-menu.permanent {
@@ -775,11 +768,6 @@ table.dragshadow td.size {
 	padding: initial;
 }
 
-#fileList .popovermenu a.action {
-	padding: 10px;
-	margin: -10px;
-}
-
 html.ie8 #controls .button.new {
 	padding-right: 0;
 }
@@ -826,11 +814,7 @@ html.ie8 #controls .button.new {
 }
 
 #fileList .popovermenu .action {
-	display: block;
-	line-height: 30px;
-	padding-left: 5px;
 	color: #000;
-	padding: 0;
 }
 
 #filestable .filename .action .icon,
diff --git a/core/css/apps.css b/core/css/apps.css
index 87ec86d701d..ee640d54641 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -289,7 +289,7 @@
 	border-radius: 3px;
 	border-top-right-radius: 0;
 	z-index: 110;
-	margin: -5px 14px 5px 10px;
+	margin-top: -5px;
 	right: 0;
 	-webkit-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 	-moz-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
@@ -652,14 +652,6 @@ em {
 	opacity: 1;
 }
 
-.popovermenu {
-	padding: 4px 12px;
-}
-
-.popovermenu li {
-	padding: 5px 0;
-}
-
 .popovermenu .menuitem img {
 	padding: initial;
 }
@@ -667,8 +659,8 @@ em {
 .popovermenu a.menuitem,
 .popovermenu label.menuitem,
 .popovermenu .menuitem {
-	padding: 10px;
-	margin: -10px;
+	padding: 10px !important;
+	width: auto;
 }
 
 .popovermenu.hidden {
@@ -676,11 +668,9 @@ em {
 }
 
 .popovermenu .menuitem {
-	display: flex;
+	display: flex !important;
 	line-height: 30px;
-	padding-left: 5px;
 	color: #000;
-	padding: 0;
 	align-items: center;
 }
 
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 887d2beb7b8..835a0a6b64f 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -109,7 +109,8 @@ input#openid, input#webdav { width:20em; }
 	top: 44px;
 }
 .federationScopeMenu.bubble::after {
-	left: 45px;
+	right: 50%;
+	margin-right: -14px;
 }
 .federationScopeMenu.popovermenu {
 	font-weight: 100;