diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
index a6b10e2435..b79db91911 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@@ -146,7 +146,12 @@ limitations under the License.
z-index: 1;
position: relative;
width: 90px;
- height: 1px; /* Hack to stop the height of this pushing the messages apart. Replaces marigin-top: -6px. This interacts better with a read marker being in between. Content overflows. */
+
+ /* Hack to stop the height of this pushing the messages apart.
+ Replaces margin-top: -6px. This interacts better with a read
+ marker being in between. Content overflows. */
+ height: 1px;
+
margin-right: 10px;
}
@@ -172,6 +177,9 @@ limitations under the License.
cursor: pointer;
top: 6px;
right: 6px;
+ width: 19px;
+ height: 19px;
+ background-image: url($edit-button-url);
}
.mx_EventTile:hover .mx_EventTile_editButton,
diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss
index 6488794d6c..ad18eb49c2 100644
--- a/src/skins/vector/css/themes/_base.scss
+++ b/src/skins/vector/css/themes/_base.scss
@@ -88,6 +88,8 @@ $event-notsent-color: #f44;
// event timestamp
$event-timestamp-color: #acacac;
+$edit-button-url: "/img/icon_context_message.svg";
+
// e2e
$e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
$e2e-unverified-color: #e8bf37;
diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss
index 62e89a7bfb..e3e32e8442 100644
--- a/src/skins/vector/css/themes/_dark.scss
+++ b/src/skins/vector/css/themes/_dark.scss
@@ -88,6 +88,8 @@ $event-notsent-color: #f44;
// event timestamp
$event-timestamp-color: #acacac;
+$edit-button-url: "/img/icon_context_message_dark.svg";
+
// e2e
$e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
$e2e-unverified-color: #e8bf37;
diff --git a/src/skins/vector/img/icon_context_message.svg b/src/skins/vector/img/icon_context_message.svg
index c3d39b1e4b..f2ceccfa78 100644
--- a/src/skins/vector/img/icon_context_message.svg
+++ b/src/skins/vector/img/icon_context_message.svg
@@ -4,18 +4,11 @@
ED5D3E59-2561-4AC1-9B43-82FBC51767FC
Created with sketchtool.
-
-
-
-
-
-
-
+
+
+
diff --git a/src/skins/vector/img/icon_context_message_dark.svg b/src/skins/vector/img/icon_context_message_dark.svg
new file mode 100644
index 0000000000..b4336cc377
--- /dev/null
+++ b/src/skins/vector/img/icon_context_message_dark.svg
@@ -0,0 +1,15 @@
+
+