1 files changed, 58 insertions, 31 deletions

diff --git a/src/components/Menu/ActionEntry.scss b/src/components/Menu/ActionEntry.scss
index d69baf1d0..77de40478 100644
--- a/src/components/Menu/ActionEntry.scss
+++ b/src/components/Menu/ActionEntry.scss
@@ -1,40 +1,67 @@
-button.entry-action,
-.entry-action > button,
-.entry-action > div > button {
-	position: relative;
-	width: 44px;
+.text__is-active-item-btn {
+  opacity: 1;
+
+  &::before {
+    transform: translateX(-50%);
+    border-radius: 100%;
+    position: absolute;
+    background: var(--color-primary-element);
+    bottom: 3px;
+    height: 6px;
+    width: 6px;
+    content: "";
+    left: 50%;
+  }
+}
+
+.text-menubar, .popover {
+  button.entry-action__button {
 	height: 44px;
 	margin: 0;
-	background-size: 16px;
 	border: 0;
-	background-color: transparent;
-	opacity: .5;
-	color: var(--color-main-text);
-	background-position: center center;
-	vertical-align: top;
-	padding: 0.7em;
-	&:hover,
-	&:focus,
-	&:active {
-		background-color: var(--color-background-dark);
-	}
+	opacity: 0.5;
+	position: relative;
+    color: var(--color-main-text);
+    background-color: transparent;
+    vertical-align: top;
+    padding: 0;
 
-	&.is-active::before {
-		transform: translateX(-50%);
-		border-radius: 100%;
-		position: absolute;
-		background: var(--color-primary-element);
-		bottom: 3px;
-		height: 6px;
-		width: 6px;
-		content: '';
-		left: 50%;
+	p {
+		padding: 0;
+	}
 
+	&:is(li.entry-action-item button) {
+		padding: 0 0.5em 0 0;
 	}
 
-	&.is-active,
-	&:hover,
-	&:focus {
-		opacity: 1;
+	&:not(li.entry-action-item button) {
+		width: 44px;
 	}
+
+    &:hover,
+    &:focus,
+    &:active {
+      background-color: var(--color-background-dark);
+    }
+
+    &:hover,
+    &:focus {
+      opacity: 1;
+    }
+
+    &.is-active {
+      @extend .text__is-active-item-btn;
+    }
+  }
+
+  .entry-action.is-active:not(.entry-action-item) {
+    @extend .text__is-active-item-btn;
+  }
+
+  .entry-action.entry-action-item {
+    &.is-active {
+      background-color: var(--color-primary-light);
+      box-shadow: inset 2px 0 var(--color-primary);
+    }
+  }
 }