diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index d82cb3f0d..2923f3349 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1259,25 +1259,22 @@
 		print "<iframe name=\"upload_iframe\"
 			style=\"width: 400px; height: 100px; display: none;\"></iframe>";
 
-		print "<div style='float : left'>";
 		print "<form style='display : block' target=\"upload_iframe\"
 			enctype=\"multipart/form-data\" method=\"POST\" 
 				action=\"backend.php\">
 			<input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
 			<input type=\"hidden\" name=\"op\" value=\"dlg\">
 			<input type=\"hidden\" name=\"id\" value=\"importOpml\">
-			<button onclick=\"return opmlImport();\"
+			<button dojoType=\"dijit.form.Button\" onclick=\"return opmlImport();\"
 				type=\"submit\">".__('Import')."</button>
+			<button dojoType=\"dijit.form.Button\" onclick=\"gotoExportOpml()\">".__('Export OPML')."</button>
 			</form>";
-		print "</div>&nbsp;";
-
-		print "<button onclick=\"gotoExportOpml()\">".__('Export OPML')."</button>";
 
 		print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.');
 
 		print "<div class=\"insensitive\">" . __("Note: Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . 			"</div>" . "</p>";
 
-		print "<button onclick=\"return displayDlg('pubOPMLUrl')\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('pubOPMLUrl')\">".
 			__('Display URL')."</button> ";
 
 
@@ -1312,7 +1309,7 @@
 
 		$bm_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+window.location.href}");
 
-		print "<a href=\"$bm_url\" class='visibleLink'>" . __('Subscribe in Tiny Tiny RSS'). "</a>";
+		print "<a href=\"$bm_url\" class='bookmarklet'>" . __('Subscribe in Tiny Tiny RSS'). "</a>";
 
 		print "</div>"; #pane
 
@@ -1323,10 +1320,10 @@
 		$rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() . 
 				"/backend.php?op=rss&id=-2&view-mode=all_articles");;
 
-		print "<button onclick=\"return displayDlg('generatedFeed', '$rss_url')\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('generatedFeed', '$rss_url')\">".
 			__('Display URL')."</button> ";
                
-		print "<button onclick=\"return clearFeedAccessKeys()\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return clearFeedAccessKeys()\">".
 			__('Clear all generated URLs')."</button> ";
 
 		print "</div>"; #pane
diff --git a/prefs.js b/prefs.js
index 6baa9a0d4..9ce1012b7 100644
--- a/prefs.js
+++ b/prefs.js
@@ -809,7 +809,7 @@ function opmlImport() {
 	var opml_file = $("opml_file");
 
 	if (opml_file.value.length == 0) {
-		alert(__("No OPML file to upload."));
+		alert(__("Please choose an OPML file first."));
 		return false;
 	} else {
 		notify_progress("Importing, please wait...", true);
diff --git a/tt-rss.css b/tt-rss.css
index 8fa518492..87f6cb882 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1619,3 +1619,9 @@ span.labelFixedLength {
 .dijitDialog .dijitToolbar {
 	border : 1px solid #c0c0c0;
 }
+
+a.bookmarklet {
+	color : #4684ff;
+	border : 1px solid #ecf4ff;
+	padding : 2px;
+}