diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 21bf0c49ea..6725964f53 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -105,6 +105,8 @@ error404 = The page you are trying to reach either <strong>does not exist</stron
 
 never = Never
 
+rss_feed = RSS Feed
+
 [error]
 occurred = An error occurred
 report_message = If you are sure this is a Gitea bug, please search for issues on <a href="https://github.com/go-gitea/gitea/issues" target="_blank">GitHub</a> or open a new issue if necessary.
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index c72fc53de5..1fe0b035e6 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -5,6 +5,7 @@
 		<div id="org-info">
 			<div class="ui header">
 				{{.Org.DisplayName}}
+				<a href="{{.Org.HomeLink}}.rss"><i class="ui grey icon tooltip ml-3" data-content="{{.i18n.Tr "rss_feed"}}" data-position="top center">{{svg "octicon-rss" 36}}</i></a>
 				<span class="org-visibility">
 					{{if .Org.Visibility.IsLimited}}<div class="ui large basic horizontal label">{{.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
 					{{if .Org.Visibility.IsPrivate}}<div class="ui large basic horizontal label">{{.i18n.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 198b05b4ba..588cfc7717 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -13,6 +13,7 @@
 					<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>
 					<div class="mx-2">/</div>
 					<a href="{{$.RepoLink}}">{{.Name}}</a>
+					<a href="{{$.RepoLink}}.rss"><i class="ui grey icon tooltip ml-3" data-content="{{$.i18n.Tr "rss_feed"}}" data-position="top center">{{svg "octicon-rss" 18}}</i></a>
 					<div class="labels df ac fw">
 						{{if .IsTemplate}}
 							{{if .IsPrivate}}
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 34ecf1afe2..6f5efae02e 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -16,6 +16,7 @@
 					<div class="content word-break profile-avatar-name">
 						{{if .Owner.FullName}}<span class="header text center">{{.Owner.FullName}}</span>{{end}}
 						<span class="username text center">{{.Owner.Name}}</span>
+						<a href="{{.Owner.HomeLink}}.rss"><i class="ui grey icon tooltip ml-3" data-content="{{.i18n.Tr "rss_feed"}}" data-position="bottom center">{{svg "octicon-rss" 18}}</i></a>
 					</div>
 					<div class="extra content word-break">
 						<ul>
diff --git a/web_src/less/_organization.less b/web_src/less/_organization.less
index d86938d56a..b80739671f 100644
--- a/web_src/less/_organization.less
+++ b/web_src/less/_organization.less
@@ -50,6 +50,8 @@
       overflow-wrap: anywhere;
 
       .ui.header {
+        display: flex;
+        align-items: center;
         font-size: 36px;
         margin-bottom: 0;
         .org-visibility .label {
diff --git a/web_src/less/_user.less b/web_src/less/_user.less
index 7d8f9b2495..8284022115 100644
--- a/web_src/less/_user.less
+++ b/web_src/less/_user.less
@@ -3,12 +3,8 @@
 .user {
   &.profile {
     .ui.card {
-      .header,
-      .username {
-        display: block;
-      }
-
       .header {
+        display: block;
         font-weight: 600;
         font-size: 1.3rem;
         margin-top: -.2rem;
@@ -17,6 +13,7 @@
 
       .profile-avatar-name {
         border-top: none;
+        text-align: center;
       }
 
       .extra.content {