diff --git a/js/Headlines.js b/js/Headlines.js
index f9ec21c18..7557676ee 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -515,10 +515,8 @@ const Headlines = {
 								${hl.cdm_excerpt ? hl.cdm_excerpt : ""}
 							</span>
 
-							<div class="feed vfeedMenuAttach" data-feed-id="${hl.feed_id}">
-								<a href="#" style="background-color: ${hl.feed_bg_color}"
-									onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title}</a>
-							</div>
+							<a href="#" class="feed vfeedMenuAttach" style="background-color: ${hl.feed_bg_color}" data-feed-id="${hl.feed_id}"
+								onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title}</a>
 
 							<span class="updated" title="${hl.imported}">${hl.updated}</span>
 
diff --git a/themes/compact.css b/themes/compact.css
index 687175499..e7ddd8282 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -1269,22 +1269,17 @@ body.ttrss_utility hr {
   margin: 0px 4px;
 }
 .cdm .header .feed {
-  float: right;
-  font-weight: normal;
-  font-style: italic;
-}
-.cdm .header .feed a {
-  border-radius: 4px;
-  display: inline-block;
-  padding: 1px 4px 1px 4px;
-}
-.cdm .header .feed,
-.cdm .header .feed a {
-  vertical-align: middle;
-  color: #555;
   font-weight: normal;
   font-style: italic;
   font-size: 11px;
+  display: inline-block;
+  max-width: 25%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  border-radius: 4px;
+  padding: 1px 4px;
+  margin-right: 4px;
+  color: #555;
 }
 .cdm .header .author {
   white-space: nowrap;
diff --git a/themes/compact_night.css b/themes/compact_night.css
index df0ec8363..db7aad12c 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -1269,22 +1269,17 @@ body.ttrss_utility hr {
   margin: 0px 4px;
 }
 .cdm .header .feed {
-  float: right;
-  font-weight: normal;
-  font-style: italic;
-}
-.cdm .header .feed a {
-  border-radius: 4px;
-  display: inline-block;
-  padding: 1px 4px 1px 4px;
-}
-.cdm .header .feed,
-.cdm .header .feed a {
-  vertical-align: middle;
-  color: #ccc;
   font-weight: normal;
   font-style: italic;
   font-size: 11px;
+  display: inline-block;
+  max-width: 25%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  border-radius: 4px;
+  padding: 1px 4px;
+  margin-right: 4px;
+  color: #ccc;
 }
 .cdm .header .author {
   white-space: nowrap;
diff --git a/themes/light-high-contrast.css b/themes/light-high-contrast.css
index 25322b2a4..120ae0316 100644
--- a/themes/light-high-contrast.css
+++ b/themes/light-high-contrast.css
@@ -1269,22 +1269,17 @@ body.ttrss_utility hr {
   margin: 0px 4px;
 }
 .cdm .header .feed {
-  float: right;
-  font-weight: normal;
-  font-style: italic;
-}
-.cdm .header .feed a {
-  border-radius: 4px;
-  display: inline-block;
-  padding: 1px 4px 1px 4px;
-}
-.cdm .header .feed,
-.cdm .header .feed a {
-  vertical-align: middle;
-  color: black;
   font-weight: normal;
   font-style: italic;
   font-size: 11px;
+  display: inline-block;
+  max-width: 25%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  border-radius: 4px;
+  padding: 1px 4px;
+  margin-right: 4px;
+  color: black;
 }
 .cdm .header .author {
   white-space: nowrap;
diff --git a/themes/light.css b/themes/light.css
index cc9f48488..21d1859c3 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -1269,22 +1269,17 @@ body.ttrss_utility hr {
   margin: 0px 4px;
 }
 .cdm .header .feed {
-  float: right;
-  font-weight: normal;
-  font-style: italic;
-}
-.cdm .header .feed a {
-  border-radius: 4px;
-  display: inline-block;
-  padding: 1px 4px 1px 4px;
-}
-.cdm .header .feed,
-.cdm .header .feed a {
-  vertical-align: middle;
-  color: #555;
   font-weight: normal;
   font-style: italic;
   font-size: 11px;
+  display: inline-block;
+  max-width: 25%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  border-radius: 4px;
+  padding: 1px 4px;
+  margin-right: 4px;
+  color: #555;
 }
 .cdm .header .author {
   white-space: nowrap;
diff --git a/themes/light/cdm.less b/themes/light/cdm.less
index 71288b023..e2cbd5c60 100644
--- a/themes/light/cdm.less
+++ b/themes/light/cdm.less
@@ -59,23 +59,17 @@
 		}
 
 		.feed {
-			float: right;
-			font-weight: normal;
-			font-style: italic;
-
-			a {
-				border-radius : 4px;
-				display : inline-block;
-				padding : 1px 4px 1px 4px;
-			}
-		}
-
-		.feed, .feed a {
-			vertical-align: middle;
-			color: @default-text;
 			font-weight: normal;
 			font-style: italic;
 			font-size: @font-size-small;
+			display : inline-block;
+			max-width : 25%;
+			overflow : hidden;
+			text-overflow : ellipsis;
+			border-radius : 4px;
+			padding : 1px 4px;
+			margin-right : 4px;
+			color: @default-text;
 		}
 
 		.author {
diff --git a/themes/night.css b/themes/night.css
index 4294f2568..17e8ef913 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -1270,22 +1270,17 @@ body.ttrss_utility hr {
   margin: 0px 4px;
 }
 .cdm .header .feed {
-  float: right;
-  font-weight: normal;
-  font-style: italic;
-}
-.cdm .header .feed a {
-  border-radius: 4px;
-  display: inline-block;
-  padding: 1px 4px 1px 4px;
-}
-.cdm .header .feed,
-.cdm .header .feed a {
-  vertical-align: middle;
-  color: #ccc;
   font-weight: normal;
   font-style: italic;
   font-size: 11px;
+  display: inline-block;
+  max-width: 25%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  border-radius: 4px;
+  padding: 1px 4px;
+  margin-right: 4px;
+  color: #ccc;
 }
 .cdm .header .author {
   white-space: nowrap;
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 648bb175b..112d4eddd 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -1270,22 +1270,17 @@ body.ttrss_utility hr {
   margin: 0px 4px;
 }
 .cdm .header .feed {
-  float: right;
-  font-weight: normal;
-  font-style: italic;
-}
-.cdm .header .feed a {
-  border-radius: 4px;
-  display: inline-block;
-  padding: 1px 4px 1px 4px;
-}
-.cdm .header .feed,
-.cdm .header .feed a {
-  vertical-align: middle;
-  color: #ccc;
   font-weight: normal;
   font-style: italic;
   font-size: 11px;
+  display: inline-block;
+  max-width: 25%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  border-radius: 4px;
+  padding: 1px 4px;
+  margin-right: 4px;
+  color: #ccc;
 }
 .cdm .header .author {
   white-space: nowrap;