diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurableNew.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurableNew.java
index 4b69d6d80e1e..cef551e98337 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurableNew.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurableNew.java
@@ -92,6 +92,9 @@ public class PluginManagerConfigurableNew
   private static final Color SEARCH_FIELD_BORDER_COLOR =
     JBColor.namedColor("Plugins.SearchField.borderColor", new JBColor(0xC5C5C5, 0x515151));
 
+  private static final SimpleTextAttributes GRAY_ATTRIBUTES =
+    new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, ListPluginComponent.DisabledColor);
+
   private final TagBuilder myTagBuilder;
 
   private LinkListener<IdeaPluginDescriptor> myNameListener;
@@ -998,12 +1001,12 @@ public class PluginManagerConfigurableNew
             }
 
             if (isJBPlugin(descriptor)) {
-              append(" by JetBrains", SimpleTextAttributes.GRAY_ATTRIBUTES);
+              append(" by JetBrains", GRAY_ATTRIBUTES);
             }
             else {
               String vendor = descriptor.getVendor();
               if (!StringUtil.isEmptyOrSpaces(vendor)) {
-                append(" by " + StringUtil.shortenPathWithEllipsis(vendor, 50), SimpleTextAttributes.GRAY_ATTRIBUTES);
+                append(" by " + StringUtil.shortenPathWithEllipsis(vendor, 50), GRAY_ATTRIBUTES);
               }
             }
           }
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/DetailsPagePluginComponent.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/DetailsPagePluginComponent.java
index 319abbd98924..9cdb046cb6c7 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/DetailsPagePluginComponent.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/DetailsPagePluginComponent.java
@@ -10,7 +10,6 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.BrowserHyperlinkListener;
 import com.intellij.ui.ColorUtil;
-import com.intellij.ui.Gray;
 import com.intellij.ui.JBColor;
 import com.intellij.ui.border.CustomLineBorder;
 import com.intellij.ui.components.JBOptionButton;
@@ -172,7 +171,7 @@ public class DetailsPagePluginComponent extends OpaquePanel {
       versionComponent.setFont(UIUtil.getLabelFont());
       versionComponent.setBorder(null);
       versionComponent.setOpaque(false);
-      versionComponent.setForeground(new JBColor(Gray._130, Gray._120));
+      versionComponent.setForeground(CellPluginComponent.GRAY_COLOR);
       versionComponent.addFocusListener(new FocusAdapter() {
         @Override
         public void focusLost(FocusEvent e) {
@@ -285,8 +284,6 @@ public class DetailsPagePluginComponent extends OpaquePanel {
       return;
     }
 
-    Color grayedFg = new JBColor(Gray._130, Gray._120);
-
     String downloads = PluginManagerConfigurableNew.getDownloads(myPlugin);
     String date = PluginManagerConfigurableNew.getLastUpdatedDate(myPlugin);
     String rating = PluginManagerConfigurableNew.getRating(myPlugin);
@@ -297,10 +294,10 @@ public class DetailsPagePluginComponent extends OpaquePanel {
       myCenterPanel.add(metrics);
 
       if (date != null) {
-        createRatingLabel(metrics, date, AllIcons.Plugins.Updated, grayedFg);
+        createRatingLabel(metrics, date, AllIcons.Plugins.Updated, CellPluginComponent.GRAY_COLOR);
       }
       if (downloads != null) {
-        createRatingLabel(metrics, downloads, AllIcons.Plugins.Downloads, grayedFg);
+        createRatingLabel(metrics, downloads, AllIcons.Plugins.Downloads, CellPluginComponent.GRAY_COLOR);
       }
 
       if (rating != null) {
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/TabHeaderComponent.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/TabHeaderComponent.java
index 92b52ff53932..5e3af1c7a05a 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/TabHeaderComponent.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/TabHeaderComponent.java
@@ -217,7 +217,7 @@ public class TabHeaderComponent extends JComponent {
     JBColor.namedColor("Plugins.Tab.active.background", JBUI.CurrentTheme.ToolWindow.tabSelectedBackground());
 
   private static final Color HOVER_BG_COLOR =
-    JBColor.namedColor("Plugins.Tab.hover.background", JBUI.CurrentTheme.ToolWindow.tabHoveredBackground());
+    JBColor.namedColor("Plugins.Tab.hoverBackground", JBUI.CurrentTheme.ToolWindow.tabHoveredBackground());
 
   @Override
   protected void paintComponent(Graphics g) {
diff --git a/plugins/devkit/devkit-core/src/completion/UiDefaultsHardcodedKeys.java b/plugins/devkit/devkit-core/src/completion/UiDefaultsHardcodedKeys.java
index 93c9bf2f857e..3e4e3364c8f0 100644
--- a/plugins/devkit/devkit-core/src/completion/UiDefaultsHardcodedKeys.java
+++ b/plugins/devkit/devkit-core/src/completion/UiDefaultsHardcodedKeys.java
@@ -1314,7 +1314,7 @@ public final class UiDefaultsHardcodedKeys {
     "Plugins.SectionHeader.foreground",
     "Plugins.Tab.active.background",
     "Plugins.Tab.active.foreground",
-    "Plugins.Tab.hover.background",
+    "Plugins.Tab.hoverBackground",
     "Plugins.background",
     "Plugins.disabledForeground",
     "Plugins.selectionBackground",