diff --git a/administrator/components/com_cache/tmpl/cache/default.php b/administrator/components/com_cache/tmpl/cache/default.php
index e107886cc6042..f3b5e3f4049ed 100644
--- a/administrator/components/com_cache/tmpl/cache/default.php
+++ b/administrator/components/com_cache/tmpl/cache/default.php
@@ -80,7 +80,7 @@
                                         <?php echo $item->count; ?>
                                     </td>
                                     <td class="text-end d-none d-md-table-cell">
-                                        <?php echo '&#x200E;' . HTMLHelper::_('number.bytes', $item->size); ?>
+                                        <bdi><?php echo HTMLHelper::_('number.bytes', $item->size); ?></bdi>
                                     </td>
                                 </tr>
                                 <?php $i++; ?>
diff --git a/administrator/components/com_installer/tmpl/database/default.php b/administrator/components/com_installer/tmpl/database/default.php
index 1755222e8b116..ee82a7ce43355 100644
--- a/administrator/components/com_installer/tmpl/database/default.php
+++ b/administrator/components/com_installer/tmpl/database/default.php
@@ -109,7 +109,7 @@
                                             <?php echo $extension->version_id; ?>
                                         </td>
                                         <td class="d-none d-lg-table-cell text-end">
-                                            <?php echo '&#x200E;' . $extension->version; ?>
+                                            <bdi><?php echo $extension->version; ?></bdi>
                                         </td>
                                         <td class="d-none d-lg-table-cell">
                                             <?php echo $extension->folder_translated; ?>
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_file_body.php b/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
index 54fa40b943e76..88eed0b7596d0 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_file_body.php
@@ -84,7 +84,7 @@
                     </div>
                     <?php $cMax    = $this->state->get('params')->get('upload_limit'); ?>
                     <?php $maxSize = HTMLHelper::_('number.bytes', Utility::getMaxUploadSize($cMax . 'MB')); ?>
-                    <span class="mt-2"><?php echo Text::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', '&#x200E;' . $maxSize); ?></span>
+                    <span class="mt-2"><?php echo Text::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', '<bdi>' . $maxSize . '</bdi>'); ?></span>
                 </form>
                 <?php if ($this->type != 'home') : ?>
                     <hr class="mb-4">
diff --git a/administrator/modules/mod_version/src/Helper/VersionHelper.php b/administrator/modules/mod_version/src/Helper/VersionHelper.php
index d8194bd50f026..d56aa44549b4d 100644
--- a/administrator/modules/mod_version/src/Helper/VersionHelper.php
+++ b/administrator/modules/mod_version/src/Helper/VersionHelper.php
@@ -34,7 +34,7 @@ public function getVersionString()
     {
         $version = new Version();
 
-        return '&#x200E;' . $version->getShortVersion();
+        return '<bdi>' . $version->getShortVersion() . '</bdi>';
     }
 
     /**
diff --git a/plugins/installer/packageinstaller/tmpl/default.php b/plugins/installer/packageinstaller/tmpl/default.php
index a6f351af64180..21a523a3cfd38 100644
--- a/plugins/installer/packageinstaller/tmpl/default.php
+++ b/plugins/installer/packageinstaller/tmpl/default.php
@@ -82,7 +82,7 @@
                     </button>
                 </p>
                 <p id="install-package-upload-limit-global">
-                    <?php echo Text::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', '&#x200E;' . $maxSize); ?>
+                    <?php echo Text::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', '<bdi>' . $maxSize . '</bdi>'); ?>
                 </p>
             </div>
         </div>