diff --git a/reactos/dll/win32/netcfgx/lang/bg-BG.rc b/reactos/dll/win32/netcfgx/lang/bg-BG.rc
index fbe6cb485d5..7171d53f43f 100644
--- a/reactos/dll/win32/netcfgx/lang/bg-BG.rc
+++ b/reactos/dll/win32/netcfgx/lang/bg-BG.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "IP адрес:", -1, 5, 15, 70, 12
     LTEXT "Подмрежова маска:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Отказ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Автоматични мерни единици", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Отказ", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/cs-CZ.rc b/reactos/dll/win32/netcfgx/lang/cs-CZ.rc
index e1511f339c6..f8cb08dffc5 100644
--- a/reactos/dll/win32/netcfgx/lang/cs-CZ.rc
+++ b/reactos/dll/win32/netcfgx/lang/cs-CZ.rc
@@ -122,7 +122,7 @@ BEGIN
     LTEXT "IP adresa:", -1, 5, 15, 70, 12
     LTEXT "Maska podsítě:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "OK", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "OK", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Storno", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -136,7 +136,7 @@ BEGIN
     CHECKBOX "Automatická metrika", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metrika:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Storno", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/da-DK.rc b/reactos/dll/win32/netcfgx/lang/da-DK.rc
index b5af68d0e4a..1311792248e 100644
--- a/reactos/dll/win32/netcfgx/lang/da-DK.rc
+++ b/reactos/dll/win32/netcfgx/lang/da-DK.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/de-DE.rc b/reactos/dll/win32/netcfgx/lang/de-DE.rc
index 5ce3b290f3f..79b7d37de2d 100644
--- a/reactos/dll/win32/netcfgx/lang/de-DE.rc
+++ b/reactos/dll/win32/netcfgx/lang/de-DE.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "IP-Adresse:", -1, 5, 15, 70, 12
     LTEXT "Subnetzmaske:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Automatische Metrik", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metrik:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/el-GR.rc b/reactos/dll/win32/netcfgx/lang/el-GR.rc
index e25033b98e9..13d28e5a802 100644
--- a/reactos/dll/win32/netcfgx/lang/el-GR.rc
+++ b/reactos/dll/win32/netcfgx/lang/el-GR.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/en-US.rc b/reactos/dll/win32/netcfgx/lang/en-US.rc
index a997d488c6c..73ee0afe478 100644
--- a/reactos/dll/win32/netcfgx/lang/en-US.rc
+++ b/reactos/dll/win32/netcfgx/lang/en-US.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/es-ES.rc b/reactos/dll/win32/netcfgx/lang/es-ES.rc
index 3368bb45520..ba25c24b6af 100644
--- a/reactos/dll/win32/netcfgx/lang/es-ES.rc
+++ b/reactos/dll/win32/netcfgx/lang/es-ES.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "Dirección IP:", -1, 5, 15, 70, 12
     LTEXT "Máscara de subred:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancelar", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Métrica automática", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Métrica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancelar", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/fr-FR.rc b/reactos/dll/win32/netcfgx/lang/fr-FR.rc
index f49791ef626..01423f16233 100644
--- a/reactos/dll/win32/netcfgx/lang/fr-FR.rc
+++ b/reactos/dll/win32/netcfgx/lang/fr-FR.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "Adresse IP:", -1, 5, 15, 70, 12
     LTEXT "Masque de sous-réseau:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "Ajouter", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "Ajouter", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Annuler", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Métrique automatique", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "Métrique :", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "Ajouter", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "Ajouter", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Annuler", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/he-IL.rc b/reactos/dll/win32/netcfgx/lang/he-IL.rc
index 2f8198ef343..1d9d86ec8de 100644
--- a/reactos/dll/win32/netcfgx/lang/he-IL.rc
+++ b/reactos/dll/win32/netcfgx/lang/he-IL.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "כתובת IP:", -1, 5, 15, 70, 12
     LTEXT "מסכת רשת משנה:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "ביטול", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "ביטול", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/hu-HU.rc b/reactos/dll/win32/netcfgx/lang/hu-HU.rc
