diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 364dfe7b0..cf2d46cea 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -176,9 +176,8 @@
 			print "<button onclick=\"return opmlRegenKey()\">".
 				__('Generate new URL')."</button> ";
 
-			print "<input class=\"button\"
-				type=\"submit\" onclick=\"return closeInfoBox()\" 
-				value=\"".__('Close this window')."\">";
+			print "<button onclick=\"return closeInfoBox()\">".
+				__('Close this window')."</button>";
 
 			print "</div></div>";
 
@@ -225,9 +224,8 @@
 			
 			print "<div align='center'>";
 
-			print "<input class=\"button\"
-				type=\"submit\" onclick=\"return closeInfoBox()\" 
-				value=\"".__('Close this window')."\">";
+			print "<button onclick=\"return closeInfoBox()\"".
+				__('Close this window')."</button>";
 
 			print "</div></div>";
 
@@ -481,9 +479,8 @@
 				 name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
 
 			print "<span id=\"filter_dlg_date_chk_box\" style=\"display : none\">";
-			print "&nbsp;<input class=\"button\"
-				type=\"submit\" onclick=\"return filterDlgCheckDate()\" 
-				value=\"".__('Check it')."\">";
+			print "&nbsp;<button onclick=\"return filterDlgCheckDate()\">".
+				__('Check it')."</button>";
 			print "</span>";
 
 			print "<br/> " . __("on field") . " ";
@@ -784,9 +781,8 @@
 			print "<button onclick=\"return genUrlChangeKey('$feed_id', '$is_cat')\">".
 				__('Generate new URL')."</button> ";
 
-			print "<input class=\"button\"
-				type=\"submit\" onclick=\"return closeInfoBox()\" 
-				value=\"".__('Close this window')."\">";
+			print "<button onclick=\"return closeInfoBox()\">".
+				__('Close this window')."</button>";
 
 			print "</div></div>";
 
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 1d4f0f98b..0d3026374 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -63,9 +63,8 @@
 					 name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
 
 			print "<span id=\"filter_dlg_date_chk_box\" $date_ops_invisible>";			
-			print "&nbsp;<input class=\"button\"
-				type=\"submit\" onclick=\"return filterDlgCheckDate()\" 
-				value=\"".__('Check it')."\">";
+			print "&nbsp;<button onclick=\"return filterDlgCheckDate()\">".
+				__('Check it')."</button>";
 			print "</span>";
 
 			print "<br/> " . __("on field") . " ";