diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc
index 9612b17fc8..e3402246ca 100644
--- a/sakura_core/sakura_rc.rc
+++ b/sakura_core/sakura_rc.rc
@@ -128,7 +128,7 @@ BEGIN
     COMBOBOX        IDC_COMBO_nSortType,34,3,94,65,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_GREP DIALOGEX 0, 0, 390, 192
+IDD_GREP DIALOGEX 0, 0, 390, 188
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Grep"
@@ -136,45 +136,45 @@ FONT 9, "Yu Gothic UI", 0, 0, 0x1
 BEGIN
     RTEXT           "条件(&N):",IDC_STATIC,4,4,52,8
     COMBOBOX        IDC_COMBO_TEXT,60,4,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "単語単位(&W)",IDC_CHK_WORD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,60,18,80,8
-    CONTROL         "英大小文字区別(&C)",IDC_CHK_LOHICASE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,60,28,80,8
+    CONTROL         "単語単位で探す(&W)",IDC_CHK_WORD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,60,18,80,8
+    CONTROL         "英大文字と小文字を区別する(&C)",IDC_CHK_LOHICASE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,60,28,120,8
     CONTROL         "正規表現(&E)",IDC_CHK_REGULAREXP,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,60,38,80,8
     RTEXT           "(ここに正規表現ライブラリのバージョン情報が表示されます)",IDC_STATIC_JRE32VER,144,38,188,8
