diff --git a/platform/platform-api/src/com/intellij/ide/HelpTooltip.java b/platform/platform-api/src/com/intellij/ide/HelpTooltip.java
index a8a0b2513abb..cc8b4d1c3494 100644
--- a/platform/platform-api/src/com/intellij/ide/HelpTooltip.java
+++ b/platform/platform-api/src/com/intellij/ide/HelpTooltip.java
@@ -33,7 +33,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.function.BooleanSupplier;
-import java.util.regex.Pattern;
 
 /**
  * Standard implementation of help context tooltip.
@@ -93,7 +92,7 @@ import java.util.regex.Pattern;
 public class HelpTooltip {
   private static final Color BACKGROUND_COLOR = JBColor.namedColor("ToolTip.background", new JBColor(0xf7f7f7, 0x474a4c));
   private static final Color FOREGROUND_COLOR = JBColor.namedColor("ToolTip.foreground", new JBColor(0x1a1a1a, 0xbfbfbf));
-  private static final Color SHORTCUT_COLOR = JBColor.namedColor("ToolTip.shortcutForeground", new JBColor(0x787878, 0x878787));
+  private static final Color SHORTCUT_COLOR = JBColor.namedColor("ToolTip.shortcutForeground", new JBColor(0x787878, 0x999999));
   private static final Color INFO_COLOR = JBColor.namedColor("ToolTip.infoForeground", UIUtil.getContextHelpForeground());
   private static final Color BORDER_COLOR = JBColor.namedColor("ToolTip.borderColor", new JBColor(0xadadad, 0x636569));
 
@@ -106,14 +105,12 @@ public class HelpTooltip {
   private static final JBValue CURSOR_OFFSET = new JBValue.UIInteger("HelpTooltip.mouseCursorOffset", 20);
 
   private static final String PARAGRAPH_SPLITTER = "<p/?>";
-  private static final Pattern HTML_TAG = Pattern.compile("<b>|<br>");
-
   private static final String TOOLTIP_PROPERTY = "JComponent.helpTooltip";
 
   private String title;
   private String shortcut;
   private String description;
-  private LinkLabel link;
+  private LinkLabel<?> link;
   private boolean neverHide;
   private Alignment alignment = Alignment.CURSOR;
 
@@ -354,10 +351,6 @@ public class HelpTooltip {
     return tipPanel;
   }
 
-  //private static boolean hasHTMLTags(@Nullable String string) {
-  //  return StringUtil.isNotEmpty(string) && HTML_TAG.matcher(string).find();
-  //}
-
   private void installMouseListeners(@NotNull JComponent owner) {
     owner.addMouseListener(myMouseListener);
     owner.addMouseMotionListener(myMouseListener);
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
index bb4a689fd76e..229f15f3fd77 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
@@ -257,10 +257,12 @@ ToolWindow.HeaderCloseButton.background=3F4146
 
 ScrollBar.background=3F4244
 
+ToolTip.infoForeground=919191
+
 HelpTooltip.xOffset=1
 HelpTooltip.yOffset=1
-HelpTooltip.defaultTextBorderInsets=7,9,9,12
-HelpTooltip.smallTextBorderInsets=5,9,6,11
+HelpTooltip.defaultTextBorderInsets=8,10,10,13
+HelpTooltip.smallTextBorderInsets=6,10,7,12
 
 ValidationTooltip.maxWidth=384
 ValidationTooltip.errorBorderColor=73454B
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties
index ca004119f325..c3cd139d2e5a 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties
@@ -238,8 +238,8 @@ ToolWindow.HeaderCloseButton.background=B9B9B9
 
 ScrollBar.background=F5F5F5
 
-HelpTooltip.defaultTextBorderInsets=7,9,9,12
-HelpTooltip.smallTextBorderInsets=5,9,6,11
+HelpTooltip.defaultTextBorderInsets=8,10,10,13
+HelpTooltip.smallTextBorderInsets=6,10,7,12
 
 ValidationTooltip.maxWidth=384
 ValidationTooltip.errorBorderColor=E0A8A9
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
index 82fae0decce0..ec8b4ed9d243 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
@@ -251,8 +251,8 @@ ScrollBar.background=F5F5F5
 
 HelpTooltip.xOffset=1
 HelpTooltip.yOffset=1
-HelpTooltip.defaultTextBorderInsets=7,9,9,12
-HelpTooltip.smallTextBorderInsets=5,9,6,11
+HelpTooltip.defaultTextBorderInsets=8,10,10,13
+HelpTooltip.smallTextBorderInsets=6,10,7,12
 ToolTip.paintBorder=true
 
 Popup.Header.activeBackground=E6E6E6