diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java
index 16d3a7018924..36aa28832072 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java
@@ -84,7 +84,7 @@ public class DarculaButtonPainter implements Border, UIResource {
   }
 
   public Color getBorderColor(Component button) {
-    return button.isEnabled() && DarculaButtonUI.isDefaultButton(button) ?
+    return button.isEnabled() && DarculaButtonUI.isDefaultButton((JComponent)button) ?
            new ColorUIResource(0x3B608A) : new ColorUIResource(0x5E6060);
   }
 
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java
index ae1403d1b1cd..459ef2855b5a 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java
@@ -59,7 +59,7 @@ public class DarculaButtonUI extends BasicButtonUI {
     return c instanceof JButton && "square".equals(((JButton)c).getClientProperty("JButton.buttonType"));
   }
 
-  public static boolean isDefaultButton(Component c) {
+  public static boolean isDefaultButton(JComponent c) {
     return c instanceof JButton && ((JButton)c).isDefaultButton();
   }
 
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
index 8ccc940a9969..bdd755b98ae6 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
@@ -49,6 +49,11 @@ import static com.intellij.ide.ui.laf.darcula.DarculaUIUtil.*;
 @SuppressWarnings("GtkPreferredJComboBoxRenderer")
 public class DarculaComboBoxUI extends BasicComboBoxUI implements Border, ErrorBorderCapable {
 
+  public DarculaComboBoxUI() {}
+
+  @Deprecated
+  public DarculaComboBoxUI(JComboBox unused) {}
+
   @SuppressWarnings({"MethodOverridesStaticMethodOfSuperclass", "unused"})
   public static ComponentUI createUI(final JComponent c) {
     return new DarculaComboBoxUI();
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java
index 1d75fb88b865..43b035c4f7a6 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java
@@ -64,6 +64,15 @@ public abstract class TextFieldWithPopupHandlerUI extends BasicTextFieldUI imple
   private Object variant;
   private int cursor;
 
+  @Deprecated
+  protected JTextField myTextField;
+
+  public TextFieldWithPopupHandlerUI() {}
+
+  @Deprecated
+  public TextFieldWithPopupHandlerUI(JTextField textField) {
+    myTextField = textField;
+  }
   /**
    * @param insets a border insets without a space for icons
    * @see javax.swing.border.Border#getBorderInsets
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJIconCache.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJIconCache.java
new file mode 100644
index 000000000000..34265126f9e2
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJIconCache.java
@@ -0,0 +1,17 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.ide.ui.laf.intellij;
+
+import com.intellij.ide.ui.laf.IconCache;
+
+import javax.swing.*;
+
+/**
+ * @Deprecated use {@link IconCache} instead
+ */
+@Deprecated
+public class MacIntelliJIconCache {
+  @Deprecated
+  public static Icon getIcon(String name) {
+    return IconCache.getIcon(name);
+  }
+}