-    RTEXT           "検索場所(&L):",IDC_STATIC,4,52,52,8
-    COMBOBOX        IDC_COMBO_FOLDER,60,52,254,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "&...",IDC_BUTTON_FOLDER,316,52,16,10
-    CONTROL         "編集中のファイルから検索(&M)",IDC_CHK_FROMTHISTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,66,100,8
-    CONTROL         "サブフォルダも検索(&S)",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,76,100,8
-    CONTROL         "カレントフォルダが初期値(&D)",IDC_CHK_DEFAULTFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,86,100,8
-    PUSHBUTTON      "上階層へ(&U)",IDC_BUTTON_FOLDER_UP,230,66,50,14
-    PUSHBUTTON      "現フォルダ(&G)",IDC_BUTTON_CURRENTFOLDER,282,66,50,14,BS_MULTILINE
-    RTEXT           "対象ファイル(&I):",IDC_STATIC,4,100,52,8,NOT WS_GROUP
-    COMBOBOX        IDC_COMBO_FILE,60,100,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "除外ファイル(&J):",IDC_STATIC,4,114,52,8,NOT WS_GROUP
-    COMBOBOX        IDC_COMBO_EXCLUDE_FILE,60,114,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "除外フォルダ(&K):",IDC_STATIC,4,128,53,8
-    COMBOBOX        IDC_COMBO_EXCLUDE_FOLDER,60,128,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "結果出力",IDC_STATIC,60,144,68,44,WS_GROUP
-    CONTROL         "該当行(&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,68,156,56,8
-    CONTROL         "該当部分(&2)",IDC_RADIO_OUTPUTMARKED,"Button",BS_AUTORADIOBUTTON,68,166,56,8
-    CONTROL         "否該当行(&3)",IDC_RADIO_NOHIT,"Button",BS_AUTORADIOBUTTON,68,176,56,8
-    GROUPBOX        "結果出力形式",IDC_STATIC,132,144,68,44,WS_GROUP
-    CONTROL         "ノーマル(&4)",IDC_RADIO_OUTPUTSTYLE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,140,156,52,8
-    CONTROL         "ファイル毎(&5)",IDC_RADIO_OUTPUTSTYLE2,"Button",BS_AUTORADIOBUTTON,140,166,52,8
-    CONTROL         "結果のみ(&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,140,176,52,8
-    GROUPBOX        "その他",IDC_STATIC,204,144,180,44,WS_GROUP
-    CONTROL         "ファイル毎最初のみ検索(&7)",IDC_CHECK_FILE_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,156,92,8
-    CONTROL         "フォルダ毎に表示(&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,166,92,8
-    CONTROL         "ベースフォルダ表示(&9)",IDC_CHECK_BASE_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,176,92,8
-    LTEXT           "文字コードセット(&A):",IDC_STATIC,312,152,62,8
-    COMBOBOX        IDC_COMBO_CHARSET,312,162,64,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,312,176,30,8
+    RTEXT           "検索場所(&L):",IDC_STATIC,4,50,52,8
+    COMBOBOX        IDC_COMBO_FOLDER,60,50,254,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&...",IDC_BUTTON_FOLDER,316,50,16,10
+    CONTROL         "編集中のファイルから検索(&M)",IDC_CHK_FROMTHISTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,64,120,8
+    CONTROL         "サブフォルダも検索(&S)",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,74,120,8
+    CONTROL         "カレントフォルダが初期値(&D)",IDC_CHK_DEFAULTFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,84,120,8
+    PUSHBUTTON      "上階層へ(&U)",IDC_BUTTON_FOLDER_UP,230,64,50,14
+    PUSHBUTTON      "現フォルダ(&G)",IDC_BUTTON_CURRENTFOLDER,282,64,50,14,BS_MULTILINE
+    RTEXT           "対象ファイル(&I):",IDC_STATIC,4,96,52,8,NOT WS_GROUP
+    COMBOBOX        IDC_COMBO_FILE,60,96,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "除外ファイル(&J):",IDC_STATIC,4,110,52,8,NOT WS_GROUP
+    COMBOBOX        IDC_COMBO_EXCLUDE_FILE,60,110,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "除外フォルダ(&K):",IDC_STATIC,4,124,53,8
+    COMBOBOX        IDC_COMBO_EXCLUDE_FOLDER,60,124,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "結果出力",IDC_STATIC,60,140,68,44,WS_GROUP
+    CONTROL         "該当行(&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,68,152,56,8
+    CONTROL         "該当部分(&2)",IDC_RADIO_OUTPUTMARKED,"Button",BS_AUTORADIOBUTTON,68,162,56,8
+    CONTROL         "否該当行(&3)",IDC_RADIO_NOHIT,"Button",BS_AUTORADIOBUTTON,68,172,56,8
+    GROUPBOX        "結果出力形式",IDC_STATIC,132,140,68,44,WS_GROUP
+    CONTROL         "ノーマル(&4)",IDC_RADIO_OUTPUTSTYLE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,140,152,56,8
+    CONTROL         "ファイル毎(&5)",IDC_RADIO_OUTPUTSTYLE2,"Button",BS_AUTORADIOBUTTON,140,162,56,8
+    CONTROL         "結果のみ(&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,140,172,56,8
+    GROUPBOX        "その他",IDC_STATIC,204,140,180,44,WS_GROUP
+    CONTROL         "ファイル毎最初のみ検索(&7)",IDC_CHECK_FILE_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,152,96,8
+    CONTROL         "フォルダ毎に表示(&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,162,96,8
+    CONTROL         "ベースフォルダ表示(&9)",IDC_CHECK_BASE_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,172,96,8
+    LTEXT           "文字コードセット(&A):",IDC_STATIC,312,148,66,8
+    COMBOBOX        IDC_COMBO_CHARSET,312,158,64,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,312,172,30,8
     DEFPUSHBUTTON   "検索(&F)",IDOK,336,4,50,14,WS_GROUP
     PUSHBUTTON      "キャンセル(&X)",IDCANCEL,336,20,50,14
     PUSHBUTTON      "ヘルプ(&H)",IDC_BUTTON_HELP,336,36,50,14
 END
 
