diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fcf794..3235575 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [UNRELEASED]
 
+## v1.5.2 - 2024-02-04
+- Fixed bug where show/hide menu icon tooltip was missing, causing an error in language texts and also causing the menu to be always shown on Linux.
+- Aligned tooltip to the icons both when menu is hidden (toolbar mode) and when it's shown.
+
 ## v1.5.1 - 2024-02-04
 - Added support for logs in production. Displayed in terminal, or stored in OS specific log folder. Linux: /home/alice/.config/com.tauri.dev; macOS: /Users/Alice/Library/Logs/com.tauri.dev; Windows: C:\Users\Alice\AppData\Roaming\com.tauri.dev
 
diff --git a/package.json b/package.json
index dc2922b..0c83d63 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "team-ai",
   "private": true,
-  "version": "1.5.1",
+  "version": "1.5.2",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/src/App.vue b/src/App.vue
index 7cb35cf..4b46154 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,20 +10,23 @@
         <OpenAI />
 
         <!--  Left drawer -->
-        <q-drawer :model-value="true" :mini="miniDrawer" :width="250" :persistent="true" bordered :breakpoint="600" side="left"
-            :class="$q.dark.isActive ? 'bg-grey-10' : 'bg-grey-4'">
+        <q-drawer :model-value="true" :mini="miniDrawer" :width="250" :persistent="true" bordered :breakpoint="600"
+            side="left" :class="$q.dark.isActive ? 'bg-grey-10' : 'bg-grey-4'">
             <q-list padding>
                 <div v-for="item in toolbar" :key="item.tooltip">
                     <div v-show="appMode === 'advanced' || item.appMode === appMode">
 
-                        <q-item clickable v-ripple="item.tooltip != ''" @click="item.action">
-                            <q-item-section avatar>                                
+                        <q-item clickable v-ripple @click="item.action">
+                            <q-item-section avatar>
                                 <q-icon dense flat :name="item.icon" :color="iconColor" />
+                                <q-tooltip :delay="750" transition-show="scale" transition-hide="scale">
+                                    {{ $t(item.tooltip) }}
+                                </q-tooltip>
                             </q-item-section>
-                            <q-item-section no-wrap>{{ $t(item.tooltip) }}</q-item-section>
-                            <q-tooltip v-if="item.tooltip != ''" :delay="750" transition-show="scale" transition-hide="scale">
+                            <q-item-section no-wrap
+                                v-if="item.tooltip != 'toolbar.tooltip.showDrawer' && item.tooltip != 'toolbar.tooltip.hideDrawer'">
                                 {{ $t(item.tooltip) }}
-                            </q-tooltip>
+                            </q-item-section>
                         </q-item>
                     </div>
                 </div>
@@ -127,13 +130,16 @@ export default {
         const miniDrawer = ref(true);
 
         // Watch miniDrawer changes and update the toolbar icon
-        watch(miniDrawer, () => { toolbar.value[0].icon = miniDrawer.value === true ? 'mdi-menu' : 'mdi-menu-open' });
+        watch(miniDrawer, () => {
+            toolbar.value[0].icon = miniDrawer.value === true ? 'mdi-menu' : 'mdi-menu-open'
+            toolbar.value[0].tooltip = miniDrawer.value === true ? 'toolbar.tooltip.showDrawer' : 'toolbar.tooltip.hideDrawer'
+        });
 
         const toolbar = ref([
             {
                 action: () => { miniDrawer.value = !miniDrawer.value },
                 icon: 'mdi-menu',
-                tooltip: '',
+                tooltip: 'toolbar.tooltip.showDrawer',
                 appMode: 'basic'
             },
             {
diff --git a/src/i18n/locales/en.js b/src/i18n/locales/en.js
index d2a89ba..fec37ee 100644
--- a/src/i18n/locales/en.js
+++ b/src/i18n/locales/en.js
@@ -30,6 +30,8 @@ export default {
 
     toolbar: {
         tooltip: {
+            showDrawer: 'Show menu',
+            hideDrawer: 'Hide menu',
             newConversation: 'New conversation',
             clear: 'Clear messages',
             personas: 'Show personas',
@@ -37,7 +39,7 @@ export default {
             info: 'Info',
             settings: 'Show settings',
             history: 'Show conversations',
-            checkForUpdates: 'Check for updates...',
+            checkForUpdates: 'Check for updates...'
         },
     },
     settings: {
diff --git a/src/i18n/locales/hu.js b/src/i18n/locales/hu.js
index ce3a4e6..04628fa 100644
--- a/src/i18n/locales/hu.js
+++ b/src/i18n/locales/hu.js
@@ -27,6 +27,8 @@ export default {
 
     toolbar: {
         tooltip: {
+            showDrawer: 'Menü megjelenitése',
+            hideDrawer: 'Menü elrejtése',
             newConversation: 'Új beszélgetés',
             clear: 'Üzenetek törlése',
             personas: 'Személyek',
@@ -34,7 +36,7 @@ export default {
             info: 'Információ',
             settings: 'Beállítások',
             history: 'Korábbi beszélgetések',
-            checkForUpdates: 'Frissítések ellenőrzése...',
+            checkForUpdates: 'Frissítések ellenőrzése...'
         },
     },
     
diff --git a/src/i18n/locales/sv.js b/src/i18n/locales/sv.js
index d671e61..e0c5c0a 100644
--- a/src/i18n/locales/sv.js
+++ b/src/i18n/locales/sv.js
@@ -30,6 +30,8 @@ export default {
 
     toolbar: {
         tooltip: {
+            showDrawer: 'Visa meny',
+            hideDrawer: 'Dölj meny',
             newConversation: 'Ny konversation',
             clear: 'Rensa meddelanden',
             personas: 'Visa personas',