diff --git a/public/css/index.css b/public/css/index.css
index 8409b5128d853..dfe234758447a 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -2377,12 +2377,6 @@ footer .ui.language .menu {
 .settings .list .item .green {
   color: #21BA45 !important;
 }
-.settings .list .item:not(:first-child) {
-  border-top: 1px solid #eaeaea;
-  padding: 1rem;
-  margin: 15px -1rem -1rem -1rem;
-  min-height: 60px;
-}
 .settings .list .item > .mega-octicon {
   display: table-cell;
 }
diff --git a/public/less/_repository.less b/public/less/_repository.less
index 7fadc21a86287..3dbdd47e0f122 100644
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -1367,12 +1367,6 @@
 			.green {
 				color: #21BA45 !important;
 			}
-			&:not(:first-child) {
-				border-top: 1px solid #eaeaea;
-				padding:1rem;
-				margin: 15px -1rem -1rem -1rem;
-				min-height: 60px;
-			}
 			> .mega-octicon {
 				display: table-cell;
 			}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
index e732b3c9d3136..863733855bd13 100644
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -7,6 +7,7 @@
 		<h4 class="ui top attached header">
 			{{.i18n.Tr "repo.settings.collaboration"}}
 		</h4>
+		{{if .Collaborators}}
 		<div class="ui attached segment collaborator list">
 			{{range .Collaborators}}
 				<div class="item ui grid">
@@ -22,9 +23,9 @@
 							<div class="text">{{$.i18n.Tr .Collaboration.ModeI18nKey}}</div>
 							<i class="dropdown icon"></i>
 							<div class="access-mode menu" data-url="{{$.Link}}/access_mode" data-uid="{{.ID}}">
-							<div class="item" data-text="{{$.i18n.Tr "repo.settings.collaboration.admin"}}" data-value="3">{{$.i18n.Tr "repo.settings.collaboration.admin"}}</div>
-							<div class="item" data-text="{{$.i18n.Tr "repo.settings.collaboration.write"}}" data-value="2">{{$.i18n.Tr "repo.settings.collaboration.write"}}</div>
-							<div class="item" data-text="{{$.i18n.Tr "repo.settings.collaboration.read"}}" data-value="1">{{$.i18n.Tr "repo.settings.collaboration.read"}}</div>
+								<div class="item" data-text="{{$.i18n.Tr "repo.settings.collaboration.admin"}}" data-value="3">{{$.i18n.Tr "repo.settings.collaboration.admin"}}</div>
+								<div class="item" data-text="{{$.i18n.Tr "repo.settings.collaboration.write"}}" data-value="2">{{$.i18n.Tr "repo.settings.collaboration.write"}}</div>
+								<div class="item" data-text="{{$.i18n.Tr "repo.settings.collaboration.read"}}" data-value="1">{{$.i18n.Tr "repo.settings.collaboration.read"}}</div>
 							</div>
 						</div>
 					</div>
@@ -36,6 +37,7 @@
 				</div>
 			{{end}}
 		</div>
+		{{end}}
 		<div class="ui bottom attached segment">
 			<form class="ui form" id="repo-collab-form" action="{{.Link}}" method="post">
 				{{.CsrfTokenHtml}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index f082fde86b2d0..15f9df3bb7002 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -12,7 +12,7 @@
 		</h4>
 		<div class="ui attached segment">
 			{{if .Deploykeys}}
-				<div class="ui key list">
+				<div class="ui relaxed divided list">
 					{{range .Deploykeys}}
 						<div class="item">
 						    <div class="right floated content">
diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl
index 8014a7fe14f52..8d3d51fb0d07b 100644
--- a/templates/repo/settings/githooks.tmpl
+++ b/templates/repo/settings/githooks.tmpl
@@ -7,15 +7,15 @@
 		<h4 class="ui top attached header">
 			{{.i18n.Tr "repo.settings.githooks"}}
 		</h4>
-		<div class="ui attached table segment">
-			<div class="ui hook list">
-				<div class="item">
-					{{.i18n.Tr "repo.settings.githooks_desc" | Str2html}}
-				</div>
+		<div class="ui attached segment">
+			<p>
+				{{.i18n.Tr "repo.settings.githooks_desc" | Str2html}}
+			</p>
+			<div class="ui relaxed divided list">
 				{{range .Hooks}}
 					<div class="item">
 						<span class="text {{if .IsActive}}green{{else}}grey{{end}}"><i class="octicon octicon-primitive-dot"></i></span>
-						<span>{{.Name}}</span>
+						<a class="text blue" href="{{$.RepoLink}}/settings/hooks/git/{{.Name}}">{{.Name}}</a>
 						<a class="text blue ui right" href="{{$.RepoLink}}/settings/hooks/git/{{.Name}}"><i class="fa fa-pencil"></i></a>
 					</div>
 				{{end}}
diff --git a/templates/repo/settings/hook_list.tmpl b/templates/repo/settings/hook_list.tmpl
index 94f1d1310adce..c1826930242b1 100644
--- a/templates/repo/settings/hook_list.tmpl
+++ b/templates/repo/settings/hook_list.tmpl
@@ -15,11 +15,11 @@
 		</div>
 	</div>
 </h4>
-<div class="ui attached table segment">
-	<div class="ui hook list">
-		<div class="item">
-			{{.Description | Str2html}}
-		</div>
+<div class="ui attached segment">
+	<p>
+		{{.Description | Str2html}}
+	</p>
+	<div class="ui relaxed divided list">
 		{{range .Webhooks}}
 			<div class="item">
 				{{if eq .LastStatus 1}}
diff --git a/templates/user/settings/sshkeys.tmpl b/templates/user/settings/sshkeys.tmpl
index 7942afde41b02..319db436bff87 100644
--- a/templates/user/settings/sshkeys.tmpl
+++ b/templates/user/settings/sshkeys.tmpl
@@ -10,10 +10,10 @@
 			</div>
 		</h4>
 		<div class="ui attached segment">
-			<div class="ui key list">
-				<div class="item">
-					{{.i18n.Tr "settings.ssh_desc"}}
-				</div>
+			<p>
+				{{.i18n.Tr "settings.ssh_desc"}}
+			</p>
+			<div class="ui relaxed divided list">
 				{{range .Keys}}
 					<div class="item">
 					    <div class="right floated content">