index f7bff984454..214c9a1f471 100644
--- a/reactos/dll/win32/netcfgx/lang/hu-HU.rc
+++ b/reactos/dll/win32/netcfgx/lang/hu-HU.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/id-ID.rc b/reactos/dll/win32/netcfgx/lang/id-ID.rc
index 5e6cf850a7e..5e09aa0817d 100644
--- a/reactos/dll/win32/netcfgx/lang/id-ID.rc
+++ b/reactos/dll/win32/netcfgx/lang/id-ID.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/it-IT.rc b/reactos/dll/win32/netcfgx/lang/it-IT.rc
index 2e9d18ed573..5340591e1f2 100644
--- a/reactos/dll/win32/netcfgx/lang/it-IT.rc
+++ b/reactos/dll/win32/netcfgx/lang/it-IT.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "Indirizzo IP:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Annulla", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Metriche automatiche", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metrica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Annulla", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/ja-JP.rc b/reactos/dll/win32/netcfgx/lang/ja-JP.rc
index bfed7493de2..eb690b98cdc 100644
--- a/reactos/dll/win32/netcfgx/lang/ja-JP.rc
+++ b/reactos/dll/win32/netcfgx/lang/ja-JP.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/nl-NL.rc b/reactos/dll/win32/netcfgx/lang/nl-NL.rc
index 898eec861d6..4a81e25eaca 100644
--- a/reactos/dll/win32/netcfgx/lang/nl-NL.rc
+++ b/reactos/dll/win32/netcfgx/lang/nl-NL.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/no-NO.rc b/reactos/dll/win32/netcfgx/lang/no-NO.rc
index 22799eae4dc..d7391d6d48a 100644
--- a/reactos/dll/win32/netcfgx/lang/no-NO.rc
+++ b/reactos/dll/win32/netcfgx/lang/no-NO.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "IP adresse:", -1, 5, 15, 70, 12
     LTEXT "Subnet maske:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Avbryt", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Automatisk metrisk", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metrisk:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Avbryt", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/pl-PL.rc b/reactos/dll/win32/netcfgx/lang/pl-PL.rc
index 51f491d4fd5..7c40c334d5d 100644
--- a/reactos/dll/win32/netcfgx/lang/pl-PL.rc
+++ b/reactos/dll/win32/netcfgx/lang/pl-PL.rc
@@ -123,7 +123,7 @@ BEGIN
     LTEXT "Adres IP:", -1, 5, 15, 70, 12
     LTEXT "Maska podsieci:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Anuluj", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -137,7 +137,7 @@ BEGIN
     CHECKBOX "Metryka automatyczna", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metryka:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Anuluj", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/ro-RO.rc b/reactos/dll/win32/netcfgx/lang/ro-RO.rc
index a4a62cb40ec..84214352234 100644
--- a/reactos/dll/win32/netcfgx/lang/ro-RO.rc
+++ b/reactos/dll/win32/netcfgx/lang/ro-RO.rc
@@ -123,7 +123,7 @@ BEGIN
     LTEXT "Adresă &IP:", -1, 5, 15, 70, 12
     LTEXT "Mască de &subrețea:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "A&nulează", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -137,7 +137,7 @@ BEGIN
     CHECKBOX "Metrică stabilită a&utomat", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metrică:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "A&nulează", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/ru-RU.rc b/reactos/dll/win32/netcfgx/lang/ru-RU.rc
index e4b006d6ee0..421543a6384 100644
--- a/reactos/dll/win32/netcfgx/lang/ru-RU.rc
+++ b/reactos/dll/win32/netcfgx/lang/ru-RU.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "IP адрес:", -1, 5, 15, 70, 12
     LTEXT "Маска подсети:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Отмена", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Автоматическая метрика", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Метрика:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Отмена", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/sk-SK.rc b/reactos/dll/win32/netcfgx/lang/sk-SK.rc
index 1a78c13bdfd..b8dfba576fc 100644
--- a/reactos/dll/win32/netcfgx/lang/sk-SK.rc
+++ b/reactos/dll/win32/netcfgx/lang/sk-SK.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "Adresa IP:", -1, 5, 15, 70, 12
     LTEXT "Maska podsiete:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Zrušiť", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Automatická metrika", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metrika:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Zrušiť", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/sq-AL.rc b/reactos/dll/win32/netcfgx/lang/sq-AL.rc
index 59f8f7c33b9..45db4c33957 100644
--- a/reactos/dll/win32/netcfgx/lang/sq-AL.rc
+++ b/reactos/dll/win32/netcfgx/lang/sq-AL.rc
@@ -121,7 +121,7 @@ BEGIN
     LTEXT "Adresa IP:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Anulo", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -135,7 +135,7 @@ BEGIN
     CHECKBOX "Automatik metrik", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metrik:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Anulo", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/sv-SE.rc b/reactos/dll/win32/netcfgx/lang/sv-SE.rc
index 7028139b0fb..1e6314759a1 100644
--- a/reactos/dll/win32/netcfgx/lang/sv-SE.rc
+++ b/reactos/dll/win32/netcfgx/lang/sv-SE.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "IP address:", -1, 5, 15, 70, 12
     LTEXT "Subnet mask:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/tr-TR.rc b/reactos/dll/win32/netcfgx/lang/tr-TR.rc
index d340cea47ae..7244c20672a 100644
--- a/reactos/dll/win32/netcfgx/lang/tr-TR.rc
+++ b/reactos/dll/win32/netcfgx/lang/tr-TR.rc
@@ -118,7 +118,7 @@ BEGIN
     LTEXT "IP Adresi:", -1, 5, 15, 70, 12
     LTEXT "Alt Ağ Maskesi:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "İptal", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -132,7 +132,7 @@ BEGIN
     CHECKBOX "Kendiliğinden Ölçü", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Ölçü:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "İptal", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/uk-UA.rc b/reactos/dll/win32/netcfgx/lang/uk-UA.rc
