diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Controllers/DashboardController.cs b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Controllers/DashboardController.cs
index b0b98bd09c6..bc2c9c6e09a 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Controllers/DashboardController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Controllers/DashboardController.cs
@@ -124,7 +124,7 @@ public async Task<IActionResult> Manage()
                 var authorized = await _authorizationService.AuthorizeAsync(User, CommonPermissions.EditContent, contentItem);
                 if (authorized)
                 {
-                    dashboardCreatable.Add(new SelectListItem(new LocalizedString(ctd.DisplayName, ctd.DisplayName).Value, ctd.Name));
+                    dashboardCreatable.Add(new SelectListItem(ctd.DisplayName, ctd.Name));
                 }
             }
 
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/Dashboard/Manage.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/Dashboard/Manage.cshtml
index 29add904e68..c87088d5fe1 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/Dashboard/Manage.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/Dashboard/Manage.cshtml
@@ -32,7 +32,7 @@
             <div class="dropdown-menu dropdown-menu-right scrollable" aria-labelledby="bulk-action-menu-button">
                 @foreach (var item in Model.Creatable)
                 {
-                    <a class="dropdown-item add-list-widget btn-sm" href="@Url.RouteUrl(new { area = "OrchardCore.Contents", controller = "Admin", action = "Create", id = @item.Value, returnUrl = FullRequestPath })">@T[item.Text]</a>
+                    <a class="dropdown-item add-list-widget btn-sm" href="@Url.RouteUrl(new { area = "OrchardCore.Contents", controller = "Admin", action = "Create", id = @item.Value, returnUrl = FullRequestPath })">@T[Html.Encode(item.Text)]</a>
                 }
             </div>
         </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Controllers/AdminController.cs
index 682ebe2e427..f158ed3fdab 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Controllers/AdminController.cs
@@ -138,7 +138,7 @@ public class AdminController : Controller
 
                     if (await _authorizationService.AuthorizeAsync(context.User, CommonPermissions.EditContent, contentItem))
                     {
-                        creatableList.Add(new SelectListItem(new LocalizedString(contentTypeDefinition.DisplayName, contentTypeDefinition.DisplayName).Value, contentTypeDefinition.Name));
+                        creatableList.Add(new SelectListItem(contentTypeDefinition.DisplayName, contentTypeDefinition.Name));
                     }
                 }
 
@@ -157,7 +157,7 @@ public class AdminController : Controller
 
                         if (await _authorizationService.AuthorizeAsync(context.User, CommonPermissions.EditContent, contentItem))
                         {
-                            creatableList.Add(new SelectListItem(new LocalizedString(contentTypeDefinition.DisplayName, contentTypeDefinition.DisplayName).Value, contentTypeDefinition.Name));
+                            creatableList.Add(new SelectListItem(contentTypeDefinition.DisplayName, contentTypeDefinition.Name));
                         }
                     }
                 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Create.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Create.cshtml
index bc4fcaead68..60d33d9818a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Create.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Create.cshtml
@@ -10,7 +10,7 @@
     var typeDisplayName = contentTypeDefinition?.DisplayName ?? contentItem.ContentType.CamelFriendly();
 }
 
-<zone Name="Title"><h1>@RenderTitleSegments(T["New {0}", Html.Raw(typeDisplayName)])</h1></zone>
+<zone Name="Title"><h1>@RenderTitleSegments(T["New {0}", typeDisplayName])</h1></zone>
 
 <form asp-action="Create" asp-route-returnUrl="@Context.Request.Query["ReturnUrl"]" method="post" enctype="multipart/form-data" class="no-multisubmit">
     @Html.ValidationSummary()
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Edit.cshtml
index 3f5d9b3505b..2d996fee555 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Admin/Edit.cshtml
@@ -10,7 +10,7 @@
     var typeDisplayName = contentTypeDefinition?.DisplayName ?? contentItem.ContentType.CamelFriendly();
 }
 
