Make SVG size argument optional (#12814)

Now defaults to 16 on both frontend and backend.

Co-authored-by: techknowlogick <techknowlogick@gitea.io>

11 files changed, 64 insertions, 64 deletions

diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index 8876553ab5..66ee6164bb 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -56,11 +56,11 @@
 					<div class="column">
 						<div class="ui tiny basic status buttons">
 							<a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open&q={{$.Keyword}}">
-								{{svg "octicon-issue-opened" 16}}
+								{{svg "octicon-issue-opened"}}
 								{{.i18n.Tr "repo.issues.open_tab" .ShownIssueStats.OpenCount}}
 							</a>
 							<a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=closed&q={{$.Keyword}}">
-								{{svg "octicon-issue-closed" 16}}
+								{{svg "octicon-issue-closed"}}
 								{{.i18n.Tr "repo.issues.close_tab" .ShownIssueStats.ClosedCount}}
 							</a>
 						</div>
@@ -127,10 +127,10 @@
 							{{end}}
 
 							{{if .NumComments}}
-								<span class="comment ui right">{{svg "octicon-comment" 16}} {{.NumComments}}</span>
+								<span class="comment ui right">{{svg "octicon-comment"}} {{.NumComments}}</span>
 							{{end}}
 							{{if .TotalTrackedTime}}
-								<span class="comment ui right">{{svg "octicon-clock" 16}} {{.TotalTrackedTime | Sec2Time}}</span>
+								<span class="comment ui right">{{svg "octicon-clock"}} {{.TotalTrackedTime | Sec2Time}}</span>
 							{{end}}
 
 							<p class="desc">
@@ -143,12 +143,12 @@
 								{{end}}
 								{{if .Milestone}}
 									<a class="milestone" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/milestone/{{.Milestone.ID}}">
-										{{svg "octicon-milestone" 16}} {{.Milestone.Name}}
+										{{svg "octicon-milestone"}} {{.Milestone.Name}}
 									</a>
 								{{end}}
 								{{if .Ref}}
 									<a class="ref" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}{{index $.IssueRefURLs .ID}}">
-										{{svg "octicon-git-branch" 16}} {{index $.IssueRefEndNames .ID}}
+										{{svg "octicon-git-branch"}} {{index $.IssueRefEndNames .ID}}
 									</a>
 								{{end}}
 								{{range .Assignees}}
@@ -160,12 +160,12 @@
 								{{if gt $tasks 0}}
 									{{$tasksDone := .GetTasksDone}}
 									<span class="checklist">