-IDD_GREP_REPLACE DIALOGEX 0, 0, 390, 204
+IDD_GREP_REPLACE DIALOGEX 0, 0, 390, 202
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Grep置換"
@@ -184,8 +184,8 @@ BEGIN
     COMBOBOX        IDC_COMBO_TEXT,60,4,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     RTEXT           "置換後(&Z):",IDC_STATIC,4,18,52,10
     COMBOBOX        IDC_COMBO_TEXT2,60,18,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "単語単位(&W)",IDC_CHK_WORD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,60,32,80,8
-    CONTROL         "英大小文字区別(&C)",IDC_CHK_LOHICASE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,60,42,80,8
+    CONTROL         "単語単位で探す(&W)",IDC_CHK_WORD,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,60,32,80,8
+    CONTROL         "英大文字と小文字を区別する(&C)",IDC_CHK_LOHICASE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,60,42,120,8
     CONTROL         "正規表現(&E)",IDC_CHK_REGULAREXP,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,60,52,80,8
     CONTROL         "クリップボードの内容で置換(&V)",IDC_CHK_PASTE,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,196,32,120,8
     CONTROL         "バックアップ作成(&B)",IDC_CHK_BACKUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,196,42,120,8
@@ -193,31 +193,31 @@ BEGIN
     RTEXT           "検索場所(&L):",IDC_STATIC,4,64,52,8
     COMBOBOX        IDC_COMBO_FOLDER,60,64,254,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "&...",IDC_BUTTON_FOLDER,316,64,16,10
-    CONTROL         "編集中のファイルから検索(&M)",IDC_CHK_FROMTHISTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,78,100,8
-    CONTROL         "サブフォルダも検索(&S)",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,88,100,8
-    CONTROL         "カレントフォルダが初期値(&D)",IDC_CHK_DEFAULTFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,98,100,8
+    CONTROL         "編集中のファイルから検索(&M)",IDC_CHK_FROMTHISTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,78,120,8
+    CONTROL         "サブフォルダも検索(&S)",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,88,120,8
+    CONTROL         "カレントフォルダが初期値(&D)",IDC_CHK_DEFAULTFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,60,98,120,8
     PUSHBUTTON      "上階層へ(&U)",IDC_BUTTON_FOLDER_UP,230,78,50,14
     PUSHBUTTON      "現フォルダ(&G)",IDC_BUTTON_CURRENTFOLDER,282,78,50,14,BS_MULTILINE
