diff --git a/routers/web/admin/config.go b/routers/web/admin/config.go
index 310ebd3f6d46d..774b31ab9842a 100644
--- a/routers/web/admin/config.go
+++ b/routers/web/admin/config.go
@@ -27,7 +27,7 @@ import (
 
 const (
 	tplConfig         templates.TplName = "admin/config"
-	tplConfigSettings templates.TplName = "admin/config_settings"
+	tplConfigSettings templates.TplName = "admin/config_settings/config_settings"
 )
 
 // SendTestMail send test mail to confirm mail service is OK
diff --git a/templates/admin/config_settings/avatars.tmpl b/templates/admin/config_settings/avatars.tmpl
new file mode 100644
index 0000000000000..1fc761034d402
--- /dev/null
+++ b/templates/admin/config_settings/avatars.tmpl
@@ -0,0 +1,20 @@
+<h4 class="ui top attached header">
+	{{ctx.Locale.Tr "admin.config.picture_config"}}
+</h4>
+<div class="ui attached table segment">
+	<dl class="admin-dl-horizontal">
+		<dt>{{ctx.Locale.Tr "admin.config.disable_gravatar"}}</dt>
+		<dd>
+			<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.disable_gravatar"}}">
+				<input type="checkbox" data-config-dyn-key="picture.disable_gravatar" {{if .SystemConfig.Picture.DisableGravatar.Value ctx}}checked{{end}}><label></label>
+			</div>
+		</dd>
+		<div class="divider"></div>
+		<dt>{{ctx.Locale.Tr "admin.config.enable_federated_avatar"}}</dt>
+		<dd>
+			<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.enable_federated_avatar"}}">
+				<input type="checkbox" data-config-dyn-key="picture.enable_federated_avatar" {{if .SystemConfig.Picture.EnableFederatedAvatar.Value ctx}}checked{{end}}><label></label>
+			</div>
+		</dd>
+	</dl>
+</div>
diff --git a/templates/admin/config_settings/config_settings.tmpl b/templates/admin/config_settings/config_settings.tmpl
new file mode 100644
index 0000000000000..1ef764a58bac5
--- /dev/null
+++ b/templates/admin/config_settings/config_settings.tmpl
@@ -0,0 +1,7 @@
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
+
+{{template "admin/config_settings/avatars" .}}
+
+{{template "admin/config_settings/repository" .}}
+
+{{template "admin/layout_footer" .}}
diff --git a/templates/admin/config_settings.tmpl b/templates/admin/config_settings/repository.tmpl
similarity index 51%
rename from templates/admin/config_settings.tmpl
rename to templates/admin/config_settings/repository.tmpl
index 9bd37afa7d599..9a377078356cc 100644
--- a/templates/admin/config_settings.tmpl
+++ b/templates/admin/config_settings/repository.tmpl
@@ -1,25 +1,3 @@
-{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
-<h4 class="ui top attached header">
-	{{ctx.Locale.Tr "admin.config.picture_config"}}
-</h4>
-<div class="ui attached table segment">
-	<dl class="admin-dl-horizontal">
-		<dt>{{ctx.Locale.Tr "admin.config.disable_gravatar"}}</dt>
-		<dd>
-			<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.disable_gravatar"}}">
-				<input type="checkbox" data-config-dyn-key="picture.disable_gravatar" {{if .SystemConfig.Picture.DisableGravatar.Value ctx}}checked{{end}}><label></label>
-			</div>
-		</dd>
-		<div class="divider"></div>
-		<dt>{{ctx.Locale.Tr "admin.config.enable_federated_avatar"}}</dt>
-		<dd>
-			<div class="ui toggle checkbox" data-tooltip-content="{{ctx.Locale.Tr "admin.config.enable_federated_avatar"}}">
-				<input type="checkbox" data-config-dyn-key="picture.enable_federated_avatar" {{if .SystemConfig.Picture.EnableFederatedAvatar.Value ctx}}checked{{end}}><label></label>
-			</div>
-		</dd>
-	</dl>
-</div>
-
 <h4 class="ui top attached header">
 	{{ctx.Locale.Tr "repository"}}
 </h4>
@@ -48,4 +26,3 @@
 		</div>
 	</form>
 </div>
-{{template "admin/layout_footer" .}}