diff --git a/typo3/sysext/rtehtmlarea/Resources/Public/Css/Skin/htmlarea.css b/typo3/sysext/rtehtmlarea/Resources/Public/Css/Skin/htmlarea.css
index 6b3f5a950ed2700e73df1473ac2f5692d2c059f7..fced7a34ad2f8171442a84e6cdf69a0e62582d0d 100644
--- a/typo3/sysext/rtehtmlarea/Resources/Public/Css/Skin/htmlarea.css
+++ b/typo3/sysext/rtehtmlarea/Resources/Public/Css/Skin/htmlarea.css
@@ -356,10 +356,11 @@
 }
 /* Selectors for the ContextMenu plugin */
 .htmlarea-context-menu {
-	background-color:#EFEFF4;
 	color:#212424;
 	font-family: Verdana, Helvetica, Geneva, Arial, sans-serif;
 	font-size:10px;
+	background-color: #FFFFFF;
+	border-color: #D7D7D7;
 }
 .htmlarea-context-menu ul {
 	list-style: none;
@@ -367,7 +368,7 @@
 }
 .htmlarea-context-menu li {
 	margin: 0;
-	padding: 0;
+	padding: 2px 0;
 	border-width: 0;
 }
 .htmlarea-context-menu a {
@@ -375,20 +376,46 @@
 }
 .htmlarea-context-menu .button {
 	background-color: transparent;
-	margin: 0 2px 0 0;
 	padding-top: 1px;
 }
 .htmlarea-context-menu .separator {
-	border-top: 1px solid #A2AAB8;
+	border-top: 1px solid #D7D7D7
 }
 .htmlarea-context-menu .hover {
-	background-image: url("../../Images/alt_menu_mainitem_bg.gif");
-	background-repeat: repeat-x;
-	color: white;
-	margin: 0 2px 0 0;
 	padding-top: 1px;
 	border-color: #A2AAB8;
 }
+.htmlarea-context-menu .x-menu-scroller {
+	background: #F5F5F5;
+	height: 20px;
+	line-height: 20px;
+	position: relative;
+}
+.htmlarea-context-menu .x-menu-scroller.x-menu-scroller-top {
+	border-bottom: 1px solid #D7D7D7;
+}
+.htmlarea-context-menu .x-menu-scroller.x-menu-scroller-bottom {
+	border-top: 1px solid #D7D7D7;
+}
+.htmlarea-context-menu .x-menu-scroller.x-menu-scroller-top:after,
+.htmlarea-context-menu .x-menu-scroller.x-menu-scroller-bottom:after {
+	font-family: 'FontAwesome';
+	font-size: 12px;
+	display: block;
+	position: absolute;
+	margin-left: 50%;
+	top: 0;
+}
+.htmlarea-context-menu .x-menu-scroller.x-menu-scroller-top:after {
+	content: "\f0d8";
+}
+.htmlarea-context-menu .x-menu-scroller.x-menu-scroller-bottom:after {
+	content: "\f0d7";
+}
+.htmlarea-context-menu .x-menu-item-active,
+.htmlarea-context-menu .x-menu-item.hover {
+	background-color: #D7D7D7;
+}
 .htmlarea-context-menu .x-menu-item-icon {
 	background-image: url("../../Images/Sprites/actions.png");
 	background-repeat: no-repeat;
diff --git a/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/Plugins/ContextMenu.js b/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/Plugins/ContextMenu.js
index 19363aed3f0efc9bfa028bf13a2afa1f9110b04f..dce590474c7730ec77a335da4ef038b93de9020b 100644
--- a/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/Plugins/ContextMenu.js
+++ b/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/Plugins/ContextMenu.js
@@ -66,6 +66,7 @@ define(['TYPO3/CMS/Rtehtmlarea/HTMLArea/Plugin/Plugin',
 			this.menu = new Ext.menu.Menu(Util.applyIf({
 				cls: 'htmlarea-context-menu',
 				defaultType: 'menuitem',
+				shadow: false,
 				maxHeight: this.editor.iframe.height - this.editor.document.documentElement.clientHeight,
 				listeners: {
 					itemClick: {