diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js
index f519a558..4c1911df 100644
--- a/modules/core/client/controllers/header.client.controller.js
+++ b/modules/core/client/controllers/header.client.controller.js
@@ -6,13 +6,14 @@
     .controller('HeaderController', HeaderController);
 
   HeaderController.$inject = ['$scope', '$state', '$timeout', '$translate', 'Authentication', 'menuService', 'MeanTorrentConfig', 'localStorageService',
-    'ScoreLevelService', 'InvitationsService', '$interval', 'MessagesService', 'TorrentsService', 'UsersService', 'DebugConsoleService'];
+    'ScoreLevelService', 'InvitationsService', '$interval', 'MessagesService', 'TorrentsService', 'UsersService', 'DebugConsoleService', 'getStorageLangService'];
 
   function HeaderController($scope, $state, $timeout, $translate, Authentication, menuService, MeanTorrentConfig, localStorageService, ScoreLevelService,
-                            InvitationsService, $interval, MessagesService, TorrentsService, UsersService, mtDebug) {
+                            InvitationsService, $interval, MessagesService, TorrentsService, UsersService, mtDebug, getStorageLangService) {
     $scope.$state = $state;
     var vm = this;
     vm.user = Authentication.user;
+    vm.langService = getStorageLangService;
     vm.language = MeanTorrentConfig.meanTorrentConfig.language;
     vm.announceConfig = MeanTorrentConfig.meanTorrentConfig.announce;
     vm.messageConfig = MeanTorrentConfig.meanTorrentConfig.messages;
diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less
index 661596cd..f3dd281a 100644
--- a/modules/core/client/less/mt.less
+++ b/modules/core/client/less/mt.less
@@ -1773,16 +1773,38 @@ body {
 }
 
 .lang-list {
-    margin-left: 10px;
+    margin-top: 5px;
+    padding-left: 5px;
     line-height: 2;
     .flag-icon {
         font-size: 18px;
         margin-left: 10px;
         &,
-        &:hover,
         &:focus {
             cursor: pointer;
         }
+        &:hover {
+            &:after {
+                content: '';
+                background-color: #c0c0c0;
+                position: absolute;
+                width: 100%;
+                height: 3px;
+                top: -5px;
+                right: 0;
+            }
+        }
+        &.curr-language {
+            &:after {
+                content: '';
+                background-color: @brand-primary;
+                position: absolute;
+                width: 100%;
+                height: 3px;
+                top: -5px;
+                right: 0;
+            }
+        }
     }
 }
 
diff --git a/modules/core/client/views/footer.client.view.html b/modules/core/client/views/footer.client.view.html
index b9ca8778..803b3c9f 100644
--- a/modules/core/client/views/footer.client.view.html
+++ b/modules/core/client/views/footer.client.view.html
@@ -36,7 +36,7 @@
                             <li>
                             <span class="lang-list lang-footer">
                                 <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);"
-                                      ng-repeat="l in vm.language"></span>
+                                      ng-repeat="l in vm.language" ng-class="{'curr-language': vm.langService.getLang() == l.name}"></span>
                             </span>
                             </li>
                             <li translate="GIT_REPO"></li>
diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html
index b496259e..273326ac 100644
--- a/modules/core/client/views/header.client.view.html
+++ b/modules/core/client/views/header.client.view.html
@@ -1,4 +1,5 @@
-<div class="container navbar-mt" ng-controller="HeaderController as vm" ng-init="vm.getInvitationsCount(); vm.checkMessageUnread(); vm.checkHnRWarning();">
+<div class="container navbar-mt" ng-controller="HeaderController as vm"
+     ng-init="vm.getInvitationsCount(); vm.checkMessageUnread(); vm.checkHnRWarning();">
     <div class="navbar-header">
         <button class="navbar-toggle" type="button" ng-click="vm.isCollapsed = !vm.isCollapsed">
             <span class="sr-only">Toggle navigation</span>
@@ -55,11 +56,9 @@
                           ng-class="{'bg-hnr': vm.user.hnr_warning>0, 'bg-msg': vm.unreadCount>0}"></span>
                 </a>
                 <ul class="dropdown-menu" role="menu">
-                    <li>
-            <span class="lang-list">
-              <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);"
-                    ng-repeat="l in vm.language"></span>
-            </span>
+                    <li class="lang-list">
+                        <span class="flag-icon {{l.class}}" title="{{l.title}}" ng-click="vm.changeLanguage(l.name);"
+                              ng-repeat="l in vm.language" ng-class="{'curr-language': vm.langService.getLang() == l.name}"></span>
                     </li>
                     <li class="divider"></li>
                     <li ui-sref-active="active" ng-repeat="item in vm.followMenu.items" class="menu-parent">