diff --git a/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss b/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss
index f45b274bf2f46..5968f3122a26f 100644
--- a/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss
+++ b/frontend/src/lib/lemon-ui/LemonButton/LemonButton3000.scss
@@ -54,8 +54,6 @@
             }
 
             .LemonButton__icon {
-                transition: none;
-
                 > * {
                     opacity: var(--lemon-button-icon-opacity);
                 }
diff --git a/frontend/src/lib/lemon-ui/LemonSegmentedButton/LemonSegmentedButton.scss b/frontend/src/lib/lemon-ui/LemonSegmentedButton/LemonSegmentedButton.scss
index f681b7fc8046b..2b2fa0d912d3f 100644
--- a/frontend/src/lib/lemon-ui/LemonSegmentedButton/LemonSegmentedButton.scss
+++ b/frontend/src/lib/lemon-ui/LemonSegmentedButton/LemonSegmentedButton.scss
@@ -125,9 +125,8 @@ body:not(.posthog-3000) {
         .LemonButton:not(:hover) {
             background: var(--bg-3000);
 
-            .LemonButton__icon,
             .LemonButton__content {
-                opacity: 0.4;
+                opacity: var(--lemon-button-icon-opacity);
             }
         }
 
@@ -161,10 +160,8 @@ body:not(.posthog-3000) {
 
         &.LemonSegmentedButton__option--selected {
             .LemonButton {
-                .LemonButton__icon,
-                .LemonButton__content {
-                    opacity: 1;
-                }
+                --lemon-button-icon-opacity: 1;
+                --lemon-button-profile-picture-opacity: 1;
             }
 
             .LemonButton__chrome::after {