diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties
index a55500e8..175ee607 100644
--- a/src/main/resources/messages_ar_AR.properties
+++ b/src/main/resources/messages_ar_AR.properties
@@ -102,7 +102,9 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=الوضع الداكن
+navbar.language=Languages
 navbar.settings=إعدادات
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_bg_BG.properties b/src/main/resources/messages_bg_BG.properties
index eb1ce4f7..60fb5220 100644
--- a/src/main/resources/messages_bg_BG.properties
+++ b/src/main/resources/messages_bg_BG.properties
@@ -104,7 +104,9 @@ pipelineOptions.validateButton=Валидирай
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Тъмна тема
+navbar.language=Languages
 navbar.settings=Настройки
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_ca_CA.properties b/src/main/resources/messages_ca_CA.properties
index 8c8f7fe7..9c4451a0 100644
--- a/src/main/resources/messages_ca_CA.properties
+++ b/src/main/resources/messages_ca_CA.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Mode Fosc
+navbar.language=Languages
 navbar.settings=Opcions
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties
index 40ea6566..19a82fce 100644
--- a/src/main/resources/messages_de_DE.properties
+++ b/src/main/resources/messages_de_DE.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Validieren
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Dunkler Modus
+navbar.language=Languages
 navbar.settings=Einstellungen
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_el_GR.properties b/src/main/resources/messages_el_GR.properties
index 07a97061..b093516f 100644
--- a/src/main/resources/messages_el_GR.properties
+++ b/src/main/resources/messages_el_GR.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Επικυρώνω
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Μαύρο Θέμα
+navbar.language=Languages
 navbar.settings=Ρυθμίσεις
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties
index 334334be..aa0c4d69 100644
--- a/src/main/resources/messages_en_GB.properties
+++ b/src/main/resources/messages_en_GB.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Dark Mode
+navbar.language=Languages
 navbar.settings=Settings
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties
index eeaa0402..66c2b4bd 100644
--- a/src/main/resources/messages_en_US.properties
+++ b/src/main/resources/messages_en_US.properties
@@ -102,7 +102,9 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Dark Mode
+navbar.language=Languages
 navbar.settings=Settings
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties
index 2e29cec2..4cb6360a 100644
--- a/src/main/resources/messages_es_ES.properties
+++ b/src/main/resources/messages_es_ES.properties
@@ -106,7 +106,9 @@ pipelineOptions.validateButton=Validar
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Modo oscuro
+navbar.language=Languages
 navbar.settings=Configuración
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_eu_ES.properties b/src/main/resources/messages_eu_ES.properties
index 01c1cd09..285d41c5 100644
--- a/src/main/resources/messages_eu_ES.properties
+++ b/src/main/resources/messages_eu_ES.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Modu iluna
+navbar.language=Languages
 navbar.settings=Ezarpenak
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties
index daffd86e..e3abadef 100644
--- a/src/main/resources/messages_fr_FR.properties
+++ b/src/main/resources/messages_fr_FR.properties
@@ -102,7 +102,9 @@ pipelineOptions.validateButton=Valider
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Mode sombre
+navbar.language=Languages
 navbar.settings=Paramètres
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_hi_IN.properties b/src/main/resources/messages_hi_IN.properties
index 371d3b9a..f91d4900 100644
--- a/src/main/resources/messages_hi_IN.properties
+++ b/src/main/resources/messages_hi_IN.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=डार्क मोड
+navbar.language=Languages
 navbar.settings=सेटिंग्स
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_hu_HU.properties b/src/main/resources/messages_hu_HU.properties
index 5a4210ad..e05a1598 100644
--- a/src/main/resources/messages_hu_HU.properties
+++ b/src/main/resources/messages_hu_HU.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Sötét mód
+navbar.language=Languages
 navbar.settings=Beállítások
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_id_ID.properties b/src/main/resources/messages_id_ID.properties
index 1f04e41b..9a8d04f6 100644
--- a/src/main/resources/messages_id_ID.properties
+++ b/src/main/resources/messages_id_ID.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Mode Gelap
+navbar.language=Languages
 navbar.settings=Pengaturan
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties
index 44dc3c28..775e70b7 100644
--- a/src/main/resources/messages_it_IT.properties
+++ b/src/main/resources/messages_it_IT.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Convalidare
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Modalità Scura
+navbar.language=Languages
 navbar.settings=Impostazioni
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties
index 689b2aba..7c210c59 100644
--- a/src/main/resources/messages_ja_JP.properties
+++ b/src/main/resources/messages_ja_JP.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=検証
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=ダークモード
+navbar.language=Languages
 navbar.settings=設定
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_ko_KR.properties b/src/main/resources/messages_ko_KR.properties
index 1819b9cc..ddc77b39 100644
--- a/src/main/resources/messages_ko_KR.properties
+++ b/src/main/resources/messages_ko_KR.properties
@@ -104,7 +104,9 @@ pipelineOptions.validateButton=확인
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=다크 모드
+navbar.language=Languages
 navbar.settings=설정
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_nl_NL.properties b/src/main/resources/messages_nl_NL.properties
index 68e614cf..d4cbbcf0 100644
--- a/src/main/resources/messages_nl_NL.properties
+++ b/src/main/resources/messages_nl_NL.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Valideren
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Donkere modus
+navbar.language=Languages
 navbar.settings=Instellingen
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties
index 5b53353b..50c22dd7 100644
--- a/src/main/resources/messages_pl_PL.properties
+++ b/src/main/resources/messages_pl_PL.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Tryb nocny
+navbar.language=Languages
 navbar.settings=Ustawienia
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties
index 427d54fd..7a029978 100644
--- a/src/main/resources/messages_pt_BR.properties
+++ b/src/main/resources/messages_pt_BR.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Modo Escuro
+navbar.language=Languages
 navbar.settings=Configurações
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_pt_PT.properties b/src/main/resources/messages_pt_PT.properties
index 3bc96d23..f814f1a7 100644
--- a/src/main/resources/messages_pt_PT.properties
+++ b/src/main/resources/messages_pt_PT.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Validar
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Modo Escuro
+navbar.language=Languages
 navbar.settings=Configurações
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties
index a09c7e47..382b1760 100644
--- a/src/main/resources/messages_ro_RO.properties
+++ b/src/main/resources/messages_ro_RO.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Mod întunecat
+navbar.language=Languages
 navbar.settings=Setări
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties
index d29c9f79..38d51610 100644
--- a/src/main/resources/messages_ru_RU.properties
+++ b/src/main/resources/messages_ru_RU.properties
@@ -104,7 +104,9 @@ pipelineOptions.validateButton=Проверить
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Темный режим
+navbar.language=Languages
 navbar.settings=Настройки
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_sr_LATN_RS.properties b/src/main/resources/messages_sr_LATN_RS.properties
index a31a16d4..a200e591 100644
--- a/src/main/resources/messages_sr_LATN_RS.properties
+++ b/src/main/resources/messages_sr_LATN_RS.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Proveri
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Tamni režim
+navbar.language=Languages
 navbar.settings=Podešavanja
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties
index 822cda3a..6120e96d 100644
--- a/src/main/resources/messages_sv_SE.properties
+++ b/src/main/resources/messages_sv_SE.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Validate
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Mörkt läge
+navbar.language=Languages
 navbar.settings=Inställningar
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_tr_TR.properties b/src/main/resources/messages_tr_TR.properties
index 4e0ea9f8..e0475f25 100644
--- a/src/main/resources/messages_tr_TR.properties
+++ b/src/main/resources/messages_tr_TR.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=Doğrula
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=Karanlık Mod
+navbar.language=Languages
 navbar.settings=Ayarlar
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_uk_UA.properties b/src/main/resources/messages_uk_UA.properties
index 1ace290c..622f4ec8 100644
--- a/src/main/resources/messages_uk_UA.properties
+++ b/src/main/resources/messages_uk_UA.properties
@@ -69,6 +69,7 @@ visitGithub=Visit Github Repository
 donate=Donate
 color=Color
 sponsor=Sponsor
