diff --git a/source/com/intellij/refactoring/RefactoringDialog.java b/source/com/intellij/refactoring/RefactoringDialog.java
index d35f4734d34c..5dc82ef02842 100644
--- a/source/com/intellij/refactoring/RefactoringDialog.java
+++ b/source/com/intellij/refactoring/RefactoringDialog.java
@@ -139,7 +139,7 @@ public abstract class RefactoringDialog extends DialogWrapper {
 
   private class RefactorAction extends AbstractAction {
     public RefactorAction() {
-      putValue(Action.NAME, "Refactor");
+      putValue(Action.NAME, "&Refactor");
       putValue(DEFAULT_ACTION, Boolean.TRUE);
     }
 
@@ -150,7 +150,7 @@ public abstract class RefactoringDialog extends DialogWrapper {
 
   private class PreviewAction extends AbstractAction {
     public PreviewAction() {
-      putValue(Action.NAME, "Preview");
+      putValue(Action.NAME, "&Preview");
     }
 
     public void actionPerformed(ActionEvent e) {
diff --git a/source/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java b/source/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
index e7d757477451..cd8af7663693 100644
--- a/source/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
+++ b/source/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
@@ -234,7 +234,7 @@ public class EncapsulateFieldsDialog extends RefactoringDialog {
     myCbEncapsulateSet.setMnemonic('S');
     myCbUseAccessorsWhenAccessible.setMnemonic('U');
     myRbFieldPrivate.setMnemonic('i');
-    myRbFieldProtected.setMnemonic('r');
+    myRbFieldProtected.setMnemonic('t');
     myRbFieldPackageLocal.setMnemonic('c');
     myRbFieldAsIs.setMnemonic('A');
     myRbAccessorPublic.setMnemonic('b');
diff --git a/source/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java b/source/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
index 7afb0a35a1d9..f47a92b99410 100644
--- a/source/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
+++ b/source/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
@@ -275,7 +275,7 @@ class IntroduceConstantDialog extends DialogWrapper {
     };
     if (myOccurrencesCount > 1) {
       myCbReplaceAll = new NonFocusableCheckBox("Replace all occurrences of expression (" + myOccurrencesCount + " occurrences)");
-      myCbReplaceAll.setMnemonic('R');
+      myCbReplaceAll.setMnemonic('A');
       myCbReplaceAll.setFocusable(false);
       gbConstraints.gridy++;
       panel.add(myCbReplaceAll, gbConstraints);
diff --git a/source/com/intellij/refactoring/introduceField/IntroduceFieldDialog.java b/source/com/intellij/refactoring/introduceField/IntroduceFieldDialog.java
index 7b6434999986..c1e84d58a00f 100644
--- a/source/com/intellij/refactoring/introduceField/IntroduceFieldDialog.java
+++ b/source/com/intellij/refactoring/introduceField/IntroduceFieldDialog.java
@@ -300,7 +300,7 @@ class IntroduceFieldDialog extends DialogWrapper {
     if (myOccurrencesCount > 1) {
       myCbReplaceAll = new NonFocusableCheckBox(
               "Replace all occurrences of expression (" + myOccurrencesCount + " occurrences)");
-      myCbReplaceAll.setMnemonic('R');
+      myCbReplaceAll.setMnemonic('A');
       gbConstraints.gridy++;
       panel.add(myCbReplaceAll, gbConstraints);
       myCbReplaceAll.addItemListener(itemListener);
diff --git a/source/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java b/source/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java
index 907bad8a49c9..76988e0d7ba1 100644
--- a/source/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java
+++ b/source/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java
@@ -218,7 +218,7 @@ public class IntroduceParameterDialog extends RefactoringDialog {
     if (myOccurenceNumber > 1 && !myIsInvokedOnDeclaration) {
       gbConstraints.gridy++;
       myCbReplaceAllOccurences = new NonFocusableCheckBox("Replace all occurences (" + myOccurenceNumber + " occurences)");
-      myCbReplaceAllOccurences.setMnemonic('R');
+      myCbReplaceAllOccurences.setMnemonic('e');
       panel.add(myCbReplaceAllOccurences, gbConstraints);
       myCbReplaceAllOccurences.setSelected(false);
     }
diff --git a/source/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java b/source/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java
index 313e8e58572a..13ba5c5dc4b1 100644
--- a/source/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java
+++ b/source/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java
@@ -168,7 +168,7 @@ class IntroduceVariableDialog extends DialogWrapper implements IntroduceVariable
 
     if (myOccurrencesCount > 1) {
       myCbReplaceAll = new NonFocusableCheckBox("Replace all occurrences of expression (" + myOccurrencesCount + " occurrences)");
-      myCbReplaceAll.setMnemonic('R');
+      myCbReplaceAll.setMnemonic('A');
       panel.add(myCbReplaceAll, gbConstraints);
       myCbReplaceAll.addItemListener(
               new ItemListener() {
diff --git a/source/com/intellij/refactoring/memberPullUp/PullUpDialog.java b/source/com/intellij/refactoring/memberPullUp/PullUpDialog.java
index c0ce4a3ba1ba..5dfb6f2d5a01 100644
--- a/source/com/intellij/refactoring/memberPullUp/PullUpDialog.java
+++ b/source/com/intellij/refactoring/memberPullUp/PullUpDialog.java
@@ -152,15 +152,6 @@ public class PullUpDialog extends DialogWrapper {
     }*/
   }
 
-  /*protected JComponent createSouthPanel() {
-    JPanel panel = new JPanel(new BorderLayout());
-    panel.add(super.createSouthPanel(), BorderLayout.CENTER);
-    myCbPreviewUsages.setSelected(RefactoringSettings.getInstance().PULL_UP_MEMBERS_PREVIEW_USAGES);
-    myCbPreviewUsages.setMnemonic('P');
-    panel.add(myCbPreviewUsages, BorderLayout.WEST);
-    return panel;
-  }*/
-
   protected void doAction() {
     if (!myCallback.checkConflicts(this)) return;
     RefactoringSettings.getInstance().PULL_UP_MEMBERS_JAVADOC = myJavaDocPanel.getPolicy();
diff --git a/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java b/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
index 3b6de2e8021d..d0f090154427 100644
--- a/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
+++ b/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
@@ -148,7 +148,7 @@ public class MoveClassesOrPackagesDialog extends RefactoringDialog {
     gbConstraints.gridwidth = 2;
     myCbPreserveSourceFolders =
     new NonFocusableCheckBox("Preserve source folders");
-    myCbPreserveSourceFolders.setMnemonic('r');
+    myCbPreserveSourceFolders.setMnemonic('f');
     panel.add(myCbPreserveSourceFolders, gbConstraints);
 
 
diff --git a/source/com/intellij/refactoring/rename/RenameDialog.java b/source/com/intellij/refactoring/rename/RenameDialog.java
index 76cb6cb48abc..af28a0df7476 100644
--- a/source/com/intellij/refactoring/rename/RenameDialog.java
+++ b/source/com/intellij/refactoring/rename/RenameDialog.java
@@ -379,18 +379,6 @@ public class RenameDialog extends RefactoringDialog {
     return panel;
   }
 
-  /*
-  protected JComponent createSouthPanel() {
-    myCbPreviewResults = new NonFocusableCheckBox("Preview usages to be changed");
-    myCbPreviewResults.setSelected(RefactoringSettings.getInstance().RENAME_PREVIEW_USAGES);
-    JPanel panel = new JPanel(new BorderLayout());
-    panel.add(super.createSouthPanel(), BorderLayout.CENTER);
-    myCbPreviewResults.setMnemonic('P');
-    panel.add(myCbPreviewResults, BorderLayout.WEST);
-    return panel;
-  }
-  */
-
   protected void doHelpAction() {
     HelpManager.getInstance().invokeHelp(myHelpID);
   }
diff --git a/source/com/intellij/refactoring/typeCook/TypeCookDialog.java b/source/com/intellij/refactoring/typeCook/TypeCookDialog.java
index 848820db8ef6..8510c2e60152 100644
--- a/source/com/intellij/refactoring/typeCook/TypeCookDialog.java
+++ b/source/com/intellij/refactoring/typeCook/TypeCookDialog.java
@@ -103,7 +103,7 @@ public class TypeCookDialog extends RefactoringDialog {
     }
 
     myCbDropCasts.setMnemonic('D');
-    myCbPreserveRawArrays.setMnemonic('P');
+    myCbPreserveRawArrays.setMnemonic('A');
     myCbLeaveObjectParameterizedTypesRaw.setMnemonic('L');
     myCbExhaustive.setMnemonic('E');
     myCbCookObjects.setMnemonic('O');
diff --git a/source/com/intellij/refactoring/ui/EditableRowTableManager.java b/source/com/intellij/refactoring/ui/EditableRowTableManager.java
index 10f51957c3ff..6fe60a5d35df 100644
--- a/source/com/intellij/refactoring/ui/EditableRowTableManager.java
+++ b/source/com/intellij/refactoring/ui/EditableRowTableManager.java
@@ -47,7 +47,7 @@ public class EditableRowTableManager  {
     buttonsPanel.add(myAddButton, gbConstraints);
 
     myRemoveButton = new JButton("Remove");
-    if (addMnemonics) myRemoveButton.setMnemonic('R');
+    if (addMnemonics) myRemoveButton.setMnemonic('E');
     myRemoveButton.setDefaultCapable(false);
     buttonsPanel.add(myRemoveButton, gbConstraints);