diff --git a/src/components/views/context_menus/NotificationStateContextMenu.js b/src/components/views/context_menus/NotificationStateContextMenu.js
index bea226a170..17f75f807d 100644
--- a/src/components/views/context_menus/NotificationStateContextMenu.js
+++ b/src/components/views/context_menus/NotificationStateContextMenu.js
@@ -112,22 +112,25 @@ module.exports = React.createClass({
 
         return (
             <div>
+                <div className="mx_NotificationStateContextMenu_picker" >
+                    <img src="img/notif-slider.svg" width="20" height="107" />
+                </div>
                 <div className={ alertMeClasses } onClick={this._onClickAlertMe} >
-                    <img src="img/icon-context-mute-off-copy.svg" width="15" height="10" />
+                    <img src="img/icon-context-mute-off-copy.svg" width="20" height="12" />
                     Alert me
                 </div>
                 <div className={ allNotifsClasses } onClick={this._onClickAllNotifs} >
-                    { !this.state.areNotifsMuted ? "ON" : "OFF" }
-                    <img src="img/icon-context-mute-off.svg" width="15" height="10" />
+                    <img className="mx_NotificationStateContextMenu_activeIcon" src="img/notif-active.svg" width="12" height="12" />
+                    <img src="img/icon-context-mute-off.svg" width="20" height="12" />
                     All notifications
                 </div>
                 <div className={ mentionsClasses } onClick={this._onClickMentions} >
-                    <img src="img/icon-context-mute-mentions.svg" width="15" height="10" />
+                    <img src="img/icon-context-mute-mentions.svg" width="20" height="12" />
                     Mentions only
                 </div>
                 <div className={ muteNotifsClasses } onClick={this._onClickMute} >
-                    { this.state.areNotifsMuted ? "ON" : "OFF" }
-                    <img src="img/icon-context-mute.svg" width="15" height="10" />
+                    <img className="mx_NotificationStateContextMenu_activeIcon" src="img/notif-active.svg" width="12" height="12" />
+                    <img src="img/icon-context-mute.svg" width="20" height="12" />
                     Mute
                 </div>
             </div>
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/ContextualMenu.css b/src/skins/vector/css/matrix-react-sdk/structures/ContextualMenu.css
index f626cddded..7523bd103c 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/ContextualMenu.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/ContextualMenu.css
@@ -37,6 +37,7 @@ limitations under the License.
     position: absolute;
     padding: 6px;
 	font-size: 14px;
+    z-index: 2001;
 }
 
 .mx_ContextualMenu.mx_ContextualMenu_right {
diff --git a/src/skins/vector/css/vector-web/views/context_menus/NotificationStateContextMenu.css b/src/skins/vector/css/vector-web/views/context_menus/NotificationStateContextMenu.css
index b8e312b61d..86d70e4408 100644
--- a/src/skins/vector/css/vector-web/views/context_menus/NotificationStateContextMenu.css
+++ b/src/skins/vector/css/vector-web/views/context_menus/NotificationStateContextMenu.css
@@ -14,16 +14,37 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_NotificationStateContextMenu_picker {
+    position: absolute;
+    top: 16px;
+}
+
 .mx_NotificationStateContextMenu_field {
-    padding: 3px 6px 3px 6px;
+    padding-top: 4px;
+    padding-right: 6px;
+    padding-bottom: 10px;
+    padding-left: 26px;
     cursor: pointer;
-    width: 174px;
+    white-space: nowrap;
+    display: flex;
+    align-items: center;
 }
 
 .mx_NotificationStateContextMenu_field.mx_NotificationStateContextMenu_fieldSet {
     font-weight: bold;
+    padding-left: 14px;
 }
 
 .mx_NotificationStateContextMenu_field.mx_NotificationStateContextMenu_fieldDisabled {
     color: rgba(0, 0, 0, 0.2);
 }
+
+.mx_NotificationStateContextMenu_activeIcon {
+    display: none;
+    position: relative;
+    left: -9px;
+}
+
+.mx_NotificationStateContextMenu_fieldSet .mx_NotificationStateContextMenu_activeIcon {
+    display: inline-block;
+}
diff --git a/src/skins/vector/img/notif-active.svg b/src/skins/vector/img/notif-active.svg
new file mode 100644
index 0000000000..9eb279f851
--- /dev/null
+++ b/src/skins/vector/img/notif-active.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="13px" height="13px" viewBox="0 0 13 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>E15782FC-B5FA-472A-AE12-CFFF484E7253</title>
+    <desc>Created with sketchtool.</desc>
+    <defs></defs>
+    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Left-Panel-mention-states" transform="translate(-221.000000, -165.000000)">
+            <g id="notification-shortcuts" transform="translate(206.000000, 119.000000)">
+                <g id="slider" transform="translate(16.000000, 16.000000)">
+                    <g id="notif_active" transform="translate(0.000000, 31.000000)">
+                        <circle id="Oval-190" stroke="#62A887" fill="#76CFA6" cx="5.5" cy="5.5" r="5.5"></circle>
+                        <path d="M2.5,6.5 L4,8" id="Line" stroke="#FFFFFF" stroke-linecap="round"></path>
+                        <path d="M4,2.97753906 L8.30664062,8" id="Line-Copy" stroke="#FFFFFF" stroke-linecap="round" transform="translate(6.153320, 5.488770) scale(-1, 1) translate(-6.153320, -5.488770) "></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/skins/vector/img/notif-slider.svg b/src/skins/vector/img/notif-slider.svg
new file mode 100644
index 0000000000..55fa06d11a
--- /dev/null
+++ b/src/skins/vector/img/notif-slider.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="7px" height="109px" viewBox="0 0 7 109" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+    <title>16CB4618-0BD3-4568-BB20-FC56EBC46046</title>
+    <desc>Created with sketchtool.</desc>
+    <defs></defs>
+    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.2">
+        <g id="Left-Panel-mention-states" transform="translate(-224.000000, -134.000000)" stroke="#000000">
+            <g id="notification-shortcuts" transform="translate(206.000000, 119.000000)">
+                <g id="slider" transform="translate(16.000000, 16.000000)">
+                    <g id="notif_slider" transform="translate(3.000000, 0.000000)">
+                        <path d="M2.5,3.49505001 L2.5,104.507355" id="Line" stroke-linecap="square"></path>
+                        <circle id="Oval-187" fill="#F7F7F7" cx="2.5" cy="36.5" r="2.5"></circle>
+                        <path d="M2.5,73 C3.88071187,73 5,71.8807119 5,70.5 C5,69.1192881 3.88071187,68 2.5,68 C1.11928813,68 0,69.1192881 0,70.5 C0,71.8807119 1.11928813,73 2.5,73 Z" id="Oval-187-Copy" fill="#F7F7F7"></path>
+                        <path d="M2.5,5 C3.88071187,5 5,3.88071187 5,2.5 C5,1.11928813 3.88071187,0 2.5,0 C1.11928813,0 0,1.11928813 0,2.5 C0,3.88071187 1.11928813,5 2.5,5 Z" id="Oval-187-Copy-3" fill="#F7F7F7"></path>
+                        <circle id="Oval-187-Copy-2" fill="#F7F7F7" cx="2.5" cy="104.5" r="2.5"></circle>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>