-    RTEXT           "対象ファイル(&I):",IDC_STATIC,4,114,52,8,NOT WS_GROUP
-    COMBOBOX        IDC_COMBO_FILE,60,114,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "除外ファイル(&J):",IDC_STATIC,4,128,52,8,NOT WS_GROUP
-    COMBOBOX        IDC_COMBO_EXCLUDE_FILE,60,128,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "除外フォルダ(&K):",IDC_STATIC,4,142,52,8
-    COMBOBOX        IDC_COMBO_EXCLUDE_FOLDER,60,142,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "結果出力",IDC_STATIC,60,156,68,44,WS_GROUP
-    CONTROL         "該当行(&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,68,168,56,8
-    CONTROL         "該当部分(&2)",IDC_RADIO_OUTPUTMARKED,"Button",BS_AUTORADIOBUTTON,68,178,56,8
-    GROUPBOX        "結果出力形式",IDC_STATIC,132,156,68,44,WS_GROUP
-    CONTROL         "ノーマル(&4)",IDC_RADIO_OUTPUTSTYLE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,140,168,52,8
-    CONTROL         "ファイル毎(&5)",IDC_RADIO_OUTPUTSTYLE2,"Button",BS_AUTORADIOBUTTON,140,178,52,8
-    CONTROL         "結果のみ(&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,140,188,52,8
-    GROUPBOX        "その他",IDC_STATIC,204,156,180,44,WS_GROUP
-    CONTROL         "ファイル毎最初のみ検索(&7)",IDC_CHECK_FILE_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,168,92,8
-    CONTROL         "フォルダ毎に表示(&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,178,92,8
-    CONTROL         "ベースフォルダ表示(&9)",IDC_CHECK_BASE_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,188,92,8
-    LTEXT           "文字コードセット(&A):",IDC_STATIC,312,164,62,8
-    COMBOBOX        IDC_COMBO_CHARSET,312,174,64,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,312,188,30,8
+    RTEXT           "対象ファイル(&I):",IDC_STATIC,4,110,52,8,NOT WS_GROUP
+    COMBOBOX        IDC_COMBO_FILE,60,110,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "除外ファイル(&J):",IDC_STATIC,4,124,52,8,NOT WS_GROUP
+    COMBOBOX        IDC_COMBO_EXCLUDE_FILE,60,124,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "除外フォルダ(&K):",IDC_STATIC,4,138,52,8
+    COMBOBOX        IDC_COMBO_EXCLUDE_FOLDER,60,138,272,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "結果出力",IDC_STATIC,60,154,68,44,WS_GROUP
+    CONTROL         "該当行(&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,68,166,56,8
+    CONTROL         "該当部分(&2)",IDC_RADIO_OUTPUTMARKED,"Button",BS_AUTORADIOBUTTON,68,176,56,8
+    GROUPBOX        "結果出力形式",IDC_STATIC,132,154,68,44,WS_GROUP
+    CONTROL         "ノーマル(&4)",IDC_RADIO_OUTPUTSTYLE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,140,166,56,8
+    CONTROL         "ファイル毎(&5)",IDC_RADIO_OUTPUTSTYLE2,"Button",BS_AUTORADIOBUTTON,140,176,56,8
+    CONTROL         "結果のみ(&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,140,186,56,8
+    GROUPBOX        "その他",IDC_STATIC,204,154,180,44,WS_GROUP
+    CONTROL         "ファイル毎最初のみ検索(&7)",IDC_CHECK_FILE_ONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,166,96,8
+    CONTROL         "フォルダ毎に表示(&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,176,96,8
+    CONTROL         "ベースフォルダ表示(&9)",IDC_CHECK_BASE_PATH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,212,186,96,8
+    LTEXT           "文字コードセット(&A):",IDC_STATIC,312,162,62,8
+    COMBOBOX        IDC_COMBO_CHARSET,312,172,64,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,312,186,30,8
     DEFPUSHBUTTON   "置換(&R)",IDOK,336,4,50,14,WS_GROUP
     PUSHBUTTON      "キャンセル(&X)",IDCANCEL,336,20,50,14
     PUSHBUTTON      "ヘルプ(&H)",IDC_BUTTON_HELP,336,36,50,14
@@ -1736,7 +1736,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 303
         TOPMARGIN, 7
-        BOTTOMMARGIN, 136
+        BOTTOMMARGIN, 132
     END
 
     IDD_GREP_REPLACE, DIALOG
@@ -1744,7 +1744,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 303
         TOPMARGIN, 7
-        BOTTOMMARGIN, 158
+        BOTTOMMARGIN, 156
     END
 
     IDD_GREPRUNNING, DIALOG
@@ -2183,6 +2183,11 @@ BEGIN
     0
 END
 
+IDD_GREP_REPLACE AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -3409,8 +3414,6 @@ BEGIN
     STR_ERR_DLGEDITVW6      "■"
     STR_MENU_KEYWORDINFO    "キーワードの説明をクリップボードにコピー"
     STR_MENU_OPENKEYWORDDIC "キーワード辞書を開く"
-    STR_STATUS_FONTZOOM_0   "%4.0f %%"
-    STR_STATUS_FONTZOOM_1   "%4.1f %%"
     STR_STATUS_ROW_COL      "%5d 行 %4d 桁"
     STR_INS_MODE_INS        "挿入"
     STR_INS_MODE_OVR        "上書"
@@ -3423,6 +3426,15 @@ BEGIN
     STR_GREP_COMPLETE_WORD  "    (単語単位で探す)\r\n"
 END
 
