diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Drivers/ThemeEntryDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Themes/Drivers/ThemeEntryDisplayDriver.cs
index a8ba0321bf6..e7e4b44e6a9 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Drivers/ThemeEntryDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Drivers/ThemeEntryDisplayDriver.cs
@@ -15,11 +15,11 @@ public override IDisplayResult Display(ThemeEntry model)
             View("ThemeEntry_SummaryAdmin__Title", model).Location("SummaryAdmin", "Header:5"),
             View("ThemeEntry_SummaryAdmin__Descriptions", model).Location("SummaryAdmin", "Content:5"),
             View("ThemeEntry_SummaryAdmin__Attributes", model).Location("SummaryAdmin", "Tags:5"),
-         };
+        };
 
         if (model.IsCurrent)
         {
-            results.Add(View("ThemeEntry_SummaryAdmin__Current", model).Location("SummaryAdmin", "FooterBelow:5"));
+            results.Add(View("ThemeEntry_SummaryAdmin__Current", model).Location("SummaryAdmin", "FooterStart:5"));
         }
         else
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Views/Items/ThemeEntry-Descriptions.SummaryAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Themes/Views/Items/ThemeEntry-Descriptions.SummaryAdmin.cshtml
index 04d7bfaa8aa..eacd1865ac2 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Views/Items/ThemeEntry-Descriptions.SummaryAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Views/Items/ThemeEntry-Descriptions.SummaryAdmin.cshtml
@@ -3,6 +3,11 @@
 
 @model ShapeViewModel<ThemeEntry>
 
-<span class="theme-entry-description">
+@if (string.IsNullOrEmpty(Model.Value.Extension.Manifest.Description))
+{
+    return;
+}
+
+<p class="text-muted mb-2">
     @Model.Value.Extension.Manifest.Description
-</span>
+</p>
diff --git a/src/OrchardCore.Modules/OrchardCore.Themes/Views/ThemeEntry.SummaryAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Themes/Views/ThemeEntry.SummaryAdmin.cshtml
index 393ec3f68e3..ef68fb3cfc3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Themes/Views/ThemeEntry.SummaryAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Themes/Views/ThemeEntry.SummaryAdmin.cshtml
@@ -14,19 +14,17 @@
 
         @if (Model.Content != null || Model.Attributes != null)
         {
-            <p class="card-text">
-                @if (Model.Content != null)
-                {
-                    @await DisplayAsync(Model.Content)
-                }
+            @if (Model.Content != null)
+            {
+                @await DisplayAsync(Model.Content)
+            }
 
-                @if (Model.Tags != null)
-                {
-                    <ul class="list-group list-group-flush">
-                        @await DisplayAsync(Model.Tags)
-                    </ul>
-                }
-            </p>
+            @if (Model.Tags != null)
+            {
+                <ul class="list-group list-group-flush">
+                    @await DisplayAsync(Model.Tags)
+                </ul>
+            }
         }
 
     </div>
@@ -39,13 +37,13 @@
             {
                 <div class="d-flex justify-content-between">
 
-                    <div>
+                    <div class="d-inline-flex">
                         @if (Model.FooterStart != null)
                         {
                             @await DisplayAsync(Model.FooterStart)
                         }
                     </div>
-                    <div>
+                    <div class="d-inline-flex">
                         @if (Model.FooterEnd != null)
                         {
                             @await DisplayAsync(Model.FooterEnd)