diff --git a/src/modules/ui/directives/helpIcon/helpIcon.less b/src/modules/ui/directives/helpIcon/helpIcon.less
index 91aa06e380..cec6d4d7a4 100644
--- a/src/modules/ui/directives/helpIcon/helpIcon.less
+++ b/src/modules/ui/directives/helpIcon/helpIcon.less
@@ -3,6 +3,10 @@
 @import (reference) '../../../app/less/typography';
 
 .help-icon {
+  display: inline-flex;
+  z-index: 10;
+  flex-shrink: 0;
+
   &__icon {
     margin-left: 7px;
     border-radius: 50%;
@@ -74,12 +78,6 @@
     margin-bottom: 5px;
     margin-top: 0;
   }
-}
-
-w-help-icon {
-  display: inline-flex;
-  z-index: 10;
-  flex-shrink: 0;
 
   &.info {
     .help-icon {
diff --git a/src/modules/ui/directives/mainHeader/less/largeHeader/dropdown-toggler.less b/src/modules/ui/directives/mainHeader/less/largeHeader/dropdown-toggler.less
index abc521d340..572ef75ede 100644
--- a/src/modules/ui/directives/mainHeader/less/largeHeader/dropdown-toggler.less
+++ b/src/modules/ui/directives/mainHeader/less/largeHeader/dropdown-toggler.less
@@ -82,4 +82,8 @@
       }
     }
   }
+
+  &.dropdown-toggler_right:hover::after {
+    display: none;
+  }
 }
diff --git a/src/modules/ui/directives/ratingStars/tooltip.less b/src/modules/ui/directives/ratingStars/tooltip.less
index 16c72366a9..f428ffb591 100644
--- a/src/modules/ui/directives/ratingStars/tooltip.less
+++ b/src/modules/ui/directives/ratingStars/tooltip.less
@@ -101,8 +101,9 @@
 }
 
 // account type helper tooltip
-.avatar-container.has-helper {
-  w-help-icon {
+.avatar-container.has-helper,
+.dropdown-toggler__avatar.dropdown-toggler__avatar_has-helper {
+  .help-icon {
     position: absolute;
     right: 0;
     bottom: 0;
@@ -114,7 +115,6 @@
         text-align: center;
         background: @color-white;
         margin: 0;
-        overflow: hidden;
         display: flex;
         align-items: center;
         justify-content: center;
@@ -135,18 +135,13 @@
           font-size: 11px;
           content: '+';
           color: @color-black;
-          background-color: @color-white;
         }
       }
 
       &__content {
-        width: 150px;
-        left: 0;
-        top: 100%;
         padding: 11px;
         line-height: 1em;
         font-size: 11px;
-        transform: translate(-50%, 5px);
       }
 
       &__row {
@@ -191,6 +186,42 @@
   }
 }
 
+.avatar-container.has-helper {
+  .help-icon {
+    &__icon {
+      overflow: hidden;
+    }
+
+    &__content {
+      width: 150px;
+      left: 0;
+      top: 100%;
+      transform: translate(-50%, 5px);
+    }
+  }
+}
+
+.dropdown-toggler__avatar.dropdown-toggler__avatar_has-helper {
+  z-index: 11;
+
+  .help-icon {
+    .help-icon__icon::after {
+      top: 23px;
+    }
+
+    .help-icon__row {
+      white-space: nowrap;
+    }
+
+    .help-icon__content {
+      width: auto;
+      left: auto;
+      right: -35px;
+      top: -3px;
+    }
+  }
+}
+
 .tooltip_unpin {
   transform: translate(-8px, -30px);
   visibility: hidden;