diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index affb3e846..7967eb70b 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -181,7 +181,7 @@
 			print "</form>";
 
 			print "<div class=\"dlgButtons\">
-			<button disabled='true' onclick=\"javascript:search()\">".__('Search')."</button>
+			<button onclick=\"javascript:search()\">".__('Search')."</button>
 			<button onclick=\"javascript:searchCancel()\">".__('Cancel')."</button>
 			</div>";
 
@@ -405,7 +405,7 @@
 		}
 
 		if ($id == "printTagCloud") {
-			print "<div id=\"infoBoxTitle\">".__('Tag cloud')."</div>";
+			print "<div id=\"infoBoxTitle\">".__('Tag Cloud')."</div>";
 			print "<div class=\"infoBoxContents\">";
 
 			print __("Showing most popular tags ")." (<a 
@@ -418,9 +418,8 @@
 			print "</div>";
 
 			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>";
 
 			print "</div>";
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 158c97c05..452acde69 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -996,12 +996,9 @@
 			print "<div class=\"prefGenericAddBox\">
 				<input id=\"fadd_cat\" 
 					onkeypress=\"return filterCR(event, addFeedCat)\"
-					onkeyup=\"toggleSubmitNotEmpty(this, 'catadd_submit_btn')\"
-					onchange=\"toggleSubmitNotEmpty(this, 'catadd_submit_btn')\"
-					size=\"40\">&nbsp;
-				<input 
-					type=\"submit\" class=\"button\" disabled=\"true\" id=\"catadd_submit_btn\"
-					onclick=\"javascript:addFeedCat()\" value=\"".__('Create category')."\"></div>";
+					size=\"40\">
+					<button onclick=\"javascript:addFeedCat()\">".
+					__('Create category')."</button></div>";
 	
 			$result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
 				WHERE owner_uid = ".$_SESSION["uid"]."
@@ -1011,16 +1008,9 @@
 
 			if (db_num_rows($result) != 0) {
 
-				print "<table width=\"100%\" class=\"prefFeedCatList\" 
-					cellspacing=\"0\">";
-
-				print "<tr><td class=\"selectPrompt\" colspan=\"8\">
-				".__('Select:')." 
+				print	__('Select:')." 
 					<a href=\"javascript:selectPrefRows('fcat', true)\">".__('All')."</a>,
-					<a href=\"javascript:selectPrefRows('fcat', false)\">".__('None')."</a>
-					</td></tr>";
-
-				print "</table>";
+					<a href=\"javascript:selectPrefRows('fcat', false)\">".__('None')."</a>";
 
 				print "<div class=\"prefFeedCatHolder\">";
 
@@ -1064,17 +1054,14 @@
 				print "<p>".__('No feed categories defined.')."</p>";
 			}
 
-			print "<div style='float : right'>
-				<input type='submit' class='button'			
-				onclick=\"selectTab('feedConfig')\" value=\"".__('Close this window')."\"></div>";
+			print "<div class='dlgButtons'>
+				<div style='float : left'>
+				<button onclick=\"return removeSelectedFeedCats()\">".
+				__('Remove')."</button>
+				</div>";
 
-			print "<div id=\"catOpToolbar\">";
-	
-			print "
-				<input type=\"submit\" class=\"button\" disabled=\"true\"
-					onclick=\"return removeSelectedFeedCats()\" value=\"".__('Remove')."\">";
-	
-			print "</div>";
+			print "<button onclick=\"selectTab('feedConfig')\">".
+				__('Close this window')."</button></div>";
 
 			print "</div>";