+STRINGTABLE
+BEGIN
+    STR_FILEDIALOG_MRU      "最近のファイル(&F):"
+    STR_FILEDIALOG_OPENFOLDER "最近のフォルダ(&D):"
+    STR_IMPEXP_REGEX4       "キーワードが長過ぎるため切り捨てました。"
+    STR_STATUS_FONTZOOM_0   "%4.0f %%"
+    STR_STATUS_FONTZOOM_1   "%4.1f %%"
+END
+
 STRINGTABLE
 BEGIN
     STR_GREP_CASE_SENSITIVE "    (英大文字小文字を区別する)\r\n"
@@ -3905,13 +3917,6 @@ BEGIN
     STR_ERR_CSHAREDATA18    "${w?$h$:アウトプット$:$f$}${U?(更新)$} - sakura $V ${R?(読みとり専用)$:（上書き禁止）$}${M?  【キーマクロの記録中】$}"
 END
 
-STRINGTABLE
-BEGIN
-    STR_FILEDIALOG_MRU      "最近のファイル(&F):"
-    STR_FILEDIALOG_OPENFOLDER "最近のフォルダ(&D):"
-    STR_IMPEXP_REGEX4       "キーワードが長過ぎるため切り捨てました。"
-END
-
 STRINGTABLE
 BEGIN
     STR_ERR_CSHAREDATA19    "同時に複数の編集用ウィンドウを閉じようとしています。これらを閉じますか?"
diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc
index 85c9bceb84..25c507c09e 100644
--- a/sakura_lang_en_US/sakura_lang_rc.rc
+++ b/sakura_lang_en_US/sakura_lang_rc.rc
@@ -134,7 +134,7 @@ BEGIN
     COMBOBOX        IDC_COMBO_nSortType,34,3,94,65,CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_GREP DIALOGEX 0, 0, 430, 192
+IDD_GREP DIALOGEX 0, 0, 430, 188
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Grep"
@@ -146,44 +146,44 @@ BEGIN
     CONTROL         "&Case sensitive",IDC_CHK_LOHICASE,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,72,28,80,8
     CONTROL         "Regular &expression",IDC_CHK_REGULAREXP,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,72,38,80,8
     RTEXT           "(Regular expression libraly version is displayed here)",IDC_STATIC_JRE32VER,172,38,200,8
-    RTEXT           "&Look in:",IDC_STATIC,4,52,64,8
-    COMBOBOX        IDC_COMBO_FOLDER,72,52,282,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "&...",IDC_BUTTON_FOLDER,356,52,16,10
-    CONTROL         "Current file (&M)",IDC_CHK_FROMTHISTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,66,120,8
-    CONTROL         "Include &subfolders",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,76,120,8
+    RTEXT           "&Look in:",IDC_STATIC,4,50,64,8
+    COMBOBOX        IDC_COMBO_FOLDER,72,50,282,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&...",IDC_BUTTON_FOLDER,356,50,16,10
+    CONTROL         "Current file (&M)",IDC_CHK_FROMTHISTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,64,120,8
+    CONTROL         "Include &subfolders",IDC_CHK_SUBFOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,74,120,8
     CONTROL         "Set current folder as &default",IDC_CHK_DEFAULTFOLDER,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,86,120,8
