diff --git a/resource/static/theme-default/css/main.css b/resource/static/theme-default/css/main.css
index b181c81db6..c3c0c629e7 100644
--- a/resource/static/theme-default/css/main.css
+++ b/resource/static/theme-default/css/main.css
@@ -86,24 +86,33 @@ td {
   margin-right: 0;
 }
 
+.ui.grid {
+  margin-bottom:-0.5em
+}
+
+.ui.card>.content>.header:not(.ui), .ui.cards>.card>.content>.header:not(.ui){
+  line-height: 1em;
+}
+
 .status.cards .wide.column {
   padding-top: 0 !important;
   padding-bottom: 0 !important;
-  height:2.7rem !important;
+  height:2.3rem !important;
 }
 
 .status.cards .wide.column:nth-child(1) {
-  margin-top:1.5rem !important;
+  margin-top:1.2rem !important;
 }
 
 .status.cards .wide.column:nth-child(2) {
-  margin-top:1.5rem !important;
+  margin-top:1.2rem !important;
 }
 
 .status.cards .three.wide.column {
   text-align: center;
   width: 22%!important;
 }
+
 .status.cards .thirteen.wide.column{
   width: 78%!important;
   padding-left:0;
@@ -129,7 +138,7 @@ td {
 .closePopup{
   color:rgb(10, 148, 242) !important;
   position: absolute;
-  top: 10px;
+  top: 7px;
   right: 10px;
   cursor: pointer;
   z-index: 9999;
@@ -199,6 +208,7 @@ td {
 }
 
 .nezha-secondary-font {
+  height: 1em;
   color: rgb(10, 148, 242) !important;
 }
 
diff --git a/resource/static/theme-default/js/mixin.js b/resource/static/theme-default/js/mixin.js
index 509b75babf..54646c2438 100644
--- a/resource/static/theme-default/js/mixin.js
+++ b/resource/static/theme-default/js/mixin.js
@@ -1,4 +1,5 @@
 const mixinsVue = {
+    delimiters: ['@#', '#@'],
     data: {
         preferredTemplate: null,
         isMobile: false
@@ -52,4 +53,4 @@ const mixinsVue = {
             });
         }
     }
-}
+}
\ No newline at end of file
diff --git a/resource/template/theme-default/home.html b/resource/template/theme-default/home.html
index ade8fbbd3c..91a09a0768 100644
--- a/resource/template/theme-default/home.html
+++ b/resource/template/theme-default/home.html
@@ -19,7 +19,7 @@
                     class="apple icon"></i><i v-else-if='isWindowsPlatform(server.Host.Platform)'
                     class="windows icon"></i><i v-else :class="'fl-' + getFontLogoClass(server.Host.Platform)"></i>
                   @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@
-                  <i @click="togglePopup($event, server.ID)" aria-expanded="false" class="nezha-secondary-font info circle icon" style="height: 28px"></i>                 
+                  <i @click="togglePopup($event, server.ID)" aria-expanded="false" class="nezha-secondary-font info circle icon"></i>                 
                   <div class="ui content popup" :class="{ 'visible': isActive(server.ID) }" style="margin-bottom: 0;">
                     <i class="closePopup window close icon" @click="closePopup(server.ID)"></i>
                     {{tr "Platform"}}: @#server.Host.Platform#@-@#server.Host.PlatformVersion#@