index d9f6d2cd989..5227c92ded0 100644
--- a/reactos/dll/win32/netcfgx/lang/uk-UA.rc
+++ b/reactos/dll/win32/netcfgx/lang/uk-UA.rc
@@ -116,7 +116,7 @@ BEGIN
     LTEXT "IP-адреса:", -1, 5, 15, 70, 12
     LTEXT "Маска підмережі:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "Скасувати", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -130,7 +130,7 @@ BEGIN
     CHECKBOX "Автоматична метрика", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "&Метрика:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "Скасувати", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/lang/zh-CN.rc b/reactos/dll/win32/netcfgx/lang/zh-CN.rc
index 75d40e568a8..c58e97e1bde 100644
--- a/reactos/dll/win32/netcfgx/lang/zh-CN.rc
+++ b/reactos/dll/win32/netcfgx/lang/zh-CN.rc
@@ -124,7 +124,7 @@ BEGIN
     LTEXT "IP 地址:", -1, 5, 15, 70, 12
     LTEXT "子网掩码:", -1, 5, 30, 70, 12
     CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12
-    PUSHBUTTON "确定", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "确定", IDC_OK, 50, 50, 50, 14, WS_TABSTOP
     PUSHBUTTON "取消", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP
 END
 
@@ -138,7 +138,7 @@ BEGIN
     CHECKBOX "自动跃点计数", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     LTEXT "公制(&M):", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED
     EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED
-    PUSHBUTTON "确定", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
+    DEFPUSHBUTTON "确定", IDC_OK, 50, 60, 50, 14, WS_TABSTOP
     PUSHBUTTON "取消", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP
 END
 
diff --git a/reactos/dll/win32/netcfgx/tcpipconf_notify.c b/reactos/dll/win32/netcfgx/tcpipconf_notify.c
index f4eeed27cb5..d7eebe252fc 100644
--- a/reactos/dll/win32/netcfgx/tcpipconf_notify.c
+++ b/reactos/dll/win32/netcfgx/tcpipconf_notify.c
@@ -123,6 +123,7 @@ HRESULT InitializeTcpipBasicDlgCtrls(HWND hwndDlg, TcpipSettings * pCurSettings)
 VOID InsertColumnToListView(HWND hDlgCtrl, UINT ResId, UINT SubItem, UINT Size);
 INT_PTR StoreTcpipBasicSettings(HWND hwndDlg, TcpipConfNotifyImpl * This, BOOL bApply);
 HRESULT Initialize(TcpipConfNotifyImpl * This);
+UINT GetIpAddressFromStringW(WCHAR *szBuffer);
 
 VOID
 DisplayError(UINT ResTxt, UINT ResTitle, UINT Type)
@@ -755,6 +756,12 @@ TcpipAdvGwDlg(
         case WM_INITDIALOG:
             pGwSettings = (TcpipGwSettings *)lParam;
             SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)lParam);
+
+            SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223));
+            SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255));
+            SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255));
+            SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255));
+
             if (pGwSettings->bAdd)
             {
                 if (LoadStringW(netcfgx_hInstance, IDS_ADD, szBuffer, sizeof(szBuffer)/sizeof(WCHAR)))
@@ -772,7 +779,10 @@ TcpipAdvGwDlg(
                     szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
                     SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer);
                 }
-                SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_SETTEXT, 0, (LPARAM)pGwSettings->szIP);
+
+                if (pGwSettings->szIP)
+                    SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETADDRESS, 0, (LPARAM)GetIpAddressFromStringW(pGwSettings->szIP));
+
                 if (pGwSettings->Metric)
                 {
                     SetDlgItemInt(hwndDlg, IDC_METRIC, pGwSettings->Metric, FALSE);
@@ -786,10 +796,6 @@ TcpipAdvGwDlg(
                     EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), FALSE);
                 }
             }
-            SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223));
-            SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255));
-            SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255));
-            SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255));
             return TRUE;
         case WM_COMMAND:
             if (LOWORD(wParam) == IDC_USEMETRIC)
@@ -934,8 +940,12 @@ TcpipAddIpDlg(
                     szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
                     SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer);
                 }
-                SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_SETTEXT, 0, (LPARAM)pIpSettings->szIP);
-                SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, WM_SETTEXT, 0, (LPARAM)pIpSettings->szMask);
+
+                if (pIpSettings->szIP)
+                    SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETADDRESS, 0, (LPARAM)GetIpAddressFromStringW(pIpSettings->szIP));
+
+                if (pIpSettings->szMask)
+                    SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, (LPARAM)GetIpAddressFromStringW(pIpSettings->szMask));
             }
             return TRUE;
         case WM_NOTIFY: