diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
index e8308afb71..2641f803a4 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
@@ -61,14 +61,16 @@ limitations under the License.
     color: #acacac;
     font-size: 11px;
     left: -57px;
-    top: 3px;
+    top: 8px;
     position: absolute;
 }
 
 .mx_EventTile_line {
     position: relative;
     /* ideally should be 100px, but 95px gives us a max thumbnail size of 800x600, which is nice */
-    margin-right: 95px;
+    margin-right: 125px;
+    padding-top: 5px;
+    padding-bottom: 7px;
 }
 
 /* all the overflow-y: hidden; are to trap Zalgos -
@@ -188,6 +190,10 @@ limitations under the License.
     text-decoration: none;
 }
 
+.mx_EventTile:hover .mx_EventTile_line {
+    background-color: #f7f7f7;
+}
+
 .mx_EventTile_last .mx_MessageTimestamp {
     visibility: visible;
 }
@@ -200,6 +206,8 @@ limitations under the License.
     position: absolute;
     display: inline-block;
     visibility: hidden;
+    top: 5px;
+    right: -20px;
 }
 
 .mx_EventTile:hover .mx_EventTile_editButton {
@@ -219,11 +227,11 @@ limitations under the License.
     display: inline-block;
     width: 14px;
     height: 14px;
-    top: 20px;
+    top: 25px;
 }
 
 .mx_EventTile_continuation .mx_EventTile_readAvatars {
-    top: 1px;
+    top: 7px;
 }
 
 .mx_EventTile_readAvatars .mx_BaseAvatar {
diff --git a/src/skins/vector/img/icon_context_message.svg b/src/skins/vector/img/icon_context_message.svg
new file mode 100644
index 0000000000..3afcb77367
--- /dev/null
+++ b/src/skins/vector/img/icon_context_message.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="19px" height="19px" viewBox="0 0 19 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 39 (31667) - http://www.bohemiancoding.com/sketch -->
+    <title>BB29E674-B289-42B1-B450-BA3C424E3671</title>
+    <desc>Created with sketchtool.</desc>
+    <defs></defs>
+    <g id="Screens-revised" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="02_18-Chat-message-states-FIX" transform="translate(-829.000000, -229.000000)">
+            <g id="Group-3-Copy-7" transform="translate(239.000000, 204.000000)">
+                <g id="icon_context-copy-7" transform="translate(590.000000, 25.000000)">
+                    <path d="M9.5,19 C14.7467051,19 19,14.7467051 19,9.5 C19,4.25329488 14.7467051,0 9.5,0 C4.25329488,0 0,4.25329488 0,9.5 C0,14.7467051 4.25329488,19 9.5,19 Z" id="Oval-69" fill="#F6F6F6" style="mix-blend-mode: multiply;"></path>
+                    <path d="M4.5,9.50063771 C4.5,9.13148623 4.59887838,8.85242947 4.7966381,8.66345907 C4.99439782,8.47448867 5.28224377,8.38000488 5.66018457,8.38000488 C6.0249414,8.38000488 6.3072941,8.47668596 6.50725115,8.67005103 C6.70720821,8.86341609 6.80718523,9.14027555 6.80718523,9.50063771 C6.80718523,9.84781589 6.70610956,10.1213794 6.50395517,10.3213365 C6.30180079,10.5212935 6.02054674,10.6212705 5.66018457,10.6212705 C5.29103309,10.6212705 5.00538444,10.5234908 4.80323006,10.3279284 C4.60107568,10.132366 4.5,9.85660521 4.5,9.50063771 L4.5,9.50063771 Z M8.3431114,9.50063771 C8.3431114,9.13148623 8.44198978,8.85242947 8.63974951,8.66345907 C8.83750923,8.47448867 9.12755247,8.38000488 9.50988794,8.38000488 C9.87464476,8.38000488 10.1569975,8.47668596 10.3569545,8.67005103 C10.5569116,8.86341609 10.6568886,9.14027555 10.6568886,9.50063771 C10.6568886,9.84781589 10.5558129,10.1213794 10.3536585,10.3213365 C10.1515042,10.5212935 9.8702501,10.6212705 9.50988794,10.6212705 C9.13634179,10.6212705 8.84849585,10.5234908 8.64634146,10.3279284 C8.44418708,10.132366 8.3431114,9.85660521 8.3431114,9.50063771 L8.3431114,9.50063771 Z M12.1928148,9.50063771 C12.1928148,9.13148623 12.2916931,8.85242947 12.4894529,8.66345907 C12.6872126,8.47448867 12.9750585,8.38000488 13.3529993,8.38000488 C13.7177562,8.38000488 14.0001089,8.47668596 14.2000659,8.67005103 C14.400023,8.86341609 14.5,9.14027555 14.5,9.50063771 C14.5,9.84781589 14.3989243,10.1213794 14.1967699,10.3213365 C13.9946156,10.5212935 13.7133615,10.6212705 13.3529993,10.6212705 C12.9838479,10.6212705 12.6981992,10.5234908 12.4960448,10.3279284 C12.2938904,10.132366 12.1928148,9.85660521 12.1928148,9.50063771 L12.1928148,9.50063771 Z" id="…" fill="#9B9B9B"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>