diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 67e63e3e62..cd49bef412 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -320,7 +320,6 @@ module.exports = React.createClass({
                 left -= 15;
             }
         }
-        var editButton;
         var remText;
         if (!this.state.allReadAvatars) {
             var remainder = receipts.length - MAX_READ_AVATARS;
@@ -331,15 +330,9 @@ module.exports = React.createClass({
                 </span>;
                 left -= 15;
             }
-            editButton = (
-                <input style={{ left: left }}
-                    type="image" src="img/edit.png" alt="Options" title="Options" width="14" height="14"
-                    className="mx_EventTile_editButton" onClick={this.onEditClicked} />
-            );
         }
 
         return <span className="mx_EventTile_readAvatars">
-            { editButton }
             { remText }
             { avatars }
         </span>;
@@ -417,6 +410,11 @@ module.exports = React.createClass({
                 sender = <SenderProfile onClick={ this.onSenderProfileClick } mxEvent={this.props.mxEvent} aux={aux} />;
             }
         }
+
+        var editButton = (
+            <input type="image" src="img/icon_context_message.svg" alt="Options" title="Options" width="19" height="19" className="mx_EventTile_editButton" onClick={this.onEditClicked} />
+        );
+
         return (
             <div className={classes}>
                 <div className="mx_EventTile_msgOption">
@@ -432,6 +430,7 @@ module.exports = React.createClass({
                         highlightLink={this.props.highlightLink}
                         showUrlPreview={this.props.showUrlPreview}
                         onWidgetLoad={this.props.onWidgetLoad} />
+                    { editButton }
                 </div>
             </div>
         );