-    PUSHBUTTON      "Move &Up",IDC_BUTTON_FOLDER_UP,260,66,50,14
-    PUSHBUTTON      "Curr. Folder (&G)",IDC_BUTTON_CURRENTFOLDER,312,66,60,14,BS_MULTILINE
-    RTEXT           "Filters (&I):",IDC_STATIC,4,100,64,8,NOT WS_GROUP
-    COMBOBOX        IDC_COMBO_FILE,72,100,300,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Exclude file (&J):",IDC_STATIC,4,114,64,8,NOT WS_GROUP
-    COMBOBOX        IDC_COMBO_EXCLUDE_FILE,72,114,300,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Exclude folder (&K):",IDC_STATIC,4,128,64,8
-    COMBOBOX        IDC_COMBO_EXCLUDE_FOLDER,72,128,300,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Result output",IDC_STATIC,72,144,92,44,WS_GROUP
-    CONTROL         "Matched line (&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,80,156,80,8
-    CONTROL         "Matched part (&2)",IDC_RADIO_OUTPUTMARKED,"Button",BS_AUTORADIOBUTTON,80,166,80,8
-    CONTROL         "Not matched line (&3)",IDC_RADIO_NOHIT,"Button",BS_AUTORADIOBUTTON,80,176,80,8
-    GROUPBOX        "Output format",IDC_STATIC,168,144,72,44,WS_GROUP
-    CONTROL         "Normal (&4)",IDC_RADIO_OUTPUTSTYLE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,176,156,60,8
-    CONTROL         "Each file (&5)",IDC_RADIO_OUTPUTSTYLE2,"Button",BS_AUTORADIOBUTTON,176,166,60,8
-    CONTROL         "Result only (&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,176,176,60,8
-    GROUPBOX        "Other",IDC_STATIC,244,144,180,44,WS_GROUP
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,84,120,8
+    PUSHBUTTON      "Move &Up",IDC_BUTTON_FOLDER_UP,260,64,50,14
+    PUSHBUTTON      "Curr. Folder (&G)",IDC_BUTTON_CURRENTFOLDER,312,64,60,14,BS_MULTILINE
+    RTEXT           "Filters (&I):",IDC_STATIC,4,96,64,8,NOT WS_GROUP
+    COMBOBOX        IDC_COMBO_FILE,72,96,300,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Exclude file (&J):",IDC_STATIC,4,110,64,8,NOT WS_GROUP
+    COMBOBOX        IDC_COMBO_EXCLUDE_FILE,72,110,300,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Exclude folder (&K):",IDC_STATIC,4,124,64,8
+    COMBOBOX        IDC_COMBO_EXCLUDE_FOLDER,72,124,300,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Result output",IDC_STATIC,72,140,92,44,WS_GROUP
+    CONTROL         "Matched line (&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,80,152,80,8
+    CONTROL         "Matched part (&2)",IDC_RADIO_OUTPUTMARKED,"Button",BS_AUTORADIOBUTTON,80,162,80,8
+    CONTROL         "Not matched line (&3)",IDC_RADIO_NOHIT,"Button",BS_AUTORADIOBUTTON,80,172,80,8
+    GROUPBOX        "Output format",IDC_STATIC,168,140,72,44,WS_GROUP
+    CONTROL         "Normal (&4)",IDC_RADIO_OUTPUTSTYLE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,176,152,60,8
+    CONTROL         "Each file (&5)",IDC_RADIO_OUTPUTSTYLE2,"Button",BS_AUTORADIOBUTTON,176,162,60,8
+    CONTROL         "Result only (&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,176,172,60,8
+    GROUPBOX        "Other",IDC_STATIC,244,140,180,44,WS_GROUP
     CONTROL         "Only first match each file (&7)",IDC_CHECK_FILE_ONLY,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,252,156,108,8
-    CONTROL         "Output each folder (&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,252,166,108,8
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,252,152,108,8
+    CONTROL         "Output each folder (&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,252,162,108,8
     CONTROL         "Output with relative path (&9)",IDC_CHECK_BASE_PATH,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,252,176,108,8
-    LTEXT           "Encoding (&A):",IDC_STATIC,360,152,60,8
-    COMBOBOX        IDC_COMBO_CHARSET,360,162,60,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,360,176,60,8
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,252,172,108,8
+    LTEXT           "Encoding (&A):",IDC_STATIC,360,148,60,8
+    COMBOBOX        IDC_COMBO_CHARSET,360,158,60,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,360,172,60,8
     DEFPUSHBUTTON   "&Find",IDOK,376,4,50,14,WS_GROUP
     PUSHBUTTON      "Cancel (&X)",IDCANCEL,376,20,50,14
     PUSHBUTTON      "&Help",IDC_BUTTON_HELP,376,36,50,14
 END
 
