diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java
index c5d6f87ae2f6..d9375c80441a 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java
@@ -16,7 +16,6 @@ import com.intellij.openapi.wm.impl.IdeFrameImpl;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.util.ui.JBSwingUtilities;
 import com.intellij.util.ui.JBUI;
-import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
 
@@ -199,10 +198,6 @@ public class NavBarRootPaneExtension extends IdeRootPaneNorthExtension {
 
         Rectangle rectangle = new Rectangle(0, 0, r.width + insets.left + insets.right, r.height + insets.top + insets.bottom);
         NavBarUIManager.getUI().doPaintNavBarPanel(g2d, rectangle, isMainToolbarVisible(), isUndocked());
-        if (UIUtil.isUnderAquaLookAndFeel() && isUndocked()) {
-          Rectangle bounds = getParent().getBounds();
-          NavBarUIManager.getUI().doPaintWrapperPanel(g2d, bounds, false);
-        }
 
         g2d.dispose();
       }
diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/AquaNavBarUI.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/AquaNavBarUI.java
index c421c85e1693..54559326a52c 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/AquaNavBarUI.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/AquaNavBarUI.java
@@ -22,6 +22,7 @@ import com.intellij.util.ui.UIUtil;
 import java.awt.*;
 
 /**
+ * @deprecated will be removed 2020.1
  * @author Konstantin Bulenkov
  */
 public class AquaNavBarUI extends AbstractNavBarUI {
diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/NavBarUIManager.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/NavBarUIManager.java
index 96ab1c19d505..c3f6466215fc 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/NavBarUIManager.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ui/NavBarUIManager.java
@@ -21,14 +21,16 @@ import com.intellij.util.ui.UIUtil;
  * @author Konstantin Bulenkov
  */
 public class NavBarUIManager {
-  public static final NavBarUI AQUA = new AquaNavBarUI();
   public static final NavBarUI COMMON = new CommonNavBarUI();
+  /**
+   * @deprecated will be removal in 2020.1
+   */
+  public static final NavBarUI AQUA = COMMON;
   public static final NavBarUI DARCULA = new DarculaNavBarUI();
 
 
   public static NavBarUI getUI() {
-    if (UIUtil.isUnderAquaLookAndFeel()) return AQUA;
-    if (UIUtil.isUnderDarcula())         return DARCULA;
+    if (UIUtil.isUnderDarcula()) return DARCULA;
     return COMMON;
   }
 }