diff --git a/templates/group/team/new.tmpl b/templates/group/team/new.tmpl
index ea4beeadc4..e909230dda 100644
--- a/templates/group/team/new.tmpl
+++ b/templates/group/team/new.tmpl
@@ -64,11 +64,11 @@
 									<thead>
 									<tr>
 										<th>{{ctx.Locale.Tr "units.unit"}}</th>
-										<th class="center aligned">{{ctx.Locale.Tr "org.teams.none_access"}}
+										<th class="tw-text-center">{{ctx.Locale.Tr "org.teams.none_access"}}
 											<span class="tw-align-middle" data-tooltip-content="{{ctx.Locale.Tr "org.teams.none_access_helper"}}">{{svg "octicon-question" 16 "tw-ml-1"}}</span></th>
-										<th class="center aligned">{{ctx.Locale.Tr "org.teams.read_access"}}
+										<th class="tw-text-center">{{ctx.Locale.Tr "org.teams.read_access"}}
 											<span class="tw-align-middle" data-tooltip-content="{{ctx.Locale.Tr "org.teams.read_access_helper"}}">{{svg "octicon-question" 16 "tw-ml-1"}}</span></th>
-										<th class="center aligned">{{ctx.Locale.Tr "org.teams.write_access"}}
+										<th class="tw-text-center">{{ctx.Locale.Tr "org.teams.write_access"}}
 											<span class="tw-align-middle" data-tooltip-content="{{ctx.Locale.Tr "org.teams.write_access_helper"}}">{{svg "octicon-question" 16 "tw-ml-1"}}</span></th>
 									</tr>
 									</thead>
@@ -84,17 +84,17 @@
 														</div>
 													</div>
 												</td>
-												<td class="center aligned">
+												<td class="tw-text-center">
 													<div class="ui radio checkbox">
 														<input type="radio" name="unit_{{$unit.Type.Value}}" value="0"{{if or ($unit.Type.UnitGlobalDisabled) (eq ($.Team.UnitAccessMode ctx $unit.Type) 0)}} checked{{end}} title="{{ctx.Locale.Tr "org.teams.none_access"}}">
 													</div>
 												</td>
-												<td class="center aligned">
+												<td class="tw-text-center">
 													<div class="ui radio checkbox">
 														<input type="radio" name="unit_{{$unit.Type.Value}}" value="1"{{if or (eq $.Team.ID 0) (eq ($.Team.UnitAccessMode ctx $unit.Type) 1)}} checked{{end}} {{if $unit.Type.UnitGlobalDisabled}}disabled{{end}} title="{{ctx.Locale.Tr "org.teams.read_access"}}">
 													</div>
 												</td>
-												<td class="center aligned">
+												<td class="tw-text-center">
 													<div class="ui radio checkbox">
 														<input type="radio" name="unit_{{$unit.Type.Value}}" value="2"{{if (ge ($.Team.UnitAccessMode ctx $unit.Type) 2)}} checked{{end}} {{if $unit.Type.UnitGlobalDisabled}}disabled{{end}} title="{{ctx.Locale.Tr "org.teams.write_access"}}">
 													</div>
diff --git a/templates/group/team/teams.tmpl b/templates/group/team/teams.tmpl
index 2fa5bbc419..e8ed741ad4 100644
--- a/templates/group/team/teams.tmpl
+++ b/templates/group/team/teams.tmpl
@@ -45,6 +45,7 @@
 								{{end}}
 
 								{{if and (or $.IsGroupAdmin $.IsGroupOwner) (not .IsOwnerTeam)}}
+								<a class="ui tiny button" href="{{$.OrgGroupLink}}/teams/{{.LowerName | PathEscape}}/edit">{{ctx.Locale.Tr "org.teams.settings"}}</a>
 								<form>
 									<button class="ui red tiny button delete-button" data-modal-id="remove-team"
 													data-url="{{$.OrgGroupLink}}/teams/{{.LowerName | PathEscape}}/remove"