-IDD_GREP_REPLACE DIALOGEX 0, 0, 430, 208
+IDD_GREP_REPLACE DIALOGEX 0, 0, 430, 202
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "Grep Replace"
@@ -208,28 +208,28 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,98,120,8
     PUSHBUTTON      "Move &Up",IDC_BUTTON_FOLDER_UP,260,78,50,14
     PUSHBUTTON      "Curr. Folder (&G)",IDC_BUTTON_CURRENTFOLDER,312,78,60,14,BS_MULTILINE
-    RTEXT           "Filters (&I):",IDC_STATIC,4,114,64,8,NOT WS_GROUP
-    COMBOBOX        IDC_COMBO_FILE,72,114,300,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Exclude file (&J):",IDC_STATIC,4,128,64,8,NOT WS_GROUP
-    COMBOBOX        IDC_COMBO_EXCLUDE_FILE,72,128,300,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Exclude folder (&K):",IDC_STATIC,4,142,64,8
-    COMBOBOX        IDC_COMBO_EXCLUDE_FOLDER,72,142,300,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Result output",IDC_STATIC,72,160,92,44,WS_GROUP
-    CONTROL         "Matched line (&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,80,172,80,8
-    CONTROL         "Matched part (&2)",IDC_RADIO_OUTPUTMARKED,"Button",BS_AUTORADIOBUTTON,80,182,80,8
-    GROUPBOX        "Output format",IDC_STATIC,168,160,72,44,WS_GROUP
-    CONTROL         "Normal (&4)",IDC_RADIO_OUTPUTSTYLE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,176,172,60,8
-    CONTROL         "Each file (&5)",IDC_RADIO_OUTPUTSTYLE2,"Button",BS_AUTORADIOBUTTON,176,182,60,8
-    CONTROL         "Result only (&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,176,192,60,8
-    GROUPBOX        "Other",IDC_STATIC,244,160,180,44,WS_GROUP
+    RTEXT           "Filters (&I):",IDC_STATIC,4,110,64,8,NOT WS_GROUP
+    COMBOBOX        IDC_COMBO_FILE,72,110,300,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Exclude file (&J):",IDC_STATIC,4,124,64,8,NOT WS_GROUP
+    COMBOBOX        IDC_COMBO_EXCLUDE_FILE,72,124,300,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Exclude folder (&K):",IDC_STATIC,4,138,64,8
+    COMBOBOX        IDC_COMBO_EXCLUDE_FOLDER,72,138,300,120,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Result output",IDC_STATIC,72,154,92,44,WS_GROUP
+    CONTROL         "Matched line (&1)",IDC_RADIO_OUTPUTLINE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,80,166,80,8
+    CONTROL         "Matched part (&2)",IDC_RADIO_OUTPUTMARKED,"Button",BS_AUTORADIOBUTTON,80,176,80,8
+    GROUPBOX        "Output format",IDC_STATIC,168,154,72,44,WS_GROUP
+    CONTROL         "Normal (&4)",IDC_RADIO_OUTPUTSTYLE1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,176,166,60,8
+    CONTROL         "Each file (&5)",IDC_RADIO_OUTPUTSTYLE2,"Button",BS_AUTORADIOBUTTON,176,176,60,8
+    CONTROL         "Result only (&6)",IDC_RADIO_OUTPUTSTYLE3,"Button",BS_AUTORADIOBUTTON,176,186,60,8
+    GROUPBOX        "Other",IDC_STATIC,244,154,180,44,WS_GROUP
     CONTROL         "Only first match each file (&7)",IDC_CHECK_FILE_ONLY,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,252,172,104,8
