diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index f92902437..3b5ed89d4 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1011,11 +1011,11 @@
 				type=\"submit\" value=\"Import\">
 				</form></div>";
 
-		print "&nbsp;|&nbsp;";				
+		print "&nbsp; or &nbsp;";				
 
 		print "<input type=\"submit\" 
 			class=\"button\" onclick=\"gotoExportOpml()\" 
-				value=\"Export\">";			
+				value=\"Export OPML\">";			
 
 	}
 ?>
diff --git a/opml.php b/opml.php
index ff888d246..5b0d7fe62 100644
--- a/opml.php
+++ b/opml.php
@@ -229,8 +229,9 @@
 			print "<div class=\"error\">"._("Error: please upload OPML file.")."</div>";
 		}
 
-		print "<p><a class=\"button\" href=\"prefs.php\">
-			"._("Return to preferences")."</a>";
+		print "<br><form method=\"GET\" action=\"prefs.php\">
+			<input type=\"submit\" value=\"Return to preferences\">
+			</form>";
 
 		print "</div></body></html>";