diff --git a/dev/Screen/AbstractSettings.js b/dev/Screen/AbstractSettings.js
index 04c2bc4da..6dffd8a27 100644
--- a/dev/Screen/AbstractSettings.js
+++ b/dev/Screen/AbstractSettings.js
@@ -126,8 +126,7 @@ export class AbstractSettingsScreen extends AbstractScreen {
 				this.menu.push({
 					route: SettingsViewModel.__rlSettingsData.Route,
 					label: SettingsViewModel.__rlSettingsData.Label,
-					selected: ko.observable(false),
-					disabled: false
+					selected: ko.observable(false)
 				});
 			}
 		});
diff --git a/dev/Styles/Admin.less b/dev/Styles/Admin.less
index a448be15c..7ab37b90c 100644
--- a/dev/Styles/Admin.less
+++ b/dev/Styles/Admin.less
@@ -26,43 +26,26 @@
 
 .b-admin-menu {
 
-	.e-item {
-		overflow: hidden;
-		text-decoration: none;
-	}
-
-	.e-link {
-		position: relative;
+	a {
+		color: var(--settings-menu-color, #333);
+		cursor: pointer;
 		display: block;
+		font-size: 18px;
 		height: 30px;
 		line-height: 29px;
-		cursor: pointer;
-		font-size: 18px;
-		z-index: 1;
-		cursor: default;
-
-		background-color: transparent;
-		color: var(--settings-menu-disabled-color, #666);
-
+		overflow: hidden;
 		padding: 4px 10px;
-
 		text-decoration: none;
 	}
 
-	.e-item.selectable .e-link {
-		cursor: pointer;
-		color: var(--settings-menu-color, #333);
+	a:focus, a:hover {
+		background-color: var(--settings-menu-hover-bg-color, #333);
+		color: var(--settings-menu-hover-color, #eee);
 	}
 
-	.e-item.selectable {
-		&:hover .e-link{
-			background-color: var(--settings-menu-hover-bg-color, #333);
-			color: var(--settings-menu-hover-color, #eee);
-		}
-		&.selected .e-link {
-			background-color: var(--settings-menu-selected-bg-color, #333);
-			color: var(--settings-menu-selected-color, #eee);
-		}
+	a.selected {
+		background-color: var(--settings-menu-selected-bg-color, #333);
+		color: var(--settings-menu-selected-color, #eee);
 	}
 }
 
diff --git a/dev/Styles/Settings.less b/dev/Styles/Settings.less
index dc5ed859d..c64c05742 100644
--- a/dev/Styles/Settings.less
+++ b/dev/Styles/Settings.less
@@ -36,42 +36,27 @@
 
 .b-settings-menu {
 
-	.e-item {
-		overflow: hidden;
-		text-decoration: none;
-	}
-
-	.e-link {
-		position: relative;
+	a {
+		background-color: transparent;
+		color: var(--settings-menu-color, #333);
+		cursor: pointer;
 		display: block;
+		font-size: 18px;
 		height: 30px;
 		line-height: 29px;
-		font-size: 18px;
-		z-index: 1;
-		cursor: default;
-
-		background-color: transparent;
-		color: var(--settings-menu-disabled-color, #666);
-
+		overflow: hidden;
 		padding: 4px 10px;
-
 		text-decoration: none;
 	}
 
-	.e-item.selectable .e-link {
-		cursor: pointer;
-		color: var(--settings-menu-color, #333);
+	a:focus, a:hover {
+		background-color: var(--settings-menu-hover-bg-color, #333);
+		color: var(--settings-menu-hover-color, #eee);
 	}
 
-	.e-item.selectable {
-		&:hover .e-link{
-			background-color: var(--settings-menu-hover-bg-color, #333);
-			color: var(--settings-menu-hover-color, #eee);
-		}
-		&.selected .e-link {
-			background-color: var(--settings-menu-selected-bg-color, #333);
-			color: var(--settings-menu-selected-color, #eee);
-		}
+	a.selected {
+		background-color: var(--settings-menu-selected-bg-color, #333);
+		color: var(--settings-menu-selected-color, #eee);
 	}
 }
 
diff --git a/dev/View/Admin/Settings/Menu.js b/dev/View/Admin/Settings/Menu.js
index 3f218ddff..3b7b87798 100644
--- a/dev/View/Admin/Settings/Menu.js
+++ b/dev/View/Admin/Settings/Menu.js
@@ -1,6 +1,3 @@
-import { Scope } from 'Common/Enums';
-
-import { settingsMenuKeysHandler } from 'Knoin/Knoin';
 import { AbstractViewLeft } from 'Knoin/AbstractViews';
 
 class MenuSettingsAdminView extends AbstractViewLeft {
@@ -16,11 +13,6 @@ class MenuSettingsAdminView extends AbstractViewLeft {
 	link(route) {
 		return '#/' + route;
 	}
-
-	onBuild(dom) {
-		shortcuts.add('arrowup,arrowdown', '', Scope.Settings,
-			settingsMenuKeysHandler(dom.querySelectorAll('.b-admin-menu .e-item')));
-	}
 }
 
 export { MenuSettingsAdminView };
diff --git a/dev/View/User/Settings/Menu.js b/dev/View/User/Settings/Menu.js
index c7a8fc09e..4ae687693 100644
--- a/dev/View/User/Settings/Menu.js
+++ b/dev/View/User/Settings/Menu.js
@@ -1,9 +1,7 @@
-import { Scope } from 'Common/Enums';
 import { leftPanelDisabled } from 'Common/Globals';
 import { settings, mailbox } from 'Common/Links';
 import { getFolderInboxName } from 'Common/Cache';
 
-import { settingsMenuKeysHandler } from 'Knoin/Knoin';
 import { AbstractViewLeft } from 'Knoin/AbstractViews';
 
 import { ThemeStore } from 'Stores/Theme';
@@ -23,12 +21,9 @@ export class MenuSettingsUserView extends AbstractViewLeft {
 	onBuild(dom) {
 		dom.addEventListener('click', event =>
 			ThemeStore.isMobile()
-			&& event.target.closestWithin('.b-settings-menu .e-item.selectable', dom)
+			&& event.target.closest('.b-settings-menu a', dom)
 			&& leftPanelDisabled(true)
 		);
-
-		shortcuts.add('arrowup,arrowdown', '', Scope.Settings,
-			settingsMenuKeysHandler(dom.querySelectorAll('.b-settings-menu .e-item')));
 	}
 
 	link(route) {
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html
index cc19c6948..607c8e9f5 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminMenu.html
@@ -1,17 +1,7 @@
-<div class="b-admin-left g-ui-user-select-none">
-	<div class="b-toolbar"></div>
+<div class="b-admin-left">
 	<div class="b-content opacity-on-panel-disabled">
-		<div class="b-admin-menu" data-bind="foreach: menu">
-			<!-- ko if: disabled -->
-			<span class="e-item disabled">
-				<span class="e-link" data-bind="attr: { 'data-i18n': label }"></span>
-			</span>
-			<!-- /ko -->
-			<!-- ko ifnot: disabled -->
-			<a class="e-item selectable" href="#" data-bind="css: {'selected': selected }, attr: { 'href': $root.link(route) }">
-				<span class="e-link" data-bind="attr: { 'data-i18n': label }"></span>
-			</a>
-			<!-- /ko -->
-		</div>
+		<nav class="b-admin-menu" data-bind="foreach: menu">
+			<a data-bind="css: {'selected': selected }, attr: { 'href': $root.link(route), 'data-i18n': label }"></a>
+		</nav>
 	</div>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
index d00f7ed3d..334ce3451 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsMenu.html
@@ -1,17 +1,8 @@
-<div class="b-settins-left g-ui-user-select-none">
+<div class="b-settins-left">
 	<div class="b-content opacity-on-panel-disabled">
-		<div class="b-settings-menu" data-bind="foreach: menu">
-			<!-- ko if: disabled -->
-			<span class="e-item disabled">
-				<span class="e-link" data-bind="attr: { 'data-i18n': label }"></span>
-			</span>
-			<!-- /ko -->
-			<!-- ko ifnot: disabled -->
-			<a class="e-item selectable" href="#" data-bind="css: {'selected': selected }, attr: { 'href': $root.link(route) }">
-				<span class="e-link" data-bind="attr: { 'data-i18n': label }"></span>
-			</a>
-			<!-- /ko -->
-		</div>
+		<nav class="b-settings-menu" data-bind="foreach: menu">
+			<a data-bind="css: {'selected': selected }, attr: { 'href': $root.link(route), 'data-i18n': label }"></a>
+		</nav>
 	</div>
 	<div class="b-content show-on-panel-disabled" data-bind="click: function () { leftPanelDisabled(false); }"></div>
 	<div class="b-footer">
diff --git a/snappymail/v/0.0.0/themes/A/styles.less b/snappymail/v/0.0.0/themes/A/styles.less
index 60014f361..eee43e381 100644
--- a/snappymail/v/0.0.0/themes/A/styles.less
+++ b/snappymail/v/0.0.0/themes/A/styles.less
@@ -37,7 +37,6 @@
 
 	// SETTINGS
 	--settings-menu-color: #fff;
-	--settings-menu-disabled-color: #aaa;
 	--settings-menu-selected-color: #fff;
 	--settings-menu-selected-bg-color: rgba(0,0,0,0.5);
 	--settings-menu-hover-color: #fff;
diff --git a/snappymail/v/0.0.0/themes/Blurred/styles.less b/snappymail/v/0.0.0/themes/Blurred/styles.less
index 638d96fc0..3f65603bc 100644
--- a/snappymail/v/0.0.0/themes/Blurred/styles.less
+++ b/snappymail/v/0.0.0/themes/Blurred/styles.less
@@ -38,7 +38,6 @@
 
 	// SETTINGS
 	--settings-menu-color: #fff;
-	--settings-menu-disabled-color: #aaa;
 	--settings-menu-selected-color: #fff;
 	--settings-menu-selected-bg-color: rgba(255,255,255,0.3);
 	--settings-menu-hover-color: #fff;
diff --git a/snappymail/v/0.0.0/themes/DarkShine/styles.less b/snappymail/v/0.0.0/themes/DarkShine/styles.less
index e7e7af4d8..efd7d77bd 100644
--- a/snappymail/v/0.0.0/themes/DarkShine/styles.less
+++ b/snappymail/v/0.0.0/themes/DarkShine/styles.less
@@ -38,7 +38,6 @@
 
 	// SETTINGS
 	--settings-menu-color: #fff;
-	--settings-menu-disabled-color: #aaa;
 	--settings-menu-selected-color: #fff;
 	--settings-menu-selected-bg-color: rgba(255,255,255,0.3);
 	--settings-menu-hover-color: #fff;
diff --git a/snappymail/v/0.0.0/themes/Default/styles.less b/snappymail/v/0.0.0/themes/Default/styles.less
index 2a64ea60b..b427a9661 100644
--- a/snappymail/v/0.0.0/themes/Default/styles.less
+++ b/snappymail/v/0.0.0/themes/Default/styles.less
@@ -37,7 +37,6 @@
 
 	// SETTINGS
 	--settings-menu-color: #fff;
-	--settings-menu-disabled-color: #aaa;
 	--settings-menu-selected-color: #fff;
 	--settings-menu-selected-bg-color: rgba(0,0,0,0.5);
 	--settings-menu-hover-color: #fff;
diff --git a/snappymail/v/0.0.0/themes/Linen/styles.less b/snappymail/v/0.0.0/themes/Linen/styles.less
index 3e360cef0..f5a75fc9b 100644
--- a/snappymail/v/0.0.0/themes/Linen/styles.less
+++ b/snappymail/v/0.0.0/themes/Linen/styles.less
@@ -36,7 +36,6 @@
 
 	// SETTINGS
 	--settings-menu-color: #333;
-	--settings-menu-disabled-color: #999;
 	--settings-menu-selected-color: #eee;
 	--settings-menu-selected-bg-color: rgba(0,0,0,0.5);
 	--settings-menu-hover-color: #eee;
diff --git a/snappymail/v/0.0.0/themes/Love/styles.less b/snappymail/v/0.0.0/themes/Love/styles.less
index cdba95572..205c72c7c 100644
--- a/snappymail/v/0.0.0/themes/Love/styles.less
+++ b/snappymail/v/0.0.0/themes/Love/styles.less
@@ -37,7 +37,6 @@
 
 	// SETTINGS
 	--settings-menu-color: #fff;
-	--settings-menu-disabled-color: #aaa;
 	--settings-menu-selected-color: #fff;
 	--settings-menu-selected-bg-color: rgba(0,0,0,0.5);
 	--settings-menu-hover-color: #fff;
diff --git a/snappymail/v/0.0.0/themes/Snow/styles.less b/snappymail/v/0.0.0/themes/Snow/styles.less
index b3b3c8504..e0cc0e904 100644
--- a/snappymail/v/0.0.0/themes/Snow/styles.less
+++ b/snappymail/v/0.0.0/themes/Snow/styles.less
@@ -37,7 +37,6 @@
 
 	// SETTINGS
 	--settings-menu-color: #fff;
-	--settings-menu-disabled-color: #aaa;
 	--settings-menu-selected-color: #fff;
 	--settings-menu-selected-bg-color: rgba(0,0,0,0.5);
 	--settings-menu-hover-color: #fff;
diff --git a/snappymail/v/0.0.0/themes/Squares/styles.less b/snappymail/v/0.0.0/themes/Squares/styles.less
index 3e360cef0..f5a75fc9b 100644
--- a/snappymail/v/0.0.0/themes/Squares/styles.less
+++ b/snappymail/v/0.0.0/themes/Squares/styles.less
@@ -36,7 +36,6 @@
 
 	// SETTINGS
 	--settings-menu-color: #333;
-	--settings-menu-disabled-color: #999;
 	--settings-menu-selected-color: #eee;
 	--settings-menu-selected-bg-color: rgba(0,0,0,0.5);
 	--settings-menu-hover-color: #eee;
diff --git a/snappymail/v/0.0.0/themes/SquaresDark/styles.less b/snappymail/v/0.0.0/themes/SquaresDark/styles.less
index 7d77ab724..fcd97484b 100644
--- a/snappymail/v/0.0.0/themes/SquaresDark/styles.less
+++ b/snappymail/v/0.0.0/themes/SquaresDark/styles.less
@@ -37,7 +37,6 @@
 
 	// SETTINGS
 	--settings-menu-color: #fff;
-	--settings-menu-disabled-color: #aaa;
 	--settings-menu-selected-color: #fff;
 	--settings-menu-selected-bg-color: rgba(0,0,0,0.5);
 	--settings-menu-hover-color: #fff;
diff --git a/snappymail/v/0.0.0/themes/Stripes/styles.less b/snappymail/v/0.0.0/themes/Stripes/styles.less
index 17a281ba9..948c5f63d 100644
--- a/snappymail/v/0.0.0/themes/Stripes/styles.less
+++ b/snappymail/v/0.0.0/themes/Stripes/styles.less
@@ -36,7 +36,6 @@
 
 	// SETTINGS
 	--settings-menu-color: #fff;
-	--settings-menu-disabled-color: #999;
 	--settings-menu-selected-color: #fff;
 	--settings-menu-selected-bg-color: rgba(255,255,255,0.3);
 	--settings-menu-hover-color: #fff;
diff --git a/snappymail/v/0.0.0/themes/Wood/styles.less b/snappymail/v/0.0.0/themes/Wood/styles.less
index cbfe54eef..73f910e04 100644
--- a/snappymail/v/0.0.0/themes/Wood/styles.less
+++ b/snappymail/v/0.0.0/themes/Wood/styles.less
@@ -38,7 +38,6 @@
 
 	// SETTINGS
 	--settings-menu-color: #333;
-	--settings-menu-disabled-color: #999;
 	--settings-menu-selected-color: #333;
 	--settings-menu-selected-bg-color: rgba(255,255,255,0.5);
 	--settings-menu-hover-color: #333;
diff --git a/snappymail/v/0.0.0/themes/Xv/styles.less b/snappymail/v/0.0.0/themes/Xv/styles.less
index 3e360cef0..f5a75fc9b 100644
--- a/snappymail/v/0.0.0/themes/Xv/styles.less
+++ b/snappymail/v/0.0.0/themes/Xv/styles.less
@@ -36,7 +36,6 @@
 
 	// SETTINGS
 	--settings-menu-color: #333;
-	--settings-menu-disabled-color: #999;
 	--settings-menu-selected-color: #eee;
 	--settings-menu-selected-bg-color: rgba(0,0,0,0.5);
 	--settings-menu-hover-color: #eee;
diff --git a/snappymail/v/0.0.0/themes/example.css b/snappymail/v/0.0.0/themes/example.css
index 97e580968..a95d073fe 100644
--- a/snappymail/v/0.0.0/themes/example.css
+++ b/snappymail/v/0.0.0/themes/example.css
@@ -44,7 +44,6 @@
 
 // SETTINGS
 	--settings-menu-color: #333;
-	--settings-menu-disabled-color: #666;
 	--settings-menu-selected-color: #eee;
 	--settings-menu-selected-bg-color: #333;
 	--settings-menu-hover-color: #eee;