diff --git a/images/button.png b/images/button.png
index e8e741613..db2278279 100644
Binary files a/images/button.png and b/images/button.png differ
diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 12c912ea4..affb3e846 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -133,11 +133,7 @@
 
 			print "<div class=\"dlgSecCont\">";
 
-			print "<input name=\"query\" size=\"20\" type=\"search\"
-				onkeypress=\"return filterCR(event, search)\"
-				onchange=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
-				onkeyup=\"toggleSubmitNotEmpty(this, 'search_submit_btn')\"
-				value=\"\">";
+			print "<input name=\"query\" size=\"20\" type=\"search\"	value=''>";
 
 			print " " . __('match on')." ";
 
@@ -185,13 +181,9 @@
 			print "</form>";
 
 			print "<div class=\"dlgButtons\">
-			<input type=\"submit\" 
-				class=\"button\" onclick=\"javascript:search()\" 
-				id=\"search_submit_btn\" disabled=\"true\"
-				value=\"".__('Search')."\">
-			<input class=\"button\"
-				type=\"submit\" onclick=\"javascript:searchCancel()\" 
-				value=\"".__('Cancel')."\"></div>";
+			<button disabled='true' onclick=\"javascript:search()\">".__('Search')."</button>
+			<button onclick=\"javascript:searchCancel()\">".__('Cancel')."</button>
+			</div>";
 
 			print "</div>";
 
@@ -238,9 +230,7 @@
 			print "&nbsp;</span>";
 
 			print "<input onkeypress=\"return filterCR(event, createFilter)\"
-					 onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
-					 onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
-					 name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
+				 name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
 
 			print "<span id=\"filter_dlg_date_chk_box\" style=\"display : none\">";
 			print "&nbsp;<input class=\"button\"
@@ -307,14 +297,11 @@
 
 			print "<div class=\"dlgButtons\">";
 
-			print "<input type=\"submit\" 
-				id=\"infobox_submit\"
-				class=\"button\" onclick=\"return createFilter()\" 
-				disabled=\"true\" value=\"".__('Create')."\"> ";
+			print "<button onclick=\"return createFilter()\">".
+				__('Create')."</button> ";
 
-			print "<input class=\"button\"
-				type=\"submit\" onclick=\"return closeInfoBox()\" 
-				value=\"".__('Cancel')."\">";
+			print "<button onclick=\"return closeInfoBox()\">".__('Cancel').
+				"</button>";
 
 			print "</div>";
 
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index f02ae6c4c..fb5a1ecae 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -403,13 +403,11 @@
 
 			print "<div class='dlgButtons'>
 				<div style=\"float : left\">
-					<input type='submit' class='button'			
-					onclick='return unsubscribeFeed($feed_id, \"$title\")' value=\"".__('Unsubscribe')."\">
+				<button onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
+					__('Unsubscribe')."</button>
 				</div>
-				<input type=\"submit\" class=\"button\" 
-				onclick=\"return feedEditSave()\" value=\"".__('Save')."\">
-				<input type='submit' class='button'			
-				onclick=\"return feedEditCancel()\" value=\"".__('Cancel')."\">
+				<button onclick=\"return feedEditSave()\">".__('Save')."</button>
+				<button onclick=\"return feedEditCancel()\">".__('Cancel')."</button>
 				</div>";
 
 			return;
diff --git a/tt-rss.css b/tt-rss.css
index 0172d6c30..300ddcac5 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -2257,3 +2257,38 @@ div#auxDlg {
 div#auxDlg a {
 	color : #4684ff;
 }
+
+button, select {
+	background-color : transparent;
+	background-repeat : repeat-x;
+	background-position : top left;
+	background-image : url("images/button.png");
+	border : 1px solid #bebebe;
+/*	border-top : 1px solid #f0f0f0;
+	border-left : 1px solid #f0f0f0; */
+	font-family : "Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+	font-size : 100%;
+/*	line-height : 120%; */
+	text-decoration : none;
+	font-weight : bold;
+	color : #565656;
+	cursor : pointer;
+	padding : 1px 3px 1px 3px;
+}
+
+select {
+	background : #ffffff;
+	padding : 1px 0px 1px 3px;
+}
+
+button:hover {
+	background-color : #f9faff;
+	border : 1px solid #88b0f0;
+	color : #336699;
+}
+
+button[disabled] {
+	background : #f0f0f0;
+	color : #dedede;
+	border : 1px solid #dedede;
+}
diff --git a/tt-rss.php b/tt-rss.php
index 6e40333ca..ccd4a4b9a 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -203,9 +203,9 @@
 
 		<form id="main_toolbar_form" action="" onsubmit='return false'>
 
-		<input type="submit" value="&lt;&lt;" 
-			id="collapse_feeds_btn" onclick="collapse_feedlist()" class="button"
-			title="<?php echo __('Collapse feedlist') ?>" style="display : none"/>
+		<button id="collapse_feeds_btn" onclick="collapse_feedlist()"
+			title="<?php echo __('Collapse feedlist') ?>" style="display : none">
+			&lt;&lt;</button>
 
 		&nbsp;
 
@@ -219,8 +219,6 @@
 			<option value="updated"><?php echo __('Updated') ?></option>
 		</select>
 
-		&nbsp;
-
 		<select title="<?php echo __('Sort articles') ?>" 
 				name="order_by" onchange="viewModeChanged()">
 			<option selected="selected" value="default"><?php echo __('Default') ?></option>