diff --git a/functions.php b/functions.php
index 388d71530..a5583e729 100644
--- a/functions.php
+++ b/functions.php
@@ -4834,8 +4834,8 @@
 		} else {
 			print "
 				<div style=\"text-align : center\">
-				<input type=\"submit\" onclick=\"return window.close()\" 
-				value=\"".__("Close this window")."\"></div>";
+				<button onclick=\"return window.close()\">".
+					__("Close this window")."</button></div>";
 			print "</body></html>";
 
 		}
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 7967eb70b..ea3ff8135 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -363,41 +363,14 @@
 					style=\"display:none\"></div>	
 			</td></tr>";
 
-/*			print "<tr><td>".__('Add existing tag:')."</td>";
-
-			$result = db_query($link, "SELECT DISTINCT tag_name FROM ttrss_tags 
-				WHERE owner_uid = '".$_SESSION["uid"]."' ORDER BY tag_name");
-
-			$found_tags = array();
-
-			array_push($found_tags, '');
-
-			while ($line = db_fetch_assoc($result)) {
-				array_push($found_tags, truncate_string($line["tag_name"], 20));
-			}
-
-			print "<td align='right'>";
-
-			print_select("found_tags", '', $found_tags, "onchange=\"javascript:editTagsInsert()\"");
-
-			print "</td>"; 
-
-			print "</tr>"; */
-
 			print "</table>";
 
 			print "</form>";
 
 			print "<div align='right'>";
 
-			print "<input class=\"button\"
-				type=\"submit\" onclick=\"return editTagsSave()\" 
-				value=\"".__('Save')."\"> ";
-
-			print "<input class=\"button\"
-				type=\"submit\" onclick=\"return closeInfoBox()\" 
-				value=\"".__('Cancel')."\">";
-
+			print "<button onclick=\"return editTagsSave()\">".__('Save')."</button> ";
+			print "<button onclick=\"return closeInfoBox()\">".__('Cancel')."</button>";
 
 			print "</div>";
 
diff --git a/tt-rss.php b/tt-rss.php
index ccd4a4b9a..94f56e1ec 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -207,8 +207,6 @@
 			title="<?php echo __('Collapse feedlist') ?>" style="display : none">
 			&lt;&lt;</button>
 
-		&nbsp;
-
 		<select name="view_mode" title="<?php echo __('Show articles') ?>" 
 				onchange="viewModeChanged()">
 			<option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
@@ -227,8 +225,6 @@
 			<option value="score"><?php echo __('Score') ?></option>
 		</select>
 
-		&nbsp;
-
 		<button onclick="return viewCurrentFeed('ForceUpdate')">
 			<?php echo __('Update') ?></button>