diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java
index 8a3bae1164ef..9597fe2610b0 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java
@@ -682,7 +682,6 @@ public class DefaultInspectionToolPresentation implements ProblemDescriptionsPro
                   final QuickFixAction quickFixAction = result.get(clazz);
                   try {
                     String familyName = fix.getFamilyName();
-                    familyName = !familyName.isEmpty() ? "\'" + familyName + "\'" : familyName;
                     ((LocalQuickFixWrapper)quickFixAction)
                       .setText(InspectionsBundle.message("inspection.descriptor.provider.apply.fix", familyName));
                   }
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixToolbar.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixToolbar.java
index 059158a24326..0ee2c18a8b9b 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixToolbar.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixToolbar.java
@@ -74,7 +74,7 @@ public class QuickFixToolbar extends JPanel {
          () -> getLabel(fixes, tree.getSelectionCount() == 1 ? (InspectionTreeNode)tree.getSelectionPath().getLastPathComponent() : null, problemCount), panels);
     fill(getFixesPlacement(hasFixes, multipleDescriptors), () -> createFixPanel(fixes), panels);
     fill(getSuppressPlacement(multipleDescriptors), () -> createSuppressionCombo(tree.getSelectedToolWrapper()
-      , tree.getSelectionPath(), project), panels);
+      , tree.getSelectionPaths(), project, multipleDescriptors), panels);
     fill(multipleDescriptors && editor != null ? 1 : -1, () -> ActionManager.getInstance().createActionToolbar("", GoToSubsequentOccurrenceAction.createNextPreviousActions(
       editor, descriptors), true).getComponent(), panels);
   }
@@ -98,26 +98,20 @@ public class QuickFixToolbar extends JPanel {
     return label;
   }
 
-  @NotNull
-  private static JLabel createBulbIcon() {
-    final JLabel label = new JLabel(AllIcons.Actions.IntentionBulb);
-    label.setBorder(IdeBorderFactory.createEmptyBorder(0, 10, 0, 0));
-    return label;
-  }
-
   private static JComponent createSuppressionCombo(@NotNull final InspectionToolWrapper toolWrapper,
-                                                   @NotNull final TreePath path,
-                                                   @NotNull final Project project) {
+                                                   @NotNull final TreePath[] paths,
+                                                   @NotNull final Project project,
+                                                   boolean multipleDescriptors) {
     final ComboBoxAction action = new ComboBoxAction() {
       {
-        getTemplatePresentation().setText("Suppress");
+        getTemplatePresentation().setText(multipleDescriptors ? "Suppress All" : "Suppress");
       }
 
       @NotNull
       @Override
       protected DefaultActionGroup createPopupActionGroup(JComponent button) {
         DefaultActionGroup group = new DefaultActionGroup();
-        group.addAll(new SuppressActionWrapper(project, toolWrapper, path).getChildren(null));
+        group.addAll(new SuppressActionWrapper(project, toolWrapper, paths).getChildren(null));
         return group;
       }
     };
diff --git a/platform/platform-resources-en/src/messages/InspectionsBundle.properties b/platform/platform-resources-en/src/messages/InspectionsBundle.properties
index 2f44231bb2c0..1e4a630ed72c 100644
--- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties
@@ -319,7 +319,7 @@ inspection.unused.symbol.check.parameters=Check &Parameters
 inspection.results.for.profile.toolwindow.title=Results for Inspection Profile ''{0}''
 inspection.export.results.invalidated.item=invalidated item
 inspection.export.results.at.line=at line
-inspection.descriptor.provider.apply.fix=Apply Fix {0}
+inspection.descriptor.provider.apply.fix=Fix All: ''{0}''
 
 inspection.export.results.capitalized.location=Location
 inspection.export.results.extends.implements=Extends/implements