diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index 22fe647c..2adfec8a 100644
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -44,7 +44,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
 					$fields[] = array($field["orig"], $process_field, $after);
 				}
 				if (isset($foreign_key)) {
-						$foreign[] = ($TABLE != "" ? "ADD" : " ") . " FOREIGN KEY (" . idf_escape($field["field"]) . ") REFERENCES " . idf_escape($foreign_keys[$field["type"]]) . " (" . idf_escape($type_field["field"]) . ")" . (in_array($field["on_delete"], $on_actions) ? " ON DELETE $field[on_delete]" : "");
+					$foreign[] = ($TABLE != "" ? "ADD" : " ") . " FOREIGN KEY (" . idf_escape($field["field"]) . ") REFERENCES " . idf_escape($foreign_keys[$field["type"]]) . " (" . idf_escape($type_field["field"]) . ")" . (in_array($field["on_delete"], $on_actions) ? " ON DELETE $field[on_delete]" : "");
 				}
 				$after = "AFTER " . idf_escape($field["field"]);
 			} elseif ($field["orig"] != "") {
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 9dca898c..ecca3d87 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -422,8 +422,8 @@ document.getElementById('username').focus();
 	*/
 	function editInput($table, $field, $attrs, $value) {
 		if ($field["type"] == "enum") {
-			return ($field["null"] ? "<label><input type='radio'$attrs value=''" . (isset($value) || isset($_GET["select"]) ? "" : " checked") . "><em>NULL</em></label> " : "")
-				. "<label><input type='radio'$attrs value='0'" . ($value === 0 ? " checked" : "") . "><em>" . lang('empty') . "</em></label>"
+			return ($field["null"] ? "<label><input type='radio'$attrs value=''" . (isset($value) || isset($_GET["select"]) ? "" : " checked") . "><i>NULL</i></label> " : "")
+				. "<label><input type='radio'$attrs value='0'" . ($value === 0 ? " checked" : "") . "><i>" . lang('empty') . "</i></label>"
 			;
 		}
 		return "";
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index a045eb3e..74d1a4c7 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -457,7 +457,7 @@ function shorten_utf8($string, $length = 80, $suffix = "") {
 	if (!preg_match("(^([\t\r\n -\x{FFFF}]{0,$length})($)?)u", $string, $match)) { // ~s causes trash in $match[2] under some PHP versions, (.|\n) is slow
 		preg_match("(^([\t\r\n -~]{0,$length})($)?)", $string, $match);
 	}
-	return h($match[1]) . $suffix . (isset($match[2]) ? "" : "<em>...</em>");
+	return h($match[1]) . $suffix . (isset($match[2]) ? "" : "<i>...</i>");
 }
 
 /** Generate friendly URL
@@ -537,7 +537,7 @@ function input($field, $value, $function) {
 	echo "<td class='function'>";
 	$functions = (isset($_GET["select"]) ? array("orig" => lang('original')) : array()) + $adminer->editFunctions($field);
 	if ($field["type"] == "enum") {
-		echo nbsp($functions[""]) . "<td>" . ($functions["orig"] ? "<label><input type='radio' name='fields[$name]' value='-1' checked><em>$functions[orig]</em></label> " : "");
+		echo nbsp($functions[""]) . "<td>" . ($functions["orig"] ? "<label><input type='radio' name='fields[$name]' value='-1' checked><i>$functions[orig]</i></label> " : "");
 		echo $adminer->editInput($_GET["edit"], $field, " name='fields[$name]'", $value);
 		enum_input("radio", "fields[$name]", $field, $value);
 	} else {
diff --git a/adminer/schema.inc.php b/adminer/schema.inc.php
index 316abdf0..1c4b4010 100644
--- a/adminer/schema.inc.php
+++ b/adminer/schema.inc.php
@@ -60,10 +60,10 @@ document.onmouseup = schemaMouseup;
 <?php
 foreach ($schema as $name => $table) {
 	echo "<div class='table' style='top: " . $table["pos"][0] . "em; left: " . $table["pos"][1] . "em;' onmousedown='schemaMousedown(this, event);'>";
-	echo '<a href="' . h(ME) . 'table=' . urlencode($name) . '"><strong>' . h($name) . "</strong></a><br>\n";
+	echo '<a href="' . h(ME) . 'table=' . urlencode($name) . '"><b>' . h($name) . "</b></a><br>\n";
 	foreach ($table["fields"] as $field) {
 		$val = '<span' . type_class($field["type"]) . ' title="' . h($field["full_type"] . ($field["null"] ? " NULL" : '')) . '">' . h($field["field"]) . '</span>';
-		echo ($field["primary"] ? "<em>$val</em>" : $val) . "<br>\n";
+		echo ($field["primary"] ? "<i>$val</i>" : $val) . "<br>\n";
 	}
 	foreach ((array) $table["references"] as $target_name => $refs) {
 		foreach ($refs as $left => $ref) {
diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 45e03c30..eed76f94 100644
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -324,7 +324,7 @@ if (!$columns) {
 						$id = h("val[$unique_idf][" . bracket_escape($key) . "]");
 						$value = $_POST["val"][$unique_idf][bracket_escape($key)];
 						$h_value = h(isset($value) ? $value : $row[$key]);
-						$long = strpos($val, "<em>...</em>");
+						$long = strpos($val, "<i>...</i>");
 						$editable = is_utf8($val) && !$long && $rows[$n][$key] == $row[$key] && !$functions[$key];
 						$text = ereg('text|blob', $field["type"]);
 						echo (($_GET["modify"] && $editable) || isset($value)
diff --git a/adminer/table.inc.php b/adminer/table.inc.php
index f1d4f3d8..0c4a0c58 100644
--- a/adminer/table.inc.php
+++ b/adminer/table.inc.php
@@ -44,11 +44,11 @@ if ($fields) {
 				echo "<table cellspacing='0'>\n";
 				echo "<thead><tr><th>" . lang('Source') . "<td>" . lang('Target') . "<td>" . lang('ON DELETE') . "<td>" . lang('ON UPDATE') . ($jush != "sqlite" ? "<td>&nbsp;" : "") . "</thead>\n";
 				foreach ($foreign_keys as $name => $foreign_key) {
-					$link = ($foreign_key["db"] != "" ? "<strong>" . h($foreign_key["db"]) . "</strong>." : "") . h($foreign_key["table"]);
+					$link = ($foreign_key["db"] != "" ? "<b>" . h($foreign_key["db"]) . "</b>." : "") . h($foreign_key["table"]);
 					echo "<tr>";
 					echo "<th><i>" . implode("</i>, <i>", array_map('h', $foreign_key["source"])) . "</i>";
 					echo "<td><a href='" . h($foreign_key["db"] != "" ? preg_replace('~db=[^&]*~', "db=" . urlencode($foreign_key["db"]), ME) : ME) . "table=" . urlencode($foreign_key["table"]) . "'>$link</a>";
-					echo "(<em>" . implode("</em>, <em>", array_map('h', $foreign_key["target"])) . "</em>)";
+					echo "(<i>" . implode("</i>, <i>", array_map('h', $foreign_key["target"])) . "</i>)";
 					echo "<td>$foreign_key[on_delete]\n";
 					echo "<td>$foreign_key[on_update]\n";
 					if ($jush != "sqlite") {