diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index fb5a1ecae..158c97c05 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -69,11 +69,6 @@
 
 		if ($subop == "browse") {
 
-			if (!ENABLE_FEED_BROWSER) {
-				print __("Feed browser is administratively disabled.");
-				return;
-			}
-
 			print "<div id=\"infoBoxTitle\">".__('Feed Browser')."</div>";
 			
 			print "<div class=\"infoBoxContents\">";
@@ -89,11 +84,8 @@
 				<img style='display : none' 
 					id='feed_browser_spinner' src='images/indicator_white.gif'>
 				<input name=\"search\" size=\"20\" type=\"search\"
-				onfocus=\"javascript:disableHotkeys();\" 
-				onblur=\"javascript:enableHotkeys();\"
-				onchange=\"javascript:updateFeedBrowser()\" value=\"$browser_search\">
-			<input type=\"submit\" class=\"button\" 
-				onclick=\"javascript:updateFeedBrowser()\" value=\"".__('Search')."\">
+					onchange=\"javascript:updateFeedBrowser()\" value=\"$browser_search\">
+				<button onclick=\"javascript:updateFeedBrowser()\">".__('Search')."</button>
 			</div>";
 
 			print " <select name=\"mode\" onchange=\"updateFeedBrowser()\">
@@ -103,7 +95,7 @@
 
 			print __("limit:");
 
-			print " <select name=\"limit\">";
+			print " <select name=\"limit\" onchange='updateFeedBrowser()'>";
 
 			foreach (array(25, 50, 100, 200) as $l) {
 				$issel = ($l == $limit) ? "selected" : "";
@@ -112,10 +104,6 @@
 			
 			print "</select> ";
 
-			print "
-				<input type=\"submit\" class=\"button\"
-					onclick=\"updateFeedBrowser()\" value=\"".__('Show')."\">";
-
 			print "<p>";
 
 			$owner_uid = $_SESSION["uid"];
@@ -1117,33 +1105,29 @@
 			$feed_search = $_SESSION["prefs_feed_search"];
 		}
 
-		print "<div class=\"feedEditSearch\">
+		print "<div style='float : right'> 
 			<input id=\"feed_search\" size=\"20\" type=\"search\"
 				onfocus=\"javascript:disableHotkeys();\" 
 				onblur=\"javascript:enableHotkeys();\"
 				onchange=\"javascript:updateFeedList()\" value=\"$feed_search\">
-			<input type=\"submit\" class=\"button\" 
-				onclick=\"javascript:updateFeedList()\" value=\"".__('Search')."\">
+			<button onclick=\"javascript:updateFeedList()\">".
+				__('Search')."</button>
 			</div>";
 		
-		print "<input onclick=\"javascript:displayDlg('quickAddFeed')\"
-			type=\"submit\"
-			class=\"button\" value=\"".__('Subscribe to feed')."\"> ";
+		print "<button onclick=\"javascript:displayDlg('quickAddFeed')\">"
+			.__('Subscribe to feed')."</button> ";
 
-		print "<input onclick=\"javascript:editSelectedFeed()\"
-			type=\"submit\"
-			class=\"button\" value=\"".__('Edit feeds')."\"> ";
+		print "<button onclick=\"javascript:editSelectedFeed()\">".
+			__('Edit feeds')."</button> ";
 
 		if (get_pref($link, 'ENABLE_FEED_CATS')) {
 
-			print "<input onclick=\"javascript:editFeedCats()\"
-				type=\"submit\"
-				class=\"button\" value=\"".__('Edit categories')."\"> ";
+			print "<button onclick=\"javascript:editFeedCats()\">".
+				__('Edit categories')."</button> ";
 		}
 
-		print "<input onclick=\"javascript:removeSelectedFeeds()\"
-			type=\"submit\"
-			class=\"button\" value=\"".__('Unsubscribe')."\"> ";
+		print "<button onclick=\"javascript:removeSelectedFeeds()\">"
+			.__('Unsubscribe')."</button> ";
 
 /*		print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
 			<option value=\"facDefault\" selected>".__('Other actions...')."</option>";
@@ -1421,15 +1405,14 @@
 		<form	enctype=\"multipart/form-data\" method=\"POST\" action=\"opml.php\">
 		".__('File:')." <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
 			<input type=\"hidden\" name=\"op\" value=\"Import\">
-			<input class=\"button\" onclick=\"return validateOpmlImport();\"
-				type=\"submit\" value=\"".__('Import')."\">
+			<button onclick=\"return validateOpmlImport();\"
+				type=\"submit\">".__('Import')."</button>
 				</form></div>";
 
 		print "&nbsp;";
 
-		print "<input type=\"submit\" 
-			class=\"button\" onclick=\"gotoExportOpml()\" 
-				value=\"".__('Export OPML')."\">";			
+		print "<button onclick=\"gotoExportOpml()\">".
+			__('Export OPML')."</button>";
 
 
 		print "<h3>" . __("Firefox Integration") . "</h3>";
@@ -1453,11 +1436,8 @@
 
 		print "<p><a class=\"visibleLinkB\" id=\"pubGenAddress\" target=\"_blank\" href=\"$url_path\">".__("Link to published articles feed.")."</a></p>";
 
-		print "<p><input type=\"submit\" onclick=\"return pubRegenKey()\" class=\"button\"
-			value=\"".__('Generate another link')."\">";
-		/* print " <input type=\"submit\" onclick=\"return pubToClipboard()\" class=\"button\"
-			value=\"".__('Copy link to clipboard')."\">"; */
-		print "</p>";
+		print "<button onclick=\"return pubRegenKey()\">".
+			__('Generate another link')."</button>";
 
 	}
 
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index a506ff1fa..98fc16ecd 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -60,8 +60,6 @@
 			print "&nbsp;</span>";
 
 			print "<input onkeypress=\"return filterCR(event, filterEditSave)\"
