diff --git a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractDescriptionAwareSchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractDescriptionAwareSchemesPanel.java
index 8b106eef89f9..39051f892bb3 100644
--- a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractDescriptionAwareSchemesPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractDescriptionAwareSchemesPanel.java
@@ -94,7 +94,7 @@ public abstract class AbstractDescriptionAwareSchemesPanel<T extends Scheme> ext
   }
 
   @Override
-  public final void showInfo(@Nullable String message, @NotNull MessageType messageType) {
+  public final void showMessage(@Nullable String message, @NotNull MessageType messageType) {
     myWarningLabel.setText(message);
     myWarningLabel.setForeground(messageType.getTitleForeground());
     myLayout.show(myInfoComponent, ERROR_CARD);
@@ -109,7 +109,7 @@ public abstract class AbstractDescriptionAwareSchemesPanel<T extends Scheme> ext
   }
 
   @Override
-  public final void clearInfo() {
+  public final void clearMessage() {
     myLayout.show(myInfoComponent, SHOW_DESCRIPTION_CARD);
   }
 
diff --git a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
index db31e255ed36..8f13caa5e24c 100644
--- a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
@@ -73,6 +73,7 @@ public abstract class AbstractSchemesPanel<T extends Scheme, InfoComponent exten
     controlsPanel.add(mySchemesCombo.getComponent());
     myToolbar = createToolbar();
     controlsPanel.add(myToolbar);
+    controlsPanel.add(Box.createRigidArea(new Dimension(15, 0)));
     myInfoComponent = createInfoComponent();
     controlsPanel.add(myInfoComponent);
     controlsPanel.add(Box.createHorizontalGlue());
@@ -129,9 +130,19 @@ public abstract class AbstractSchemesPanel<T extends Scheme, InfoComponent exten
     mySchemesCombo.cancelEdit();
   }
 
-  public abstract void showInfo(@Nullable String message, @NotNull MessageType messageType);
+  public final void showInfo(@Nullable String message, @NotNull MessageType messageType) {
+    myToolbar.setVisible(false);
+    showMessage(message, messageType);
+  }
 
-  public abstract void clearInfo();
+  protected abstract void showMessage(@Nullable String message, @NotNull MessageType messageType);
+
+  public final void clearInfo() {
+    myToolbar.setVisible(true);
+    clearMessage();
+  }
+
+  protected abstract void clearMessage();
 
   public final AbstractSchemeActions<T> getActions() {
     return myActions;
diff --git a/platform/lang-impl/src/com/intellij/application/options/schemes/SimpleSchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/schemes/SimpleSchemesPanel.java
index 6bf9d8461cd5..fb0847626de9 100644
--- a/platform/lang-impl/src/com/intellij/application/options/schemes/SimpleSchemesPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/schemes/SimpleSchemesPanel.java
@@ -37,7 +37,7 @@ public abstract class SimpleSchemesPanel<T extends Scheme> extends AbstractSchem
   }
 
   @Override
-  public final void showInfo(@Nullable String message, @NotNull MessageType messageType) {
+  public final void showMessage(@Nullable String message, @NotNull MessageType messageType) {
     myInfoComponent.setText(message);
     Color foreground = 
       messageType == MessageType.INFO ? HINT_FOREGROUND : 
@@ -47,7 +47,7 @@ public abstract class SimpleSchemesPanel<T extends Scheme> extends AbstractSchem
   }
 
   @Override
-  public final void clearInfo() {
+  public final void clearMessage() {
     myInfoComponent.setText(null);
   }
 }