+info=Info
 
 
 
@@ -102,12 +103,18 @@ pipelineOptions.validateButton=Перевірити
 #############
 #  NAVBAR   #
 #############
-navbar.convert=Конвертувати
-navbar.security=Безпека
-navbar.other=Інше
+navbar.favorite=Favorites
 navbar.darkmode=Темний режим
-navbar.pageOps=Операції зі сторінкою
+navbar.language=Languages
 navbar.settings=Налаштування
+navbar.allTools=Tools
+navbar.multiTool=Multi Tools
+navbar.sections.organize=Organize
+navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertFrom=Convert from PDF
+navbar.sections.security=Sign & Security
+navbar.sections.advance=Advanced
+navbar.sections.edit=View & Edit
 
 #############
 #  SETTINGS #
@@ -742,6 +749,7 @@ extractImages.submit=Витягнути
 fileToPDF.title=Файл у PDF
 fileToPDF.header=Конвертувати будь-який файл у PDF
 fileToPDF.credit=Цей сервіс використовує LibreOffice та Unoconv для перетворення файлів.
+fileToPDF.supportedFileTypesInfo=Supported File types
 fileToPDF.supportedFileTypes=Підтримувані типи файлів повинні включати нижченаведені, однак повний оновлений список підтримуваних форматів дивіться у документації LibreOffice.
 fileToPDF.submit=Перетворити у PDF
 
diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties
index dcf6d08a..063d1e03 100644
--- a/src/main/resources/messages_zh_CN.properties
+++ b/src/main/resources/messages_zh_CN.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=验证
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=暗模式
+navbar.language=Languages
 navbar.settings=设置
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/messages_zh_TW.properties b/src/main/resources/messages_zh_TW.properties
index 4f53bf94..a218d0f1 100644
--- a/src/main/resources/messages_zh_TW.properties
+++ b/src/main/resources/messages_zh_TW.properties
@@ -103,7 +103,9 @@ pipelineOptions.validateButton=驗證
 #############
 #  NAVBAR   #
 #############
+navbar.favorite=Favorites
 navbar.darkmode=暗黑模式
+navbar.language=Languages
 navbar.settings=設定
 navbar.allTools=Tools
 navbar.multiTool=Multi Tools
diff --git a/src/main/resources/static/css/navbar.css b/src/main/resources/static/css/navbar.css
index 2ed49462..c3138a5b 100644
--- a/src/main/resources/static/css/navbar.css
+++ b/src/main/resources/static/css/navbar.css
@@ -291,11 +291,6 @@ span.icon-text::after {
   margin-top: 0 !important;
 }
 
-.dropdown:hover .dropdown-menu {
-  display: block;
-  margin-top: 0;
-}
-
 .dropdown-menu-wrapper {
   padding: 1.5rem 0;
   border-radius: 1rem;
@@ -310,4 +305,18 @@ span.icon-text::after {
   background-color: transparent;
   border: none;
   box-shadow: none;
+}
+
+.icon-hide {
+  display: inline-flex;
+}
+
+@media (min-width:992px) {
+  .dropdown:hover .dropdown-menu {
+    display: block;
+    margin-top: 0;
+  }
+  .icon-hide {
+    display: none;
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html
index d234dd77..d23f643f 100644
--- a/src/main/resources/templates/fragments/navbar.html
+++ b/src/main/resources/templates/fragments/navbar.html
@@ -294,6 +294,7 @@
               <span class="material-symbols-rounded">
                 star
               </span>
+              <span class="icon-text icon-hide" th:data-text="#{navbar.favorite}" th:text="#{navbar.favorite}"></span>
             </a>
             <div class="dropdown-menu dropdown-menu-tp dropdown-mw-28" aria-labelledby="navbarDropdown-5">
               <div class="dropdown-menu-wrapper px-xl-2 px-2" id="favoritesDropdown" >
@@ -306,6 +307,7 @@
               <span class="material-symbols-rounded" id="dark-mode-icon">
                 dark_mode
               </span>
+              <span class="icon-text icon-hide" id="dark-mode-text" th:data-text="#{navbar.darkmode}" th:text="#{navbar.darkmode}"></span>
             </a>
           </li>
           <li class="nav-item dropdown">
@@ -314,6 +316,7 @@
               <span class="material-symbols-rounded">
                 language
               </span>
+              <span class="icon-text icon-hide" th:data-text="#{navbar.language}" th:text="#{navbar.language}"></span>
             </a>
             <div class="dropdown-menu dropdown-menu-tp" aria-labelledby="languageDropdown">
               <div class="dropdown-menu-wrapper px-xl-2 px-2">
@@ -329,6 +332,7 @@
               <span class="material-symbols-rounded">
                 settings
               </span>
+              <span class="icon-text icon-hide" th:data-text="#{navbar.settings}" th:text="#{navbar.settings}"></span>
             </a>
           </li>
         </ul>