-					 onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
-					 onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
 					 name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
 
 			print "<span id=\"filter_dlg_date_chk_box\" $date_ops_invisible>";			
@@ -151,19 +149,15 @@
 			$reg_exp = htmlspecialchars($reg_exp, ENT_QUOTES); // second escaping seems to be needed for javascript
 
 			print "<div style=\"float : left\">";
-			print "<input type=\"submit\" 
-				class=\"button\" onclick='return removeFilter($filter_id, \"$reg_exp\")' 
-				value=\"".__('Remove')."\"> ";
+			print "<button onclick='return removeFilter($filter_id, \"$reg_exp\")'>".
+				__('Remove')."</button>";
 			print "</div>";
 
-			print "<input type=\"submit\" 
-				id=\"infobox_submit\"
-				class=\"button\" onclick=\"return filterEditSave()\" 
-				value=\"".__('Save')."\"> ";
+			print "<button onclick=\"return filterEditSave()\">".
+				__('Save')."</button> ";
 
-			print "<input class=\"button\"
-				type=\"submit\" onclick=\"return filterEditCancel()\" 
-				value=\"".__('Cancel')."\">";
+			print "<button onclick=\"return filterEditCancel()\">".
+				__('Cancel')."</button>";
 
 			print "</div>";
 
@@ -298,35 +292,28 @@
 			$filter_search = $_SESSION["prefs_filter_search"];
 		}
 
-		print "<div class=\"feedEditSearch\">
+		print "<div style='float : right'>
 			<input id=\"filter_search\" size=\"20\" type=\"search\"
 				onfocus=\"javascript:disableHotkeys();\" 
 				onblur=\"javascript:enableHotkeys();\"
 				onchange=\"javascript:updateFilterList()\" value=\"$filter_search\">
-			<input type=\"submit\" class=\"button\" 
-			onclick=\"javascript:updateFilterList()\" value=\"".__('Search')."\">
+			<button onclick=\"javascript:updateFilterList()\">".__('Search')."</button>
 			&nbsp;
 			<a class='helpLinkPic' href=\"javascript:displayHelpInfobox(2)\">
 			<img src='images/sign_quest.gif'></a>
-			</div>";
+		</div>";
 
+		print "<button onclick=\"return displayDlg('quickAddFilter', false)\">".
+			__('Create filter')."</button> "; 
 
-		print "<input type=\"submit\" 
-			class=\"button\" 
-			onclick=\"return displayDlg('quickAddFilter', false)\" 
-			value=\"".__('Create filter')."\"> "; 
+		print "<button onclick=\"return editSelectedFilter()\">".
+			__('Edit')."</button> ";
 
-		print "<input type=\"submit\" class=\"button\"
-			onclick=\"return editSelectedFilter()\" value=\"".__('Edit')."\"> ";
-
-		print "<input type=\"submit\" class=\"button\"
-				onclick=\"return removeSelectedFilters()\" value=\"".__('Remove')."\"> ";
-
-		print "<input type=\"submit\" 
-			class=\"button\" 
-			onclick=\"rescore_all_feeds()\" 
-			value=\"".__('Rescore articles')."\"> "; 
+		print "<button onclick=\"return removeSelectedFilters()\">".
+			__('Remove')."</button> ";
 
