diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index 3aa36ef1e..61ffc948f 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -658,21 +658,20 @@ body.slim-container .layout.layout-container,body.slim-container .layout .layout
 .flex-layout-item.width-200{width:200px}
 .flex-layout-item.width-300{width:300px}
 body.mainmenu-open{overflow:hidden}
+.mainmenu-tooltip .tooltip-inner{font-size:16px;padding:6px 16px}
 nav#layout-mainmenu{background-color:#111111;padding:0 0 0 20px;line-height:0;white-space:nowrap;vertical-align:top}
 nav#layout-mainmenu a{text-decoration:none}
 nav#layout-mainmenu a:focus{background:transparent}
 nav#layout-mainmenu ul{margin:0;padding:0;list-style:none;float:left;white-space:nowrap;overflow:hidden}
-nav#layout-mainmenu ul li{color:#555555;display:inline-block;vertical-align:top;margin-right:30px;position:relative}
+nav#layout-mainmenu ul li{color:#555555;display:inline-block;vertical-align:top;margin-right:30px;position:relative; }
 nav#layout-mainmenu ul li a{padding:19px 0 15px;display:inline-block;font-size:16px;color:inherit;outline:none}
 nav#layout-mainmenu ul li a:hover{background-color:transparent !important}
 nav#layout-mainmenu ul li a:active,nav#layout-mainmenu ul li a:focus{text-decoration:none;color:#555555}
 nav#layout-mainmenu ul li a i{position:relative;top:-2px;line-height:1;font-size:30px;vertical-align:middle;margin-right:10px}
 nav#layout-mainmenu ul li a img.svg-icon{height:30px;width:30px;margin-right:10px;position:relative;top:0}
+nav#layout-mainmenu ul li a .nav-label{display:none}
 nav#layout-mainmenu ul li:last-child{margin-right:0}
-nav#layout-mainmenu ul li.active:after{content:' ';position:absolute;bottom:0;left:50%;margin-left:-8.5px}
-nav#layout-mainmenu ul li.active a{font-size:18px;padding-top:13px;padding-bottom:8px}
-nav#layout-mainmenu ul li.active a i{font-size:40px}
-nav#layout-mainmenu ul li.active a img.svg-icon{height:40px;width:40px}
+nav#layout-mainmenu ul li.active .nav-label{display:inline}
 nav#layout-mainmenu ul li.icon{margin-right:0}
 nav#layout-mainmenu ul li.icon i{margin-right:0}
 nav#layout-mainmenu ul li.icon a{padding:14px}
diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js
index 6e572f9ca..cdd8c2d30 100644
--- a/modules/backend/assets/js/october-min.js
+++ b/modules/backend/assets/js/october-min.js
@@ -888,7 +888,7 @@ $.fn.verticalMenu.noConflict=function(){$.fn.verticalMenu=old
 return this}}(window.jQuery);(function($){$(window).load(function(){$('nav.navbar').each(function(){var
 navbar=$(this),nav=$('ul.nav',navbar)
 nav.verticalMenu($('a.menu-toggle',navbar))
-$('li.with-tooltip > a',navbar).tooltip({container:'body',placement:'bottom'})
+$('li.with-tooltip:not(.active) > a',navbar).tooltip({container:'body',placement:'bottom',template:'<div class="tooltip mainmenu-tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'})
 $('[data-calculate-width]',navbar).one('oc.widthFixed',function(){var dragScroll=$('[data-control=toolbar]',navbar).data('oc.dragScroll')
 if(dragScroll){dragScroll.goToElement($('ul.nav > li.active',navbar),undefined,{'duration':0})}})})})})(jQuery);+function($){"use strict";if($.oc===undefined)
 $.oc={}
diff --git a/modules/backend/assets/js/october.navbar.js b/modules/backend/assets/js/october.navbar.js
index df87b29c0..fede55edf 100644
--- a/modules/backend/assets/js/october.navbar.js
+++ b/modules/backend/assets/js/october.navbar.js
@@ -18,9 +18,10 @@
 
             nav.verticalMenu($('a.menu-toggle', navbar))
 
-            $('li.with-tooltip > a', navbar).tooltip({
+            $('li.with-tooltip:not(.active) > a', navbar).tooltip({
                 container: 'body',
-                placement: 'bottom'
+                placement: 'bottom',
+                template: '<div class="tooltip mainmenu-tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
             })
 
             $('[data-calculate-width]', navbar).one('oc.widthFixed', function() {
diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less
index 93abd8e14..9946dbf05 100644
--- a/modules/backend/assets/less/layout/mainmenu.less
+++ b/modules/backend/assets/less/layout/mainmenu.less
@@ -32,6 +32,13 @@ body.mainmenu-open {
     }
 }
 
+.mainmenu-tooltip {
+    .tooltip-inner {
+        font-size: 16px;
+        padding: 6px 16px;
+    }
+}
+
 nav#layout-mainmenu {
     background-color: @color-mainmenu;
     padding: 0 0 0 20px;
@@ -71,12 +78,22 @@ nav#layout-mainmenu {
                     position: relative;
                     top: 0;
                 }
+
+                .nav-label {
+                    display: none;
+                }
             }
 
             &:last-child {
                 margin-right: 0;
             }
 
+            &.active {
+                .nav-label {
+                    display: inline;
+                }
+            }
+/*
             &.active {
                 &:after {
                     content: ' ';
@@ -101,7 +118,7 @@ nav#layout-mainmenu {
                     }
                 }
             }
-
+*/
             &.icon {
                 margin-right: 0;
 
diff --git a/modules/backend/layouts/_mainmenu.htm b/modules/backend/layouts/_mainmenu.htm
index aa242ba48..fff0a3037 100644
--- a/modules/backend/layouts/_mainmenu.htm
+++ b/modules/backend/layouts/_mainmenu.htm
@@ -12,15 +12,21 @@
 
             <ul class="nav">
                 <?php foreach (BackendMenu::listMainMenuItems() as $item): ?>
-                    <li class="<?= BackendMenu::isMainMenuItemActive($item) ? 'active' : null ?> svg-icon-container svg-active-effects">
-                        <a href="<?= $item->url ?>">
-                            <?php if ($item->iconSvg): ?>
-                                <img class="svg-icon" src="<?= URL::asset($item->iconSvg) ?>">
-                            <?php endif ?>
+                    <?php
+                        $isActive = BackendMenu::isMainMenuItemActive($item);
+                    ?>
+                    <li class="<?= $isActive ? 'active' : null ?> svg-icon-container svg-active-effects with-tooltip">
+                        <a href="<?= $item->url ?>" title="<?= e(trans($item->label)) ?>">
+                            <span class="nav-icon">
+                                <?php if ($item->iconSvg): ?>
+                                    <img class="svg-icon" src="<?= URL::asset($item->iconSvg) ?>">
+                                <?php endif ?>
 
-                            <i class="<?= $item->iconSvg ? 'svg-replace' : null ?> <?= $item->icon ?>"></i>
-
-                            <?= e(trans($item->label)) ?>
+                                <i class="<?= $item->iconSvg ? 'svg-replace' : null ?> <?= $item->icon ?>"></i>
+                            </span>
+                            <span class="nav-label">
+                                <?= e(trans($item->label)) ?>
+                            </span>
                         </a>
                     </li>
                 <?php endforeach ?>
diff --git a/modules/system/assets/js/lang/lang.tr.js b/modules/system/assets/js/lang/lang.tr.js
index 43398b792..cf2be7e8a 100644
--- a/modules/system/assets/js/lang/lang.tr.js
+++ b/modules/system/assets/js/lang/lang.tr.js
@@ -5,5 +5,5 @@ if ($.oc === undefined) $.oc = {}
 if ($.oc.langMessages === undefined) $.oc.langMessages = {}
 $.oc.langMessages['tr'] = $.extend(
     $.oc.langMessages['tr'] || {},
-    {"markdowneditor":{"formatting":"Formatting","quote":"Quote","code":"Code","header1":"Header 1","header2":"Header 2","header3":"Header 3","header4":"Header 4","header5":"Header 5","header6":"Header 6","bold":"Bold","italic":"Italic","unorderedlist":"Unordered List","orderedlist":"Ordered List","video":"Video","image":"Image","link":"Link","horizontalrule":"Insert Horizontal Rule","fullscreen":"Full screen","preview":"Preview"},"mediamanager":{"insert_link":"Insert Media Link","insert_image":"Insert Media Image","insert_video":"Insert Media Video","insert_audio":"Insert Media Audio","invalid_file_empty_insert":"Please select file to insert a links to.","invalid_file_single_insert":"Please select a single file.","invalid_image_empty_insert":"Please select image(s) to insert.","invalid_video_empty_insert":"Please select a video file to insert.","invalid_audio_empty_insert":"Please select an audio file to insert."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Cancel"}}
+    {"markdowneditor":{"formatting":"Formatlama","quote":"Al\u0131nt\u0131","code":"Kod","header1":"Ba\u015fl\u0131k 1","header2":"Ba\u015fl\u0131k 2","header3":"Ba\u015fl\u0131k 3","header4":"Ba\u015fl\u0131k 4","header5":"Ba\u015fl\u0131k 5","header6":"Ba\u015fl\u0131k 6","bold":"Kal\u0131n","italic":"\u0130talik","unorderedlist":"S\u0131ras\u0131z Liste","orderedlist":"S\u0131ral\u0131 Liste","video":"Video","image":"G\u00f6rsel\/Resim","link":"Link","horizontalrule":"Yatay \u00c7izgi Ekle","fullscreen":"Tam Ekran","preview":"\u00d6nizleme"},"mediamanager":{"insert_link":"Medya Linki Ekle","insert_image":"Medya Resim Ekle","insert_video":"Medya Video Ekle","insert_audio":"Medya Ses Ekle","invalid_file_empty_insert":"L\u00fctfen link verilecek dosyay\u0131 se\u00e7in.","invalid_file_single_insert":"L\u00fctfen tek bir dosya se\u00e7in.","invalid_image_empty_insert":"L\u00fctfen eklenecek resim(ler)i se\u00e7in.","invalid_video_empty_insert":"L\u00fctfen eklenecek video dosyas\u0131n\u0131 se\u00e7in.","invalid_audio_empty_insert":"L\u00fctfen eklenecek ses dosyas\u0131n\u0131 se\u00e7in."},"alert":{"confirm_button_text":"TAMAM","cancel_button_text":"\u0130ptal"}}
 );
\ No newline at end of file