diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
index c080c87c5c62..bfb072b71e8d 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
@@ -21,6 +21,7 @@ import com.intellij.ide.IdeEventQueue;
 import com.intellij.ide.SearchTopHitProvider;
 import com.intellij.ide.ui.LafManager;
 import com.intellij.ide.ui.LafManagerListener;
+import com.intellij.ide.ui.search.BooleanOptionDescription;
 import com.intellij.ide.ui.search.OptionDescription;
 import com.intellij.ide.ui.search.SearchableOptionsRegistrarImpl;
 import com.intellij.ide.util.gotoByName.*;
@@ -58,6 +59,7 @@ import com.intellij.psi.codeStyle.NameUtil;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.ui.*;
 import com.intellij.ui.components.JBLabel;
+import com.intellij.ui.components.OnOffButton;
 import com.intellij.util.Alarm;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Consumer;
@@ -330,11 +332,19 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
     @Override
     public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
       Component cmp = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-      if (myLocationString != null) {
+      if (myLocationString != null || value instanceof BooleanOptionDescription) {
         final JPanel panel = new JPanel(new BorderLayout());
-        panel.setBackground(UIUtil.getListBackground());
+        panel.setBackground(UIUtil.getListBackground(isSelected));
         panel.add(cmp, BorderLayout.CENTER);
-        panel.add(myLocation.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus), BorderLayout.EAST);
+        final Component rightComponent;
+        if (value instanceof BooleanOptionDescription) {
+          final OnOffButton button = new OnOffButton();
+          button.setSelected(((BooleanOptionDescription)value).isOptionEnabled());
+          rightComponent = button;
+        } else {
+          rightComponent = myLocation.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+        }
+        panel.add(rightComponent, BorderLayout.EAST);
         cmp = panel;
       }
 
diff --git a/platform/platform-api/src/com/intellij/ui/components/OnOffButton.java b/platform/platform-api/src/com/intellij/ui/components/OnOffButton.java
new file mode 100644
index 000000000000..11dadb6a64e5
--- /dev/null
+++ b/platform/platform-api/src/com/intellij/ui/components/OnOffButton.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.ui.components;
+
+import com.intellij.ui.Gray;
+import com.intellij.util.ui.GraphicsUtil;
+import com.intellij.util.ui.UIUtil;
+
+import javax.swing.*;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.basic.BasicToggleButtonUI;
+import java.awt.*;
+
+/**
+ * @author Konstantin Bulenkov
+ */
+public class OnOffButton extends JToggleButton {
+  private String myOnText;
+  private String myOffText;
+  public OnOffButton() {
+    setUI(OnOffButtonUI.createUI(this));
+    setOpaque(false);
+    setBorder(null);
+  }
+
+  public String getOnText() {
+    return myOnText == null ? "ON" : myOnText;
+  }
+
+  public void setOnText(String onText) {
+    myOnText = onText;
+  }
+
+  public String getOffText() {
+    return myOffText == null ? "OFF" : myOffText;
+  }
+
+  public void setOffText(String offText) {
+    myOffText = offText;
+  }
+
+  @Override
+  protected void paintComponent(Graphics g) {
+    super.paintComponent(g);
+  }
+
+  public static class OnOffButtonUI extends BasicToggleButtonUI {
+    private final OnOffButton myButton;
+
+    public OnOffButtonUI(OnOffButton checkBox) {
+      myButton = checkBox;
+    }
+
+    @SuppressWarnings({"MethodOverridesStaticMethodOfSuperclass", "UnusedDeclaration"})
+    public static ComponentUI createUI(JComponent c) {
+      return new OnOffButtonUI((OnOffButton)c);
+    }
+
+    @Override
+    public Dimension getPreferredSize(JComponent c) {
+      final OnOffButton button = (OnOffButton)c;
+      String text = button.getOffText().length() > button.getOnText().length() ? button.getOffText() : button.getOnText();
+      text = text.toUpperCase();
+      final FontMetrics fm = c.getFontMetrics(c.getFont());
+      int w = fm.stringWidth(text);
+      int h = fm.getHeight();
+      h += 2*4;
+      w += 3 * h / 2 + 4;
+      return new Dimension(w, h);
+    }
+    @Override
+    public void paint(Graphics gr, JComponent c) {
+      final OnOffButton button = (OnOffButton)c;
+      final Dimension size = button.getSize();
+      int w = size.width-4;
+      int h = size.height-4;
+      if (h % 2 == 1) {
+        h--;
+      }
+      Graphics2D g = ((Graphics2D)gr);
+      GraphicsUtil.setupAAPainting(g);
+      g.translate(1,1);
+      if (button.isSelected()) {
+        g.setColor(new Color(13, 41, 62));
+        g.fillRoundRect(0, 0, w, h, h, h);
+        g.setColor(UIUtil.getBorderColor());
+        g.drawRoundRect(0, 0, w, h, h, h);
+        g.setColor(Gray._128);
+        g.fillOval(w - h + 1, 1, h - 1, h - 1);
+        g.setColor(UIUtil.getListForeground(true));
+        g.drawString(button.getOnText(), h/2, h - 4);
+      } else {
+        g.setColor(UIUtil.getPanelBackground());
+        g.fillRoundRect(0, 0, w, h, h, h);
+        g.setColor(UIUtil.getBorderColor());
+        g.drawRoundRect(0, 0, w, h, h, h);
+        g.setColor(UIUtil.getLabelDisabledForeground());
+        g.drawString(button.getOffText(), h + 4 , h - 4);
+        g.setColor(Gray._128);
+        g.fillOval(0, 0, h - 1, h - 1);
+      }
+      g.translate(-1, -1);
+    }
+
+    @Override
+    public Dimension getMinimumSize(JComponent c) {
+      return getPreferredSize(c);
+    }
+
+    @Override
+    public Dimension getMaximumSize(JComponent c) {
+      return getPreferredSize(c);
+    }
+  }
+}