+		print "<button onclick=\"rescore_all_feeds()\">".
+			__('Rescore articles')."</button> "; 
 
 		if ($filter_search) {
 			$filter_search = split(' ', db_escape_string($filter_search));
diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index af343cacd..a744b9f6a 100644
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -123,31 +123,24 @@
 			$label_search = $_SESSION["prefs_label_search"];
 		}
 
-		print "<div class=\"feedEditSearch\">
+		print "<div style='float : right'>
 			<input id=\"label_search\" size=\"20\" type=\"search\"
 				onfocus=\"javascript:disableHotkeys();\" 
 				onblur=\"javascript:enableHotkeys();\"
 				onchange=\"javascript:updateLabelList()\" value=\"$label_search\">
-			<input type=\"submit\" class=\"button\" 
-				onclick=\"javascript:updateLabelList()\" value=\"".__('Search')."\">
+			<button onclick=\"javascript:updateLabelList()\">".__('Search')."</button>
 			</div>";
 
 		print "<div class=\"prefGenericAddBox\">";
 
-		print"<input type=\"submit\" class=\"button\" 
-			onclick=\"return addLabel()\" 
-			value=\"".__('Create label')."\"> ";
+		print"<button onclick=\"return addLabel()\">".
+			__('Create label')."</button> ";
 
-			print "<input type=\"submit\" class=\"button\"
-				onclick=\"javascript:removeSelectedLabels()\" value=\"".__('Remove')."\">";
+		print "<button onclick=\"javascript:removeSelectedLabels()\">".
+			__('Remove')."</button> ";
 
-			print "&nbsp;";
-/*			print "&nbsp;<input type=\"submit\" class=\"button\" disabled=\"true\"
-				onclick=\"labelColorSet('fg')\" value=\"".__('Fg')."\">&nbsp;";
-			print "<input type=\"submit\" class=\"button\" disabled=\"true\"
-				onclick=\"labelColorSet('bg')\" value=\"".__('Bg')."\">&nbsp;"; */
-			print "<input type=\"submit\" class=\"button\"
-				onclick=\"labelColorReset()\" value=\"".__('Clear colors')."\">";
+		print "<button onclick=\"labelColorReset()\">".
+			__('Clear colors')."</button>";
 
 
 		print "</div>";
diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index 3bb86e9e1..6fb5fb576 100644
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -228,8 +228,8 @@
 
 				print "</form>";
 
-				print "<p><input class=\"button\" type=\"submit\"
-					onclick=\"return changeUserEmail()\" value=\"".__("Change e-mail")."\">";
+				print "<p><button onclick=\"return changeUserEmail()\">".
+					__("Change e-mail")."</button>";
 
 				print "<form onsubmit=\"return false\" 
 					name=\"change_pass_form\" id=\"change_pass_form\">";
@@ -267,9 +267,8 @@
 
 				print "</form>";
 
-				print "<p><input class=\"button\" type=\"submit\" 
-					onclick=\"return changeUserPassword()\"
-					value=\"".__("Change password")."\">";
+				print "<p><button	onclick=\"return changeUserPassword()\">".
+					__("Change password")."</button>";
 
 			}
 
@@ -303,8 +302,7 @@
 				print "</table>";
 				print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">";
 				print "<input type=\"hidden\" name=\"subop\" value=\"change-theme\">";
-				print "<p><input class=\"button\" type=\"submit\" 
-					value=\"".__('Change theme')."\">";
+				print "<p><button>".__('Change theme')."</button>";
 				print "</form>";
 			}
 
@@ -398,13 +396,11 @@
 
 			print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">";
 
-			print "<p><input class=\"button\" type=\"submit\" 
-				onclick=\"return validatePrefsSave()\"
-				value=\"".__('Save configuration')."\">";
+			print "<p><button onclick=\"return validatePrefsSave()\">".
+				__('Save configuration')."</button> ";
 				
-			print "&nbsp;<input class=\"button\" type=\"submit\" 
-				onclick=\"return validatePrefsReset()\" 
-				value=\"".__('Reset to defaults')."\"></p>";
+			print "<button onclick=\"return validatePrefsReset()\">".
+				__('Reset to defaults')."</button></p>";
 
 			print "</form>";
 
