diff --git a/app.php b/app.php
index a61a8c3..cd1cb60 100644
--- a/app.php
+++ b/app.php
@@ -86,6 +86,7 @@ $f3->route('GET /signature/@hash',
             $f3->error(404);
         }
 
+        $f3->set('activeTab', 'sign');
         echo View::instance()->render('signature.html.php');
     }
 );
@@ -238,6 +239,7 @@ $f3->route('POST /share',
 
 $f3->route('GET /signature/@hash/pdf',
     function($f3) {
+        $f3->set('activeTab', 'sign');
         $hash = Web::instance()->slug($f3->get('PARAMS.hash'));
         $sharingFolder = $f3->get('PDF_STORAGE_PATH').$hash;
         $files = scandir($sharingFolder);
@@ -312,6 +314,7 @@ $f3->route('POST /signature/@hash/save',
 
 $f3->route('GET /signature/@hash/nblayers',
     function($f3) {
+        $f3->set('activeTab', 'sign');
         $hash = Web::instance()->slug($f3->get('PARAMS.hash'));
         $files = scandir($f3->get('PDF_STORAGE_PATH').$hash);
         $nbLayers = 0;
diff --git a/locale/application.pot b/locale/application.pot
index 71b4b0f..22f9415 100644
--- a/locale/application.pot
+++ b/locale/application.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-22 17:24+0200\n"
+"POT-Creation-Date: 2023-09-22 17:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -515,8 +515,7 @@ msgid "Your signature has been successfully recorded!"
 msgstr ""
 
 #: templates/components/navtab.html.php:4
-#, php-format
-msgid "%s Language"
+msgid "Language"
 msgstr ""
 
 #: templates/components/navtab.html.php:15
diff --git a/locale/ar/LC_MESSAGES/application.po b/locale/ar/LC_MESSAGES/application.po
index 837b817..1914764 100644
--- a/locale/ar/LC_MESSAGES/application.po
+++ b/locale/ar/LC_MESSAGES/application.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-22 17:16+0200\n"
+"POT-Creation-Date: 2023-09-22 17:42+0200\n"
 "PO-Revision-Date: 2023-09-20 16:01+0000\n"
 "Last-Translator: ButterflyOfFire <boffire@users.noreply.hosted.weblate.org>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/signature-pdf/"
@@ -520,21 +520,20 @@ msgid "Your signature has been successfully recorded!"
 msgstr "تم تسجيل توقيعك بنجاح!"
 
 #: templates/components/navtab.html.php:4
-#, php-format
-msgid "%s Language"
-msgstr ""
+msgid "Language"
+msgstr "اللغة"
 
 #: templates/components/navtab.html.php:15
 msgid "Sign"
-msgstr ""
+msgstr "وقِّع"
 
 #: templates/components/navtab.html.php:18
 msgid "Organize"
-msgstr ""
+msgstr "نظِّم"
 
 #: templates/components/navtab.html.php:21
 msgid "Metadata"
-msgstr ""
+msgstr "البيانات الوصفية"
 
 #: templates/components/navtab.html.php:24
 msgid "Compress"
@@ -554,6 +553,3 @@ msgstr ""
 
 #~ msgid "page selected"
 #~ msgstr "صفحة محددة"
-
-#~ msgid "Language"
-#~ msgstr "اللغة"
diff --git a/locale/fr/LC_MESSAGES/application.po b/locale/fr/LC_MESSAGES/application.po
index b1e9d9b..40797d8 100644
--- a/locale/fr/LC_MESSAGES/application.po
+++ b/locale/fr/LC_MESSAGES/application.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-22 17:16+0200\n"
+"POT-Creation-Date: 2023-09-22 17:42+0200\n"
 "PO-Revision-Date: 2023-09-07 13:19+0000\n"
 "Last-Translator: 24ème <equipe@24eme.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/signature-pdf/"
@@ -527,9 +527,8 @@ msgid "Your signature has been successfully recorded!"
 msgstr "Votre signature a bien été prise en compte !"
 
 #: templates/components/navtab.html.php:4
-#, php-format
-msgid "%s Language"
-msgstr "%s Langue"
+msgid "Language"
+msgstr "Langue"
 
 #: templates/components/navtab.html.php:15
 msgid "Sign"
@@ -547,6 +546,10 @@ msgstr "Métadonnées"
 msgid "Compress"
 msgstr "Compresser"
 
+#, php-format
+#~ msgid "%s Language"
+#~ msgstr "%s Langue"
+
 #, php-format
 #~ msgid "%s Sign"
 #~ msgstr "%s Signer"
@@ -559,9 +562,6 @@ msgstr "Compresser"
 #~ msgid "%s Metadata"
 #~ msgstr "%s Metadonnées"
 
-#~ msgid "Language"
-#~ msgstr "Langue"
-
 #, php-format
 #~ msgid "%s page selected"
 #~ msgid_plural "%s pages selected"
diff --git a/templates/components/navtab.html.php b/templates/components/navtab.html.php
index 3f241b7..c55dc80 100644
--- a/templates/components/navtab.html.php
+++ b/templates/components/navtab.html.php
@@ -1,7 +1,7 @@
 <?php if(!$disableOrganization): ?>
     <div class="dropdown position-absolute top-0 end-0 mt-2 me-2">
         <button class="btn btn-outline-secondary btn-sm  dropdown-toggle" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
-            <span class="d-none d-md-inline"><?php echo sprintf(_("%s Language"), "<i class='bi bi-translate'></i>"); ?></span>
+            <span class="d-none d-md-inline"><i class='bi bi-translate'></i> <?php echo _("Language"); ?></span>
             <span class="d-md-none"><i class="bi bi-translate"></i></span>
         </button>
         <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
diff --git a/templates/compress.html.php b/templates/compress.html.php
index 0dcba15..631c3b0 100644
--- a/templates/compress.html.php
+++ b/templates/compress.html.php
@@ -5,7 +5,11 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <link href="<?php echo $REVERSE_PROXY_URL; ?>/vendor/bootstrap.min.css?5.1.1" rel="stylesheet">
+    <?php if ($TRANSLATION_LANGUAGE == 'ar'): ?>
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.rtl.min.css" integrity="sha384-+qdLaIRZfNu4cVPK/PxJJEy0B0f3Ugv8i482AKY7gwXwhaCroABd086ybrVKTa0q" crossorigin="anonymous">
+    <?php else: ?>
+        <link href="<?php echo $REVERSE_PROXY_URL; ?>/vendor/bootstrap.min.css?5.1.1" rel="stylesheet">
+    <?php endif ?>
     <link href="<?php echo $REVERSE_PROXY_URL; ?>/vendor/bootstrap-icons.css?1.5.0" rel="stylesheet">
     <link href="<?php echo $REVERSE_PROXY_URL; ?>/css/app.css?<?php echo ($COMMIT) ? $COMMIT : filemtime($ROOT."/public/css/app.css") ?>" rel="stylesheet">
     <link rel="icon" type="image/x-icon" href="<?php echo $REVERSE_PROXY_URL; ?>/favicon-metadata.ico">
@@ -30,7 +34,7 @@
                     <input name="input_pdf_upload" id="input_pdf_upload" placeholder="<?php echo _("Choose a PDF"); ?>" class="form-control form-control-lg" type="file" accept=".pdf,application/pdf" onchange="handleFileChange()" />
                     <p class="mt-2 small fw-light text-dark"><?php echo _("The PDF will be processed by the server without being stored or saved") ?></p>
                     <div class="btn-group">
-                        <button type="submit" name="compressionType" value="medium" id="compressBtn" class="btn btn-primary" disabled><?php echo sprintf(_("%s Compress"), '<i class="bi bi-download"></i>'); ?></button>
+                        <button type="submit" name="compressionType" value="medium" id="compressBtn" class="btn btn-primary" disabled><i class="bi bi-download"></i> <?php echo _("Compress"); ?></button>
                         <button type="button" id="dropdownMenuReference" class="btn btn-outline-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false" data-bs-reference="parent" disabled>
                             <span class="visually-hidden">Toggle Dropdown</span>
                         </button>
diff --git a/templates/metadata.html.php b/templates/metadata.html.php
index d0a41f6..4071235 100644
--- a/templates/metadata.html.php
+++ b/templates/metadata.html.php
@@ -5,7 +5,11 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <link href="<?php echo $REVERSE_PROXY_URL; ?>/vendor/bootstrap.min.css?5.1.1" rel="stylesheet">
+    <?php if ($TRANSLATION_LANGUAGE == 'ar'): ?>
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.rtl.min.css" integrity="sha384-+qdLaIRZfNu4cVPK/PxJJEy0B0f3Ugv8i482AKY7gwXwhaCroABd086ybrVKTa0q" crossorigin="anonymous">
+    <?php else: ?>
+        <link href="<?php echo $REVERSE_PROXY_URL; ?>/vendor/bootstrap.min.css?5.1.1" rel="stylesheet">
+    <?php endif ?>
     <link href="<?php echo $REVERSE_PROXY_URL; ?>/vendor/bootstrap-icons.css?1.5.0" rel="stylesheet">
     <link href="<?php echo $REVERSE_PROXY_URL; ?>/css/app.css?<?php echo ($COMMIT) ? $COMMIT : filemtime($ROOT."/public/css/app.css") ?>" rel="stylesheet">
     <link rel="icon" type="image/x-icon" href="<?php echo $REVERSE_PROXY_URL; ?>/favicon-metadata.ico">
diff --git a/templates/organization.html.php b/templates/organization.html.php
index ebfc46c..da7015f 100644
--- a/templates/organization.html.php
+++ b/templates/organization.html.php
@@ -5,7 +5,11 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <link href="<?php echo $REVERSE_PROXY_URL; ?>/vendor/bootstrap.min.css?5.1.1" rel="stylesheet">
+      <?php if ($TRANSLATION_LANGUAGE == 'ar'): ?>
+          <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.rtl.min.css" integrity="sha384-+qdLaIRZfNu4cVPK/PxJJEy0B0f3Ugv8i482AKY7gwXwhaCroABd086ybrVKTa0q" crossorigin="anonymous">
+      <?php else: ?>
+          <link href="<?php echo $REVERSE_PROXY_URL; ?>/vendor/bootstrap.min.css?5.1.1" rel="stylesheet">
+      <?php endif ?>
     <link href="<?php echo $REVERSE_PROXY_URL; ?>/vendor/bootstrap-icons.css?1.5.0" rel="stylesheet">
     <link href="<?php echo $REVERSE_PROXY_URL; ?>/css/app.css?<?php echo ($COMMIT) ? $COMMIT : filemtime($ROOT."/public/css/app.css") ?>" rel="stylesheet">
     <link rel="icon" type="image/x-icon" href="<?php echo $REVERSE_PROXY_URL; ?>/favicon-organization.ico">
diff --git a/templates/signature.html.php b/templates/signature.html.php
index e1ad9ac..5ea5f7a 100644
--- a/templates/signature.html.php
+++ b/templates/signature.html.php
@@ -5,7 +5,11 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="Logiciel libre de signature de PDF en ligne">
-    <link href="<?php echo $REVERSE_PROXY_URL; ?>/vendor/bootstrap.min.css?5.1.1" rel="stylesheet">
+      <?php if ($TRANSLATION_LANGUAGE == 'ar'): ?>
+          <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.rtl.min.css" integrity="sha384-+qdLaIRZfNu4cVPK/PxJJEy0B0f3Ugv8i482AKY7gwXwhaCroABd086ybrVKTa0q" crossorigin="anonymous">
+      <?php else: ?>
+          <link href="<?php echo $REVERSE_PROXY_URL; ?>/vendor/bootstrap.min.css?5.1.1" rel="stylesheet">
+      <?php endif ?>
     <link href="<?php echo $REVERSE_PROXY_URL; ?>/vendor/bootstrap-icons.css?1.8.1" rel="stylesheet">
     <link href="<?php echo $REVERSE_PROXY_URL; ?>/css/app.css?<?php echo ($COMMIT) ? $COMMIT : filemtime($ROOT."/public/css/app.css") ?>" rel="stylesheet">
     <title>Signature PDF</title>