-<zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Html.Raw(typeDisplayName)])</h1></zone>
+<zone Name="Title"><h1>@RenderTitleSegments(T["Edit {0}", typeDisplayName])</h1></zone>
 
 <form asp-action="Edit" asp-route-contentitemid="@contentItem.ContentItemId" asp-route-returnUrl="@Context.Request.Query["ReturnUrl"]" method="post" enctype="multipart/form-data" class="no-multisubmit">
     @Html.ValidationSummary()
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminListCreate.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminListCreate.cshtml
index 362a76f3309..129d56e8f77 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminListCreate.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminListCreate.cshtml
@@ -16,7 +16,7 @@
                     <div class="dropdown-menu dropdown-menu-right scrollable" aria-labelledby="bulk-action-menu-button">
                         @foreach (var item in Model.CreatableTypes)
                         {
-                            <a class="dropdown-item" href="@Url.RouteUrl(new { area = "OrchardCore.Contents", controller = "Admin", action = "Create", id = @item.Value, returnUrl = FullRequestPath })">@T[item.Text]</a>
+                            <a class="dropdown-item" href="@Url.RouteUrl(new { area = "OrchardCore.Contents", controller = "Admin", action = "Create", id = @item.Value, returnUrl = FullRequestPath })">@T[Html.Encode(item.Text)]</a>
                         }
                     </div>
                 </div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Download/Display.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Download/Display.cshtml
index 4e815322721..38bb289ad8f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Download/Display.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Download/Display.cshtml
@@ -13,7 +13,7 @@
 <script asp-name="codemirror-addon-display-autorefresh" at="Foot"></script>
 <script asp-name="codemirror-mode-javascript" at="Foot"></script>
 
-<zone Name="Title"><h1>@RenderTitleSegments(T["View As JSON {0}", Html.Raw(typeDisplayName)])</h1></zone>
+<zone Name="Title"><h1>@RenderTitleSegments(T["View As JSON {0}", typeDisplayName])</h1></zone>
 
 <form asp-action="Download" asp-route-contentItemId="@contentItem.ContentItemId" method="post" enctype="multipart/form-data" class="no-multisubmit">
     <div class="form-group">
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Admin/Hello.cshtml b/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Admin/Hello.cshtml
index 25359825092..0012ac4acd3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Admin/Hello.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Admin/Hello.cshtml
@@ -29,7 +29,7 @@
     Being an Admin Page my default path based route is automatically prefixed with the current 'AdminOptions.AdminUrlPrefix'.
 </p>
 <p>
-    @T[Model.Message]
+    @Model.Message
 </p>
 <p>
     Date using the DateTimeShape: @await DisplayAsync(await New.DateTime(Utc: null, Format: T["MMMM dd, yyyy"].Value))
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Hello.cshtml b/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Hello.cshtml
index 470c894cb99..3ae09239b32 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Hello.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Pages/Hello.cshtml
@@ -22,7 +22,7 @@
 <h2>Hello from @ViewContext.RouteData.Values["page"]</h2>
 
 <p>
-    @T[Model.Message]
+    @Model.Message
 </p>
 <p>
     Date using the DateTimeShape: @await DisplayAsync(await New.DateTime(Utc: null, Format: T["MMMM dd, yyyy"].Value))
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Pages/OutsideAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Demo/Pages/OutsideAdmin.cshtml
index 15af3315e96..cb7b762fdfe 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Pages/OutsideAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Pages/OutsideAdmin.cshtml
@@ -31,7 +31,7 @@
     Being an Admin Page my default path based route is automatically prefixed with the current 'AdminOptions.AdminUrlPrefix'.
 </p>
 <p>
-    @T[Model.Message]
+    @Model.Message
 </p>
 <p>
     Date using the DateTimeShape: @await DisplayAsync(await New.DateTime(Utc: null, Format: T["MMMM dd, yyyy"].Value))
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowMetadata.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowMetadata.Edit.cshtml
index 322a72fb887..338d8a1c181 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowMetadata.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowMetadata.Edit.cshtml
@@ -23,7 +23,7 @@
 
 <div class="btn-group btn-group-sm" role="group">
     <button type="button" class="btn btn-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        @T[Model.Size + "%"]