diff --git a/modules/pref-users.php b/modules/pref-users.php
index a19a594c1..a57178d6c 100644
--- a/modules/pref-users.php
+++ b/modules/pref-users.php
@@ -93,8 +93,8 @@
 			print "</ul>";
 
 			print "<div align='center'>
-				<input type='submit' class='button'			
-				onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
+				<button onclick=\"closeInfoBox()\">".__("Close this window").
+				"</button></div>";
 
 			print "</div>";
 
@@ -175,12 +175,10 @@
 			print "</form>";
 
 			print "<div class=\"dlgButtons\">
-				<input class=\"button\"
-					type=\"submit\" onclick=\"return userEditSave()\" 
-					value=\"".__('Save')."\">
-				<input class=\"button\"
-					type=\"submit\" onclick=\"return userEditCancel()\" 
-					value=\"".__('Cancel')."\"></div>";
+				<button onclick=\"return userEditSave()\">".
+					__('Save')."</button>
+				<button onclick=\"return userEditCancel()\">".
+					__('Cancel')."</button></div>";
 
 			print "</div>";
 
@@ -354,13 +352,13 @@
 			$user_search = $_SESSION["prefs_user_search"];
 		}
 
-		print "<div class=\"feedEditSearch\">
+		print "<div style='float : right'>
 			<input id=\"user_search\" size=\"20\" type=\"search\"
 				onfocus=\"javascript:disableHotkeys();\" 
 				onblur=\"javascript:enableHotkeys();\"
 				onchange=\"javascript:updateUsersList()\" value=\"$user_search\">
-			<input type=\"submit\" class=\"button\" 
-				onclick=\"javascript:updateUsersList()\" value=\"".__('Search')."\">
+			<button onclick=\"javascript:updateUsersList()\">".
+				__('Search')."</button>
 			</div>";
 
 		$sort = db_escape_string($_REQUEST["sort"]);
@@ -369,18 +367,17 @@
 			$sort = "login";
 		}
 
-		print "<input type=\"submit\" class=\"button\" 
-			onclick=\"javascript:addUser()\" value=\"".__('Create user')."\">";
+		print "<button onclick=\"javascript:addUser()\">".__('Create user')."</button>";
 
-		print "				
-			<input type=\"submit\" class=\"button\"
-				onclick=\"javascript:selectedUserDetails()\" value=\"".__('Details')."\">
-			<input type=\"submit\" class=\"button\"
-				onclick=\"javascript:editSelectedUser()\" value=\"".__('Edit')."\">
-			<input type=\"submit\" class=\"button\"
-				onclick=\"javascript:removeSelectedUsers()\" value=\"".__('Remove')."\">
-			<input type=\"submit\" class=\"button\"
-				onclick=\"javascript:resetSelectedUserPass()\" value=\"".__('Reset password')."\">";
+		print "
+			<button onclick=\"javascript:selectedUserDetails()\">".
+			__('Details')."</button>
+			<button onclick=\"javascript:editSelectedUser()\">".
+			__('Edit')."</button>
+			<button onclick=\"javascript:removeSelectedUsers()\">".
+			__('Remove')."</button>
+			<button onclick=\"javascript:resetSelectedUserPass()\">".
+			__('Reset password')."</button>";
 
 		print "</div>";
 
diff --git a/tt-rss.css b/tt-rss.css
index 300ddcac5..a79af4895 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -487,10 +487,6 @@ tr.title td a:hover {
 	color : black;
 }
 
-div.feedEditSearch {
-	float : right;
-}
-
 table.prefFeedList td.feedEditCat {
 	font-weight : bold;
 	border-width : 0px 0px 1px 0px;
@@ -2270,8 +2266,8 @@ button, select {
 	font-size : 100%;
 /*	line-height : 120%; */
 	text-decoration : none;
-	font-weight : bold;
-	color : #565656;
+/*	font-weight : bold; */
+	color : #303030;
 	cursor : pointer;
 	padding : 1px 3px 1px 3px;
 }
@@ -2281,6 +2277,13 @@ select {
 	padding : 1px 0px 1px 3px;
 }
 
+input {
+	background : white;
+	border : 1px solid #bebebe;
+	font-size : 100%;
+	padding : 1px 3px 1px 3px;
+}
+
 button:hover {
 	background-color : #f9faff;
 	border : 1px solid #88b0f0;