diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index 191e44b9b..4504b8d76 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -22,7 +22,7 @@
 		<div class="form-group">
 			<label class="group-name"><?php echo Minz_Translate::t ('feed_description'); ?></label>
 			<div class="group-controls">
-				<textarea name="description" id="description"><?php echo $this->flux->description (); ?></textarea>
+				<textarea name="description" id="description"><?php echo htmlspecialchars($this->flux->description(), ENT_NOQUOTES, 'UTF-8'); ?></textarea>
 			</div>
 		</div>
 		<div class="form-group">
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 2fdfd4bd8..8b64eb7b9 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -116,7 +116,7 @@ function opml_export ($cats) {
 		$txt .= '<outline text="' . $cat['name'] . '">' . "\n";
 
 		foreach ($cat['feeds'] as $feed) {
-			$txt .= "\t" . '<outline text="' . $feed->name () . '" type="rss" xmlUrl="' . $feed->url () . '" htmlUrl="' . $feed->website () . '" description="' . $feed->description () . '" />' . "\n";
+			$txt .= "\t" . '<outline text="' . $feed->name () . '" type="rss" xmlUrl="' . $feed->url () . '" htmlUrl="' . $feed->website () . '" description="' . htmlspecialchars($feed->description(), ENT_COMPAT, 'UTF-8') . '" />' . "\n";
 		}
 
 		$txt .= '</outline>' . "\n";
diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css
index b53702c07..a63fc44bf 100644
--- a/public/themes/default/freshrss.css
+++ b/public/themes/default/freshrss.css
@@ -291,7 +291,7 @@
 		}
 		.flux:hover .item.title {
 			overflow: visible;
-			padding-right: 1.5em;
+			padding-right: 2em;
 			position: absolute;
 		}
 			.flux .item.title a {
diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css
index bbe477c04..839626227 100644
--- a/public/themes/flat-design/freshrss.css
+++ b/public/themes/flat-design/freshrss.css
@@ -273,7 +273,7 @@ body {
 		}
 		.flux:hover .item.title {
 			overflow: visible;
-			padding-right: 1.5em;
+			padding-right: 2em;
 			position: absolute;
 		}
 			.flux .item.title a {