diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 6363750f4c..bbca1c3498 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -219,7 +219,7 @@ limitations under the License.
     width: auto;
 }
 
-.mx_EventTile_editButton {
+.mx_EventTile_optionsButton {
     position: absolute;
     display: inline-block;
     visibility: hidden;
@@ -232,8 +232,8 @@ limitations under the License.
     user-select: none;
 }
 
-.mx_EventTile:hover .mx_EventTile_editButton,
-.mx_EventTile.menu .mx_EventTile_editButton {
+.mx_EventTile:hover .mx_EventTile_optionsButton,
+.mx_EventTile.menu .mx_EventTile_optionsButton {
     visibility: visible;
 }
 
@@ -551,7 +551,7 @@ limitations under the License.
         top: 3px;
     }
 
-    .mx_EventTile_editButton {
+    .mx_EventTile_optionsButton {
         top: 3px;
     }
 
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index d7c9f1e443..933f134be7 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -309,7 +309,7 @@ module.exports = withMatrixClient(React.createClass({
         return actions.tweaks.highlight;
     },
 
-    onEditClicked: function(e) {
+    onOptionsClicked: function(e) {
         const MessageContextMenu = sdk.getComponent('context_menus.MessageContextMenu');
         const buttonRect = e.target.getBoundingClientRect();
 
@@ -602,8 +602,8 @@ module.exports = withMatrixClient(React.createClass({
             }
         }
 
-        const editButton = (
-            <span className="mx_EventTile_editButton" title={_t("Options")} onClick={this.onEditClicked} />
+        const optionsButton = (
+            <span className="mx_EventTile_optionsButton" title={_t("Options")} onClick={this.onOptionsClicked} />
         );
 
         const timestamp = this.props.mxEvent.getTs() ?
@@ -755,7 +755,7 @@ module.exports = withMatrixClient(React.createClass({
                                            showUrlPreview={this.props.showUrlPreview}
                                            onHeightChanged={this.props.onHeightChanged} />
                             { keyRequestInfo }
-                            { editButton }
+                            { optionsButton }
                         </div>
                         {
                             // The avatar goes after the event tile as it's absolutly positioned to be over the