diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index 9c6188f233..461c02ecad 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -1,7 +1,7 @@
 <div class="runner-container">
 	{{template "base/alert" .}}
 	<h4 class="ui top attached header">
-		{{.locale.Tr "actions.runners.runner_title"}} #{{.Runner.ID}} {{.Runner.Name}}
+		{{.locale.Tr "actions.runners.runner_title"}} {{template "shared/actions/runner_id" .Runner.ID}} {{.Runner.Name}}
 	</h4>
 	<div class="ui attached segment">
 		<form class="ui form" action="{{.Link}}" method="post">
@@ -69,7 +69,7 @@
 			<tbody>
 				{{range .Tasks}}
 				<tr>
-					<td><a href="{{.GetBuildViewLink}}" target="_blank">#{{.ID}}</a></td>
+					<td><a href="{{.GetBuildViewLink}}" target="_blank">{{template "shared/actions/runner_id" .ID}}</a></td>
 					<td><span class="ui label task-status-{{.Status.String}}">{{.Status.String}}</span></td>
 					<td>{{.GetRepoName}}</td>
 					<td><strong>
diff --git a/templates/shared/actions/runner_id.tmpl b/templates/shared/actions/runner_id.tmpl
new file mode 100644
index 0000000000..be38fadcc9
--- /dev/null
+++ b/templates/shared/actions/runner_id.tmpl
@@ -0,0 +1 @@
+<i><b>#{{.}}</b></i>
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl
index 3a58464602..93f630c035 100644
--- a/templates/shared/actions/runner_list.tmpl
+++ b/templates/shared/actions/runner_list.tmpl
@@ -62,12 +62,12 @@
 					<td>
 						{{if .Editable $.RunnerOnwerID $.RunnerRepoID}}
 						<a href="{{$.Link}}/{{.ID}}" class="tooltip" data-content="{{.Description}}">
-							<span class="runner-id">#{{.ID}}</span>
+							<span class="runner-id">{{template "shared/actions/runner_id" .ID}}</span>
 							<span class="runner-name">{{.Name}}</span>
 						</a>
 						{{else}}
 						<p class="tooltip" data-content="{{.Description}}">
-							<span class="runner-id">#{{.ID}}</span>
+							<span class="runner-id">{{template "shared/actions/runner_id" .ID}}</span>
 							<span class="runner-name">{{.Name}}</span>
 						</p>
 						{{end}}