diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContentTabless.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContentTabless.php
index f0e9871c4..5290dfcd7 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContentTabless.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContentTabless.php
@@ -13,6 +13,7 @@
                 <div class="title">
                     <? $title = processTitle($page['Title']); ?>
                     <?= tab_title($title, $page['root'], _var($page, 'Tag', false)) ?>
+                    <span class="right inline-flex flex-row items-center gap-1"></span>
                 </div>
             <? endif; ?>
 
diff --git a/emhttp/plugins/dynamix/include/PageBuilder.php b/emhttp/plugins/dynamix/include/PageBuilder.php
index 8218e4578..2f2a82ac6 100644
--- a/emhttp/plugins/dynamix/include/PageBuilder.php
+++ b/emhttp/plugins/dynamix/include/PageBuilder.php
@@ -82,18 +82,19 @@ function tab_title($title,$path,$tag) {
     $title = str_replace($device,_(my_disk($device),3),$title);
   }
   $title = _(parse_text($title));
+  $wrapperClasses = 'left inline-flex flex-row items-center gap-1';
   if (!$tag || substr($tag,-4)=='.png') {
     $file = "$path/icons/".($tag ?: strtolower(str_replace(' ','',$title)).".png");
     if (file_exists("$docroot/$file")) {
-      return "<img src='/$file' class='icon' style='max-width: 18px; max-height: 18px; width: auto; height: auto; object-fit: contain;'>$title";
+      return "<span class='$wrapperClasses'><img src='/$file' class='icon' style='max-width: 18px; max-height: 18px; width: auto; height: auto; object-fit: contain;'>$title</span>";
     } else {
-      return "<i class='fa fa-th title'></i>$title";
+      return "<span class='$wrapperClasses'><i class='fa fa-th title'></i>$title</span>";
     }
   } elseif (substr($tag,0,5)=='icon-') {
-    return "<i class='$tag title'></i>$title";
+    return "<span class='$wrapperClasses'><i class='$tag title'></i>$title</span>";
   } else {
     if (substr($tag,0,3)!='fa-') $tag = "fa-$tag";
-    return "<i class='fa $tag title'></i>$title";
+    return "<span class='$wrapperClasses'><i class='fa $tag title'></i>$title</span>";
   }
 }