diff --git a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java
index 29d6d25e52d9..5e9dd058a4cf 100644
--- a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java
@@ -31,6 +31,7 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.psi.codeStyle.*;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.components.JBTabbedPane;
+import com.intellij.util.ui.GraphicsUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -132,7 +133,13 @@ public abstract class TabbedLanguageCodeStylePanel extends CodeStyleAbstractPane
 
   private void initCopyFromMenu() {
     if (myCopyFromMenu == null) {
-      myCopyFromMenu = new JPopupMenu();
+      myCopyFromMenu = new JPopupMenu() {
+        @Override
+        public void paint(Graphics g) {
+          GraphicsUtil.setupAntialiasing(g);
+          super.paint(g);
+        }
+      };
       setupCopyFromMenu(myCopyFromMenu);
     }
   }
diff --git a/platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java b/platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java
index cbbcfd7d29fc..c7be91833ef4 100644
--- a/platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java
+++ b/platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.wm.IdeGlassPane;
 import com.intellij.openapi.wm.IdeGlassPaneUtil;
 import com.intellij.ui.ScreenUtil;
+import com.intellij.util.ui.GraphicsUtil;
 import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
@@ -238,7 +239,13 @@ public class JBOptionButton extends JButton implements MouseMotionListener {
   }
 
   private JPopupMenu fillMenu(boolean under) {
-    final JPopupMenu result = new JPopupMenu();
+    final JPopupMenu result = new JPopupMenu() {
+      @Override
+      public void paint(Graphics g) {
+        GraphicsUtil.setupAntialiasing(g);
+        super.paint(g);
+      }
+    };
 
     if (under && myOptions.length > 0) {
       final JMenuItem mainAction = new JMenuItem(getAction());
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java b/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java
index 7f3edab64237..c710dab926a6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java
@@ -17,6 +17,7 @@ package com.intellij.openapi.diff.ex;
 
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
+import com.intellij.util.ui.GraphicsUtil;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nullable;
 
@@ -52,6 +53,7 @@ public class DiffStatusBar extends JPanel {
       public void paint(Graphics g) {
         setBackground(UIUtil.getPanelBackground());
         super.paint(g);
+        GraphicsUtil.setupAntialiasing(g);
         FontMetrics metrics = getFontMetrics(getFont());
 
         EditorColorsScheme colorScheme = myColorScheme != null