-    CONTROL         "Output each folder (&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,252,182,104,8
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,252,166,104,8
+    CONTROL         "Output each folder (&8)",IDC_CHECK_SEP_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,252,176,104,8
     CONTROL         "Output with relative path (&9)",IDC_CHECK_BASE_PATH,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,252,192,104,8
-    LTEXT           "Encoding (&A):",IDC_STATIC,360,168,60,8
-    COMBOBOX        IDC_COMBO_CHARSET,360,178,60,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,360,192,60,8
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,252,186,104,8
+    LTEXT           "Encoding (&A):",IDC_STATIC,360,162,60,8
+    COMBOBOX        IDC_COMBO_CHARSET,360,172,60,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "C&P",IDC_CHECK_CP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,360,186,60,8
     DEFPUSHBUTTON   "&Replace",IDOK,376,4,50,14,WS_GROUP
     PUSHBUTTON      "Cancel (&X)",IDCANCEL,376,20,50,14
     PUSHBUTTON      "&Help",IDC_BUTTON_HELP,376,36,50,14
@@ -1792,7 +1792,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 303
         TOPMARGIN, 7
-        BOTTOMMARGIN, 136
+        BOTTOMMARGIN, 132
     END
 
     IDD_GREP_REPLACE, DIALOG
@@ -1800,7 +1800,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 303
         TOPMARGIN, 7
-        BOTTOMMARGIN, 158
+        BOTTOMMARGIN, 152
     END
 
     IDD_GREPRUNNING, DIALOG
@@ -2229,6 +2229,22 @@ IDC_CURSOR_AUTOSCROLL_DOWN_RIGHT CURSOR                  "../resource/auto_scrol
 IDR_MENU1               100                     "../resource/MainMenu.ini"
 
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// AFX_DIALOG_LAYOUT
+//
+
+IDD_GREP AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
+IDD_GREP_REPLACE AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table
@@ -3460,8 +3476,6 @@ BEGIN
     STR_ERR_DLGEDITVW6      "■"
     STR_MENU_KEYWORDINFO    "Copy Keyword description to clipboard"
     STR_MENU_OPENKEYWORDDIC "Open keyword dictionary"
-    STR_STATUS_FONTZOOM_0   "%4.0f %%"
-    STR_STATUS_FONTZOOM_1   "%4.1f %%"
     STR_STATUS_ROW_COL      "%5d Ln %4d Col"
     STR_INS_MODE_INS        "INS"
     STR_INS_MODE_OVR        "OVR"
@@ -3474,6 +3488,15 @@ BEGIN
     STR_GREP_COMPLETE_WORD  "    (Match Whole Word)\r\n"
 END
 
+STRINGTABLE
+BEGIN
+    STR_FILEDIALOG_MRU      "Recent &File:"
+    STR_FILEDIALOG_OPENFOLDER "Recent Fol&der:"
+    STR_IMPEXP_REGEX4       "keyword truncated because too long."
+    STR_STATUS_FONTZOOM_0   "%4.0f %%"
+    STR_STATUS_FONTZOOM_1   "%4.1f %%"
+END
+
 STRINGTABLE
 BEGIN
     STR_GREP_CASE_SENSITIVE "    (Case Sensitivity = Yes)\r\n"
@@ -3964,13 +3987,6 @@ BEGIN
     STR_ERR_CSHAREDATA18    "${w?$h$:Output$:$f$}${U?(Changed)$} - sakura $V ${R?(Read Only)$:(Write Protected)$}${M?  【Recording Macro】$}"
 END
 
-STRINGTABLE
-BEGIN
-    STR_FILEDIALOG_MRU      "Recent &File:"
-    STR_FILEDIALOG_OPENFOLDER "Recent Fol&der:"
-    STR_IMPEXP_REGEX4       "keyword truncated because too long."
-END
-
 STRINGTABLE
 BEGIN
     STR_ERR_CSHAREDATA19    "Attempting to close multiple editor windows, sure you want to do this?"