-										{{svg "octicon-checklist" 16}} {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span>
+										{{svg "octicon-checklist"}} {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span>
 									</span>
 								{{end}}
 								{{if ne .DeadlineUnix 0}}
 									<span class="due-date poping up" data-content="{{$.i18n.Tr "repo.issues.due_date"}}" data-variation="tiny inverted" data-position="right center">
-										{{svg "octicon-calendar" 16}}<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span>
+										{{svg "octicon-calendar"}}<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span>
 									</span>
 								{{end}}
 								{{if .IsPull}}
@@ -173,25 +173,25 @@
 									{{$rejectOfficial := call $approvalCounts .ID "reject"}}
 									{{$waitingOfficial := call $approvalCounts .ID "waiting"}}
 									{{if gt $approveOfficial 0}}
-										<span class="approvals">{{svg "octicon-check" 16}}
+										<span class="approvals">{{svg "octicon-check"}}
 											{{$.i18n.Tr (TrN $.i18n.Lang $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n") $approveOfficial}}
 										</span>
 									{{end}}
 
 									{{if gt $rejectOfficial 0}}
-										<span class="rejects">{{svg "octicon-diff" 16}}
+										<span class="rejects">{{svg "octicon-diff"}}
 											{{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}}
 										</span>
 									{{end}}
 
 									{{if gt $waitingOfficial 0}}
-										<span class="waiting">{{svg "octicon-eye" 16}}
+										<span class="waiting">{{svg "octicon-eye"}}
 											{{$.i18n.Tr (TrN $.i18n.Lang $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n") $waitingOfficial}}
 										</span>
 									{{end}}
 
 									{{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}}
-										<span class="conflicting">{{svg "octicon-x" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
+										<span class="conflicting">{{svg "octicon-x"}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
 									{{end}}
 								{{end}}
 							</p>
diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl
index 2a4226e923..f22bf13e22 100644
--- a/templates/user/dashboard/milestones.tmpl
+++ b/templates/user/dashboard/milestones.tmpl
@@ -36,11 +36,11 @@
 			<div class="twelve wide column content">
 				<div class="ui tiny basic status buttons">
 					<a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open">
-						{{svg "octicon-issue-opened" 16}}
+						{{svg "octicon-issue-opened"}}
 						{{.i18n.Tr "repo.milestones.open_tab" .MilestoneStats.OpenCount}}
 					</a>
 					<a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{.Link}}?repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=closed">
-						{{svg "octicon-issue-closed" 16}}
+						{{svg "octicon-issue-closed"}}
 						{{.i18n.Tr "repo.milestones.close_tab" .MilestoneStats.ClosedCount}}
 					</a>
 				</div>
@@ -66,7 +66,7 @@
                     {{range .Milestones}}
                         <li class="item">
                             <div class="ui label">{{.Repo.FullName}}</div>
-							{{svg "octicon-milestone" 16}} <a href="{{.Repo.Link }}/milestone/{{.ID}}">{{.Name}}</a>
+							{{svg "octicon-milestone"}} <a href="{{.Repo.Link }}/milestone/{{.ID}}">{{.Name}}</a>
                             <div class="ui right green progress" data-percent="{{.Completeness}}">
                                 <div class="bar" {{if not .Completeness}}style="background-color: transparent"{{end}}>
                                     <div class="progress"></div>
@@ -75,9 +75,9 @@
                             <div class="meta">
                                 {{ $closedDate:= TimeSinceUnix .ClosedDateUnix $.Lang }}
                                 {{if .IsClosed}}
-									{{svg "octicon-clock" 16}} {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}}
+									{{svg "octicon-clock"}} {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}}
                                 {{else}}
-									{{svg "octicon-calendar" 16}}
+									{{svg "octicon-calendar"}}
                                     {{if .DeadlineString}}
                                         <span {{if .IsOverdue}}class="overdue"{{end}}>{{.DeadlineString}}</span>
                                     {{else}}
@@ -85,20 +85,20 @@
                                     {{end}}
                                 {{end}}
                                 <span class="issue-stats">
-                                    {{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.milestones.open_tab" .NumOpenIssues}}
-									{{svg "octicon-issue-closed" 16}} {{$.i18n.Tr "repo.milestones.close_tab" .NumClosedIssues}}
-                                    {{if .TotalTrackedTime}}{{svg "octicon-clock" 16}} {{.TotalTrackedTime|Sec2Time}}{{end}}
+                                    {{svg "octicon-issue-opened"}} {{$.i18n.Tr "repo.milestones.open_tab" .NumOpenIssues}}
+									{{svg "octicon-issue-closed"}} {{$.i18n.Tr "repo.milestones.close_tab" .NumClosedIssues}}
+                                    {{if .TotalTrackedTime}}{{svg "octicon-clock"}} {{.TotalTrackedTime|Sec2Time}}{{end}}
                                 </span>
                             </div>
                             {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}}
                                 <div class="ui right operate">
-                                    <a href="{{$.Link}}/{{.ID}}/edit" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-pencil" 16}} {{$.i18n.Tr "repo.issues.label_edit"}}</a>
+                                    <a href="{{$.Link}}/{{.ID}}/edit" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-pencil"}} {{$.i18n.Tr "repo.issues.label_edit"}}</a>
                                     {{if .IsClosed}}
-                                        <a href="{{$.Link}}/{{.ID}}/open" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-check" 16}} {{$.i18n.Tr "repo.milestones.open"}}</a>
+                                        <a href="{{$.Link}}/{{.ID}}/open" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-check"}} {{$.i18n.Tr "repo.milestones.open"}}</a>
                                     {{else}}
-                                        <a href="{{$.Link}}/{{.ID}}/close" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-x" 16}} {{$.i18n.Tr "repo.milestones.close"}}</a>
+                                        <a href="{{$.Link}}/{{.ID}}/close" data-id={{.ID}} data-title={{.Name}}>{{svg "octicon-x"}} {{$.i18n.Tr "repo.milestones.close"}}</a>
                                     {{end}}
-                                    <a class="delete-button" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}">{{svg "octicon-trashcan" 16}} {{$.i18n.Tr "repo.issues.label_delete"}}</a>
+                                    <a class="delete-button" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}">{{svg "octicon-trashcan"}} {{$.i18n.Tr "repo.issues.label_delete"}}</a>
                                 </div>
                             {{end}}
                             {{if .Content}}
diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl
index 7afb975bbc..c94dfa5e8f 100644
--- a/templates/user/dashboard/navbar.tmpl
+++ b/templates/user/dashboard/navbar.tmpl
@@ -25,7 +25,7 @@
 					</div>
 					{{if .SignedUser.CanCreateOrganization}}
 					<a class="item" href="{{AppSubUrl}}/org/create">
-						{{svg "octicon-plus" 16}}&nbsp;&nbsp;&nbsp;{{.i18n.Tr "new_org"}}
+						{{svg "octicon-plus"}}&nbsp;&nbsp;&nbsp;{{.i18n.Tr "new_org"}}
 					</a>
 					{{end}}
 				</div>
@@ -35,17 +35,17 @@
 		{{if .ContextUser.IsOrganization}}
 			<div class="right stackable menu">
 				<a class="{{if .PageIsNews}}active{{end}} item" style="margin-left: auto" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/dashboard">
-					{{svg "octicon-rss" 16}}&nbsp;{{.i18n.Tr "activities"}}
+					{{svg "octicon-rss"}}&nbsp;{{.i18n.Tr "activities"}}
 				</a>
 				<a class="{{if .PageIsIssues}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/issues">
-					{{svg "octicon-issue-opened" 16}}&nbsp;{{.i18n.Tr "issues"}}
+					{{svg "octicon-issue-opened"}}&nbsp;{{.i18n.Tr "issues"}}
 				</a>
 				<a class="{{if .PageIsPulls}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/pulls">
-					{{svg "octicon-git-pull-request" 16}}&nbsp;{{.i18n.Tr "pull_requests"}}
+					{{svg "octicon-git-pull-request"}}&nbsp;{{.i18n.Tr "pull_requests"}}
 				</a>
 				{{if .ShowMilestonesDashboardPage}}
 					<a class="{{if .PageIsMilestonesDashboard}}active{{end}} item" href="{{AppSubUrl}}/org/{{.ContextUser.Name}}/milestones">
-						{{svg "octicon-milestone" 16}}&nbsp;{{.i18n.Tr "milestones"}}
+						{{svg "octicon-milestone"}}&nbsp;{{.i18n.Tr "milestones"}}
 					</a>
 				{{end}}
 				<div class="item">
diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl
index ce4a97a36f..717318634e 100644
--- a/templates/user/dashboard/repolist.tmpl
+++ b/templates/user/dashboard/repolist.tmpl
@@ -53,15 +53,15 @@
 								<a @click="togglePrivateFilter()">
 									<div class="ui checkbox" id="privateFilterCheckbox" title="{{.i18n.Tr "home.show_both_private_public"}}" v-if="privateFilter === 'both'">
 										<input type="checkbox">
-										<label>{{svg "octicon-lock" 16}}{{.i18n.Tr "home.show_private"}}</label>
+										<label>{{svg "octicon-lock"}}{{.i18n.Tr "home.show_private"}}</label>
 									</div>
 									<div class="ui checkbox" id="privateFilterCheckbox" title="{{.i18n.Tr "home.show_only_public"}}" v-if="privateFilter === 'public'">
 										<input type="checkbox">
-										<label>{{svg "octicon-lock" 16}}</svg>{{.i18n.Tr "home.show_private"}}</label>
+										<label>{{svg "octicon-lock"}}</svg>{{.i18n.Tr "home.show_private"}}</label>
 									</div>
 									<div class="ui checkbox" id="privateFilterCheckbox" title="{{.i18n.Tr "home.show_only_private"}}" v-if="privateFilter === 'private'">
 										<input type="checkbox">
-										<label>{{svg "octicon-lock" 16}}</svg>{{.i18n.Tr "home.show_private"}}</label>
+										<label>{{svg "octicon-lock"}}</svg>{{.i18n.Tr "home.show_private"}}</label>
 									</div>
 								</a>
 							</div>
@@ -99,7 +99,7 @@
 							<strong class="text truncate item-name">${repo.full_name}</strong>
 							<i v-if="repo.archived" class="archive icon archived-icon"></i>
 							<span class="ui right text light grey">
-								${repo.stars_count} <span class="rear">{{svg "octicon-star" 16}}</span>
+								${repo.stars_count} <span class="rear">{{svg "octicon-star"}}</span>
 							</span>
 						</a>
 					</li>
@@ -143,10 +143,10 @@
 				<ul class="repo-owner-name-list">
 					<li v-for="org in organizations">
 						<a :href="suburl + '/' + org.name">
-							{{svg "octicon-organization" 16}}
+							{{svg "octicon-organization"}}
 							<strong class="text truncate item-name">${org.name}</strong>
 							<span class="ui right text light grey">
-								${org.num_repos} <span class="rear">{{svg "octicon-repo" 16}}</span>
+								${org.num_repos} <span class="rear">{{svg "octicon-repo"}}</span>
 							</span>
 						</a>
 					</li>
diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl
index 18054c479a..d35009107a 100644
--- a/templates/user/notification/notification_div.tmpl
+++ b/templates/user/notification/notification_div.tmpl
@@ -15,7 +15,7 @@
                     {{$.CsrfTokenHtml}}
                     <div class="{{if not $notificationUnreadCount}}hide{{end}}">
                         <button class="ui mini button primary" title='{{$.i18n.Tr "notification.mark_all_as_read"}}'>
-                            {{svg "octicon-checklist" 16}}
+                            {{svg "octicon-checklist"}}
                         </button>
                     </div>
                 </form>
@@ -38,22 +38,22 @@
                             <tr id="notification_{{.ID}}">
                                 <td class="collapsing" data-href="{{.HTMLURL}}">
                                     {{if eq .Status 3}}
-                                        <span class="blue">{{svg "octicon-pin" 16}}</span>
+                                        <span class="blue">{{svg "octicon-pin"}}</span>
                                     {{else if $issue.IsPull}}
                                         {{if $issue.IsClosed}}
                                             {{if $issue.GetPullRequest.HasMerged}}
-                                                <span class="purple">{{svg "octicon-git-merge" 16}}</span>
+                                                <span class="purple">{{svg "octicon-git-merge"}}</span>
                                             {{else}}
-                                                <span class="red">{{svg "octicon-git-pull-request" 16}}</span>
+                                                <span class="red">{{svg "octicon-git-pull-request"}}</span>
                                             {{end}}
                                         {{else}}
-                                            <span class="green">{{svg "octicon-git-pull-request" 16}}</span>
+                                            <span class="green">{{svg "octicon-git-pull-request"}}</span>
                                         {{end}}
                                     {{else}}
                                         {{if $issue.IsClosed}}
-                                            <span class="red">{{svg "octicon-issue-closed" 16}}</span>
+                                            <span class="red">{{svg "octicon-issue-closed"}}</span>
                                         {{else}}
-                                            <span class="green">{{svg "octicon-issue-opened" 16}}</span>
+                                            <span class="green">{{svg "octicon-issue-opened"}}</span>
                                         {{end}}
                                     {{end}}
                                 </td>
@@ -79,7 +79,7 @@
                                                 data-page="{{$.Page.Paginater.Current}}"
                                                 data-notification-id="{{.ID}}"
                                                 data-q="{{$.Keyword}}">
-                                                {{svg "octicon-pin" 16}}
+                                                {{svg "octicon-pin"}}
                                             </button>
                                         </form>
                                     {{end}}
@@ -97,7 +97,7 @@
                                                 data-page="{{$.Page.Paginater.Current}}"
                                                 data-notification-id="{{.ID}}"
                                                 data-q="{{$.Keyword}}">
-                                                {{svg "octicon-check" 16}}
+                                                {{svg "octicon-check"}}
                                             </button>
                                         </form>
                                     {{else if eq .Status 2}}
@@ -112,7 +112,7 @@
                                                 data-page="{{$.Page.Paginater.Current}}"
                                                 data-notification-id="{{.ID}}"
                                                 data-q="{{$.Keyword}}">
-                                                {{svg "octicon-bell" 16}}
+                                                {{svg "octicon-bell"}}
                                             </button>
                                         </form>
                                     {{end}}
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index ecfc7e6544..9deadd921d 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -20,17 +20,17 @@
 					<div class="extra content wrap">
 						<ul class="text black">
 							{{if .Owner.Location}}
-								<li>{{svg "octicon-location" 16}} {{.Owner.Location}}</li>
+								<li>{{svg "octicon-location"}} {{.Owner.Location}}</li>
 							{{end}}
 							{{if .ShowUserEmail }}
 								<li>
-									{{svg "octicon-mail" 16}}
+									{{svg "octicon-mail"}}
 									<a href="mailto:{{.Owner.Email}}" rel="nofollow">{{.Owner.Email}}</a>
 								</li>
 							{{end}}
 							{{if .Owner.Website}}
 								<li>
-									{{svg "octicon-link" 16}}
+									{{svg "octicon-link"}}
 									<a target="_blank" rel="noopener noreferrer me" href="{{.Owner.Website}}">{{.Owner.Website}}</a>
 								</li>
 							{{end}}
@@ -47,7 +47,7 @@
 									</li>
 								{{end}}
 							{{end}}
-							<li>{{svg "octicon-clock" 16}} {{.i18n.Tr "user.join_on"}} {{.Owner.CreatedUnix.FormatShort}}</li>
+							<li>{{svg "octicon-clock"}} {{.i18n.Tr "user.join_on"}} {{.Owner.CreatedUnix.FormatShort}}</li>
 							{{if and .Orgs .HasOrgsVisible}}
 							<li>
 								<ul class="user-orgs">
@@ -66,12 +66,12 @@
 								{{if .SignedUser.IsFollowing .Owner.ID}}
 									<form method="post" action="{{.Link}}/action/unfollow?redirect_to={{$.Link}}">
 										{{$.CsrfTokenHtml}}
-										<button type="submit" class="ui basic red button">{{svg "octicon-person" 16}} {{.i18n.Tr "user.unfollow"}}</button>
+										<button type="submit" class="ui basic red button">{{svg "octicon-person"}} {{.i18n.Tr "user.unfollow"}}</button>
 									</form>
 								{{else}}
 									<form method="post" action="{{.Link}}/action/follow?redirect_to={{$.Link}}">
 										{{$.CsrfTokenHtml}}
-										<button type="submit" class="ui basic green button">{{svg "octicon-person" 16}} {{.i18n.Tr "user.follow"}}</button>
+										<button type="submit" class="ui basic green button">{{svg "octicon-person"}} {{.i18n.Tr "user.follow"}}</button>
 									</form>
 								{{end}}
 							</li>
@@ -83,21 +83,21 @@
 			<div class="ui eleven wide column">
 				<div class="ui secondary stackable pointing menu">
 					<a class='{{if and (ne .TabName "activity") (ne .TabName "following") (ne .TabName "followers") (ne .TabName "stars") (ne .TabName "projects")}}active{{end}} item' href="{{.Owner.HomeLink}}">
-						{{svg "octicon-repo" 16}} {{.i18n.Tr "user.repositories"}}
+						{{svg "octicon-repo"}} {{.i18n.Tr "user.repositories"}}
 					</a>
 					<a class='{{if eq .TabName "activity"}}active{{end}} item' href="{{.Owner.HomeLink}}?tab=activity">
-						{{svg "octicon-rss" 16}} {{.i18n.Tr "user.activity"}}
+						{{svg "octicon-rss"}} {{.i18n.Tr "user.activity"}}
 					</a>
 					<a class='{{if eq .TabName "stars"}}active{{end}} item' href="{{.Owner.HomeLink}}?tab=stars">
-						{{svg "octicon-star" 16}}  {{.i18n.Tr "user.starred"}}
+						{{svg "octicon-star"}}  {{.i18n.Tr "user.starred"}}
 						<div class="ui label">{{.Owner.NumStars}}</div>
 					</a>
 					<a class='{{if eq .TabName "following"}}active{{end}} item' href="{{.Owner.HomeLink}}?tab=following">
-						{{svg "octicon-person" 16}}  {{.i18n.Tr "user.following"}}
+						{{svg "octicon-person"}}  {{.i18n.Tr "user.following"}}
 						<div class="ui label">{{.Owner.NumFollowing}}</div>
 					</a>
 					<a class='{{if eq .TabName "followers"}}active{{end}} item' href="{{.Owner.HomeLink}}?tab=followers">
-						{{svg "octicon-person" 16}}  {{.i18n.Tr "user.followers"}}
+						{{svg "octicon-person"}}  {{.i18n.Tr "user.followers"}}
 						<div class="ui label">{{.Owner.NumFollowers}}</div>
 					</a>
 				</div>
diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl
index e8b4267a70..b2cff86188 100644
--- a/templates/user/settings/account.tmpl
+++ b/templates/user/settings/account.tmpl
@@ -172,7 +172,7 @@
 		</h4>
 		<div class="ui attached warning segment">
 			<div class="ui red message">
-				<p class="text left">{{svg "octicon-alert" 16}} {{.i18n.Tr "settings.delete_prompt" | Str2html}}</p>
+				<p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "settings.delete_prompt" | Str2html}}</p>
 			</div>
 			<form class="ui form ignore-dirty" id="delete-form" action="{{AppSubUrl}}/user/settings/account/delete" method="post">
 				{{.CsrfTokenHtml}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 4131350cb0..b2751ae13b 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -22,7 +22,7 @@
 						<div class="content">
 							<strong>{{.Name}}</strong>
 							<div class="activity meta">
-								<i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> —  {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
+								<i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> —  {{svg "octicon-info"}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
 							</div>
 						</div>
 					</div>
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 55e2a4b008..e5b42f4174 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -29,7 +29,7 @@
                         {{.Fingerprint}}
                     </div>
                     <div class="activity meta">
-                        <i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> —	{{svg "octicon-info" 16}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
+                        <i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> —	{{svg "octicon-info"}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
                     </div>
                 </div>
 			</div>
diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl
index ed93dd1e42..8d9065ec61 100644
--- a/templates/user/settings/repos.tmpl
+++ b/templates/user/settings/repos.tmpl
@@ -13,13 +13,13 @@
 					<div class="item">
 						<div class="content">
 							{{if .IsPrivate}}
-								<span class="text gold iconFloat">{{svg "octicon-lock" 16}}</span>
+								<span class="text gold iconFloat">{{svg "octicon-lock"}}</span>
 							{{else if .IsFork}}
-								<span class="iconFloat">{{svg "octicon-repo-forked" 16}}</span>
+								<span class="iconFloat">{{svg "octicon-repo-forked"}}</span>
 							{{else if .IsMirror}}
-								<span class="iconFloat">{{svg "octicon-mirror" 16}}</span>
+								<span class="iconFloat">{{svg "octicon-mirror"}}</span>
 							{{else}}
-								<span class="iconFloat">{{svg "octicon-repo" 16}}</span>
+								<span class="iconFloat">{{svg "octicon-repo"}}</span>
 							{{end}}
 							<a class="name" href="{{AppSubUrl}}/{{$.Owner.Name}}/{{.Name}}">{{$.Owner.Name}}/{{.Name}}</a>
 							<span>{{SizeFmt .Size}}</span>
diff --git a/templates/user/settings/security_u2f.tmpl b/templates/user/settings/security_u2f.tmpl
index e083e0b434..5fb5f344d1 100644
--- a/templates/user/settings/security_u2f.tmpl
+++ b/templates/user/settings/security_u2f.tmpl
@@ -24,7 +24,7 @@
 				<label for="nickname">{{.i18n.Tr "settings.u2f_nickname"}}</label>
 				<input id="nickname" name="nickname" type="text" required>
 			</div>
-			<button id="register-security-key" class="ui green button">{{svg "octicon-key" 16}} {{.i18n.Tr "settings.u2f_register_key"}}</button>
+			<button id="register-security-key" class="ui green button">{{svg "octicon-key"}} {{.i18n.Tr "settings.u2f_register_key"}}</button>
 		</div>
 	{{else}}
 		<b>{{.i18n.Tr "settings.u2f_require_twofa"}}</b>