diff --git a/editor.search/src/org/netbeans/modules/editor/search/ReplaceBar.java b/editor.search/src/org/netbeans/modules/editor/search/ReplaceBar.java
--- a/editor.search/src/org/netbeans/modules/editor/search/ReplaceBar.java
+++ b/editor.search/src/org/netbeans/modules/editor/search/ReplaceBar.java
@@ -52,6 +52,7 @@
 import javax.swing.text.JTextComponent;
 import org.netbeans.editor.GuardedException;
 import org.openide.awt.Mnemonics;
+import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
 
 public final class ReplaceBar extends JPanel {
@@ -118,10 +119,8 @@
         leftSeparator.setOrientation(SwingConstants.VERTICAL);
         add(leftSeparator);
 
-        replaceButton = new JButton();
-        Mnemonics.setLocalizedText(replaceButton, NbBundle.getMessage(ReplaceBar.class, "CTL_ReplaceNext")); // NOI18N
+        replaceButton = SearchButton.createFindButton("org/netbeans/modules/editor/search/resources/replace.png", null); // NOI18N
         replaceButton.setToolTipText(NbBundle.getMessage(ReplaceBar.class, "TOOLTIP_ReplaceText")); // NOI18N
-        replaceButton.setMargin(BUTTON_INSETS);
         replaceButton.setEnabled(!getSearchBar().getIncSearchTextField().getText().isEmpty());
         replaceButton.addActionListener(new ActionListener() {
 
@@ -132,10 +131,8 @@
         });
         add(replaceButton);
 
-        replaceAllButton = new JButton();
-        Mnemonics.setLocalizedText(replaceAllButton, NbBundle.getMessage(ReplaceBar.class, "CTL_ReplaceAll"));
+        replaceAllButton = SearchButton.createFindButton("org/netbeans/modules/editor/search/resources/replace_all.png", null); // NOI18N
         replaceAllButton.setToolTipText(NbBundle.getMessage(ReplaceBar.class, "TOOLTIP_ReplaceText")); // NOI18N
-        replaceAllButton.setMargin(BUTTON_INSETS);
         replaceAllButton.setEnabled(!getSearchBar().getIncSearchTextField().getText().isEmpty());
         replaceAllButton.addActionListener(new ActionListener() {
 
diff --git a/editor.search/src/org/netbeans/modules/editor/search/SearchBar.java b/editor.search/src/org/netbeans/modules/editor/search/SearchBar.java
--- a/editor.search/src/org/netbeans/modules/editor/search/SearchBar.java
+++ b/editor.search/src/org/netbeans/modules/editor/search/SearchBar.java
@@ -184,7 +184,8 @@
         leftSeparator.setOrientation(SwingConstants.VERTICAL);
         add(leftSeparator);
 
-        findPreviousButton = createFindButton("org/netbeans/modules/editor/search/resources/find_previous.png", "CTL_FindPrevious"); // NOI18N
+        findPreviousButton = SearchButton.createFindButton("org/netbeans/modules/editor/search/resources/find_previous.png", null); // NOI18N
+        findPreviousButton.setToolTipText(NbBundle.getMessage(SearchBar.class, "TOOLTIP_IncrementalSearchText")); //NOI18N
         findPreviousButton.addActionListener(new ActionListener() {
 
             @Override
@@ -193,7 +194,8 @@
             }
         });
         add(findPreviousButton);
-        findNextButton = createFindButton("org/netbeans/modules/editor/search/resources/find_next.png", "CTL_FindNext"); // NOI18N
+        findNextButton = SearchButton.createFindButton("org/netbeans/modules/editor/search/resources/find_next.png", null); // NOI18N
+        findPreviousButton.setToolTipText(NbBundle.getMessage(SearchBar.class, "TOOLTIP_IncrementalSearchText")); //NOI18N
         findNextButton.addActionListener(new ActionListener() {
 
             @Override
@@ -597,16 +599,6 @@
         wrapAroundCheckBox.setSelected(getFindSupportValue(EditorFindSupport.FIND_WRAP_SEARCH));
     }
 
-    private JButton createFindButton(final String imageIcon,final String resName) {
-        JButton button = new JButton(
-                ImageUtilities.loadImageIcon(imageIcon, false));
-        Mnemonics.setLocalizedText(button, NbBundle.getMessage(SearchBar.class, resName));
-        button.setMargin(BUTTON_INSETS);
-        button.setToolTipText(NbBundle.getMessage(SearchBar.class, "TOOLTIP_IncrementalSearchText")); //NOI18N
-        return button;
-    }
-
-
     // Treat Emacs profile specially in order to fix #191895
     private void emacsProfileFix(final JTextComponent incSearchTextField) {
         class JumpOutOfSearchAction extends AbstractAction {