diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 8f67069c82..aa473ec317 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -490,6 +490,11 @@ limitations under the License.
 }
 */
 
+.mx_EventTile_editedTooltip {
+    font-size: 10px;
+    padding: 5px 6px;
+}
+
 /* end of overrides */
 
 .mx_MatrixChat_useCompactLayout {
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 0ca4711b07..44c807e4e4 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -448,14 +448,17 @@ module.exports = React.createClass({
             const Tooltip = sdk.getComponent('elements.Tooltip');
             const editEvent = this.props.mxEvent.replacingEvent();
             const date = editEvent && formatDate(editEvent.getDate());
-            editedTooltip = <Tooltip label={_t("Edited at %(date)s.", {date})} />;
+            editedTooltip = <Tooltip
+                tooltipClassName="mx_EventTile_editedTooltip mx_Tooltip_timeline"
+                label={_t("Edited at %(date)s.", {date})}
+            />;
         }
         return (
             <div
                 key="editedMarker" className="mx_EventTile_edited"
                 onMouseEnter={this._onMouseEnterEditedMarker}
                 onMouseLeave={this._onMouseLeaveEditedMarker}
-            >{editedTooltip}<span>{`(${_t("Edited")})`}</span></div>
+            >{editedTooltip}<span>{`(${_t("edited")})`}</span></div>
         );
     },
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3a740ea515..9d54a65eda 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -918,7 +918,7 @@
     "Add an Integration": "Add an Integration",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?",
     "Edited at %(date)s.": "Edited at %(date)s.",
-    "Edited": "Edited",
+    "edited": "edited",
     "Removed or unknown message type": "Removed or unknown message type",
     "Message removed by %(userId)s": "Message removed by %(userId)s",
     "Message removed": "Message removed",