diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl
index 135b4da3a0..39ffdd44b1 100644
--- a/templates/admin/emails/list.tmpl
+++ b/templates/admin/emails/list.tmpl
@@ -81,7 +81,7 @@
 				{{ctx.Locale.Tr "admin.emails.change_email_header"}}
 			</div>
 			<form class="content ui form" action="{{AppSubUrl}}/-/admin/emails/activate" method="post">
-				<p class="center">{{ctx.Locale.Tr "admin.emails.change_email_text"}}</p>
+				<p class="tw-text-center">{{ctx.Locale.Tr "admin.emails.change_email_text"}}</p>
 
 				<input type="hidden" name="sort" value="{{.SortType}}">
 				<input type="hidden" name="q" value="{{.Keyword}}">
diff --git a/templates/home.tmpl b/templates/home.tmpl
index 0c5326643a..29c13b91c2 100644
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -1,7 +1,7 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{if .IsSigned}}{{ctx.Locale.Tr "dashboard"}}{{else}}{{ctx.Locale.Tr "home_title"}}{{end}}" class="page-content home">
 	<div class="tw-mb-8 tw-px-8">
-		<div class="center">
+		<div class="tw-text-center">
 			<img class="logo" width="220" height="220" src="{{AssetUrlPrefix}}/img/login-logo.png" alt="{{ctx.Locale.Tr "logo"}}" onerror="this.style.display='none'">
 			<div class="hero">
 				<h1 class="ui icon header title tw-text-balance">
diff --git a/templates/install.tmpl b/templates/install.tmpl
index 24f915ef6c..e901ef082c 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -275,7 +275,7 @@
 							<summary class="right-content tw-py-2{{if .Err_Admin}} tw-text-red{{end}}">
 								{{ctx.Locale.Tr "install.admin_title"}}
 							</summary>
-							<p class="center">{{ctx.Locale.Tr "install.admin_setting_desc"}}</p>
+							<p class="tw-text-center">{{ctx.Locale.Tr "install.admin_setting_desc"}}</p>
 							<div class="inline field {{if .Err_AdminName}}error{{end}}">
 								<label for="admin_name">{{ctx.Locale.Tr "install.admin_name"}}</label>
 								<input id="admin_name" name="admin_name" value="{{.admin_name}}">
diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl
index f55d3cae51..f32cd86dfd 100644
--- a/templates/user/auth/forgot_passwd.tmpl
+++ b/templates/user/auth/forgot_passwd.tmpl
@@ -20,7 +20,7 @@
 							<button class="ui primary button">{{ctx.Locale.Tr "auth.send_reset_mail"}}</button>
 						</div>
 					{{else if .IsResetDisable}}
-						<p class="center">
+						<p class="tw-text-center">
 							{{if $.IsAdmin}}
 								{{ctx.Locale.Tr "auth.disable_forgot_password_mail_admin"}}
 							{{else}}
@@ -28,7 +28,7 @@
 							{{end}}
 						</p>
 					{{else if .ResendLimited}}
-						<p class="center">{{ctx.Locale.Tr "auth.resent_limit_prompt"}}</p>
+						<p class="tw-text-center">{{ctx.Locale.Tr "auth.resent_limit_prompt"}}</p>
 					{{end}}
 				</div>
 			</form>
diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl
index efe536649e..5db4d781ae 100644
--- a/templates/user/auth/reset_passwd.tmpl
+++ b/templates/user/auth/reset_passwd.tmpl
@@ -54,7 +54,7 @@
 							{{end}}
 						</div>
 					{{else}}
-						<p class="center">{{ctx.Locale.Tr "auth.invalid_code_forgot_password" (printf "%s/user/forgot_password" AppSubUrl)}}</p>
+						<p class="tw-text-center">{{ctx.Locale.Tr "auth.invalid_code_forgot_password" (printf "%s/user/forgot_password" AppSubUrl)}}</p>
 					{{end}}
 				</div>
 			</form>
diff --git a/web_src/css/base.css b/web_src/css/base.css
index 6724fced7b..5ebd7ffb56 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -24,7 +24,7 @@
   /* other variables */
   --border-radius: 4px;
   --border-radius-medium: 6px;
-  --border-radius-full: 99999px; /* TODO: use calc(infinity * 1px) */
+  --border-radius-full: calc(infinity * 1px);
   --opacity-disabled: 0.55;
   --height-loading: 16rem;
   --min-height-textarea: 132px; /* padding + 6 lines + border = calc(1.57142em + 6lh + 2px), but lh is not fully supported */
@@ -535,10 +535,6 @@ strong.attention-caution, svg.attention-caution {
   color: var(--color-error-text);
 }
 
-/* FIXME: this is a longstanding dirty patch since 2015, it only makes the pages more messy and shouldn't be used */
-.center {
-  text-align: center;
-}
 
 overflow-menu {
   border-bottom: 1px solid var(--color-secondary) !important;