diff --git a/res/css/structures/_ContextualMenu.scss b/res/css/structures/_ContextualMenu.scss
index 647e1e00aa..fa69c6fb90 100644
--- a/res/css/structures/_ContextualMenu.scss
+++ b/res/css/structures/_ContextualMenu.scss
@@ -30,8 +30,8 @@ limitations under the License.
 }
 
 .mx_ContextualMenu {
-    border: solid 1px $menu-border-color;
-    border-radius: 4px;
+    border-radius: 2px;
+    box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.21);
     background-color: $menu-bg-color;
     color: $primary-fg-color;
     position: absolute;
@@ -43,6 +43,10 @@ limitations under the License.
     right: 8px;
 }
 
+.mx_ContextualMenu_noChevron {
+    border-radius: unset !important;
+}
+
 .mx_ContextualMenu_chevron_right {
     position: absolute;
     right: -8px;
@@ -50,7 +54,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-top: 8px solid transparent;
-    border-left: 8px solid $menu-border-color;
+    border-left: 8px solid $menu-bg-color;
     border-bottom: 8px solid transparent;
 }
 
@@ -77,7 +81,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-top: 8px solid transparent;
-    border-right: 8px solid $menu-border-color;
+    border-right: 8px solid $menu-bg-color;
     border-bottom: 8px solid transparent;
 }
 
@@ -104,7 +108,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-left: 8px solid transparent;
-    border-bottom: 8px solid $menu-border-color;
+    border-bottom: 8px solid $menu-bg-color;
     border-right: 8px solid transparent;
 }
 
@@ -131,7 +135,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-left: 8px solid transparent;
-    border-top: 8px solid $menu-border-color;
+    border-top: 8px solid $menu-bg-color;
     border-right: 8px solid transparent;
 }
 
diff --git a/res/css/views/rooms/_RoomTooltip.scss b/res/css/views/rooms/_RoomTooltip.scss
index 9988425b8f..295786d2d3 100644
--- a/res/css/views/rooms/_RoomTooltip.scss
+++ b/res/css/views/rooms/_RoomTooltip.scss
@@ -21,7 +21,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-top: 8px solid transparent;
-    border-right: 8px solid $menu-border-color;
+    border-right: 8px solid $menu-bg-color;
     border-bottom: 8px solid transparent;
 }
 
@@ -40,8 +40,8 @@ limitations under the License.
 .mx_RoomTooltip {
     display: none;
     position: fixed;
-    border: 1px solid $menu-border-color;
     border-radius: 5px;
+    box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.21);
     background-color: $primary-bg-color;
     z-index: 2000;
     padding: 5px;
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 8ab338790e..e5a059f22c 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -1,6 +1,6 @@
 
 // typical text (dark-on-white in light skin)
-$primary-fg-color: #dddddd;
+$primary-fg-color: #212121;
 $primary-bg-color: #2d2d2d;
 
 // used for focusing form controls
@@ -72,9 +72,11 @@ $input-fg-color: $primary-fg-color;
 // context menus
 $menu-border-color: rgba(187, 187, 187, 0.5);
 $menu-bg-color: #373737;
+$menu-selected-color: #f5f8fa;
 
 $avatar-initial-color: #2d2d2d;
 $avatar-bg-color: #ffffff;
+$menu-selected-color: #f5f8fa;
 
 $h3-color: $primary-fg-color;
 
diff --git a/res/themes/dharma/css/_dharma.scss b/res/themes/dharma/css/_dharma.scss
index 4e4b2cd66f..f84844d6d2 100644
--- a/res/themes/dharma/css/_dharma.scss
+++ b/res/themes/dharma/css/_dharma.scss
@@ -76,8 +76,9 @@ $input-underline-color: rgba(151, 151, 151, 0.5);
 $input-fg-color: rgba(74, 74, 74, 0.9);
 
 // context menus
-$menu-border-color: rgba(187, 187, 187, 0.5);
-$menu-bg-color: #f6f6f6;
+$menu-border-color: #ebedf8;
+$menu-bg-color: #fff;
+$menu-selected-color: #f5f8fa;
 
 $avatar-initial-color: #ffffff;
 $avatar-bg-color: #ffffff;
diff --git a/res/themes/light/css/_base.scss b/res/themes/light/css/_base.scss
index c17eba5398..a468b3e3f3 100644
--- a/res/themes/light/css/_base.scss
+++ b/res/themes/light/css/_base.scss
@@ -77,6 +77,7 @@ $input-fg-color: rgba(74, 74, 74, 0.9);
 // context menus
 $menu-border-color: rgba(187, 187, 187, 0.5);
 $menu-bg-color: #f6f6f6;
+$menu-selected-color: #f5f8fa;
 
 $avatar-initial-color: #ffffff;
 $avatar-bg-color: #ffffff;
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index be718050c1..c990b5705d 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -333,7 +333,7 @@ module.exports = React.createClass({
         }
 
         return (
-            <div>
+            <div className="mx_MessageContextMenu">
                 { resendButton }
                 { redactButton }
                 { cancelButton }
diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js
index ce9895447e..8e56c055f9 100644
--- a/src/components/views/context_menus/RoomTileContextMenu.js
+++ b/src/components/views/context_menus/RoomTileContextMenu.js
@@ -243,7 +243,7 @@ module.exports = React.createClass({
         });
 
         return (
-            <div>
+            <div className="mx_RoomTileContextMenu">
                 <div className="mx_RoomTileContextMenu_notif_picker" >
                     <img src="img/notif-slider.svg" width="20" height="107" />
                 </div>