+        @T[Html.Encode(Model.Size + "%")] @* Allows for custom string reprentations like half, quarter, ...*@
     </button>
     <div class="dropdown-menu btn-group-toggle" data-toggle="buttons">
         <label class="btn btn-secondary dropdown-item @(Model.Size == 25 ? "active" : null)">
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Views/Admin/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Layers/Views/Admin/Index.cshtml
index 65564eab417..275ed07d817 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Views/Admin/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Views/Admin/Index.cshtml
@@ -51,7 +51,7 @@
                                     <ul class="list-group zones">
                                         @foreach (var contentItemSummary in Model.Widgets[zone])
                                         {
-                                            await contentItemSummary.Tags.AddAsync(Html.Raw("<span class=\"badge ta-badge font-weight-normal\"><i class=\"fa fa-bookmark-o text-info\" aria-hidden=\"true\"></i> " + contentItemSummary.ContentItem.Content.LayerMetadata.Layer + "</span>"));
+                                            await contentItemSummary.Tags.AddAsync(Html.Raw("<span class=\"badge ta-badge font-weight-normal\"><i class=\"fa fa-bookmark-o text-info\" aria-hidden=\"true\"></i> " + Html.Encode(contentItemSummary.ContentItem.Content.LayerMetadata.Layer) + "</span>"));
                                             maxPosition = Math.Max(maxPosition, (double)contentItemSummary.ContentItem.Content.LayerMetadata.Position);
 
                                             <text>
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Views/RegistrationSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Users/Views/RegistrationSettings.Edit.cshtml
index 0f191f441b8..1ddabab665d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Views/RegistrationSettings.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Users/Views/RegistrationSettings.Edit.cshtml
@@ -14,7 +14,16 @@
     <select asp-for="UsersCanRegister" class="form-control">
         @foreach (UserRegistrationType option in Enum.GetValues(typeof(UserRegistrationType)))
         {
-            <option value="@option" selected="@(Model.UsersCanRegister == option)">@T[option.ToString()]</option>
+            <option value="@option" selected="@(Model.UsersCanRegister == option)">
+                @{
+                    switch (option)
+                    {
+                        case UserRegistrationType.NoRegistration: @T["NoRegistration"]; break;
+                        case UserRegistrationType.AllowRegistration: @T["AllowRegistration"]; break;
+                        case UserRegistrationType.AllowOnlyExternalUsers: @T["AllowOnlyExternalUsers"]; break;
+                    }
+                }
+            </option>
         }
     </select>
     <span asp-validation-for="UsersCanRegister"></span>
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Content.UserTaskButton.cshtml b/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Content.UserTaskButton.cshtml
index 7b7c340cb3e..0b7abd43bf8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Content.UserTaskButton.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/Views/Content.UserTaskButton.cshtml
@@ -8,12 +8,12 @@
     @foreach (var action in actions)
     {
         <div class="btn-group" role="group">
-            <button class="btn btn-warning" type="submit" name="submit.Save" value="user-task.@action">@T[action] @T["and Save"]</button>
+            <button class="btn btn-warning" type="submit" name="submit.Save" value="user-task.@action">@T[Html.Encode(action)] @T["and Save"]</button>
             <button type="button" class="btn btn-warning dropdown-toggle dropdown-toggle-split" data-reference="parent" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <span class="sr-only">@T["Toggle Dropdown"]</span>
             </button>
             <div class="dropdown-menu" aria-labelledby="userActionsButtonGroup">
-                <button type="submit" name="submit.Publish" class="dropdown-item" value="user-task.@action">@T[action] @T["and Publish"]</button>
+                <button type="submit" name="submit.Publish" class="dropdown-item" value="user-task.@action">@T[Html.Encode(action)] @T["and Publish"]</button>
             </div>
         </div>
     }
@@ -27,8 +27,8 @@ else
         <div class="dropdown-menu" aria-labelledby="userActionsButtonGroup">
             @foreach (var action in actions)
             {
-                <button type="submit" name="submit.Save" class="dropdown-item" value="user-task.@action">@T[action] @T["and Save"]</button>
-                <button type="submit" name="submit.Publish" class="dropdown-item" value="user-task.@action">@T[action] @T["and Publish"]</button>
+                <button type="submit" name="submit.Save" class="dropdown-item" value="user-task.@action">@T[Html.Encode(action)] @T["and Save"]</button>
+                <button type="submit" name="submit.Publish" class="dropdown-item" value="user-task.@action">@T[Html.Encode(action)] @T["and Publish"]</button>
             }
         </div>
     </div>