diff --git a/res/css/views/elements/_Tooltip.scss b/res/css/views/elements/_Tooltip.scss
index 66e8b5943f..3a6b6fb936 100644
--- a/res/css/views/elements/_Tooltip.scss
+++ b/res/css/views/elements/_Tooltip.scss
@@ -82,6 +82,9 @@ limitations under the License.
     text-align: center;
     border: none;
     border-radius: 3px;
+    font-size: 14px;
+    line-height: 1.2;
+    padding: 6px 8px;
 
     .mx_Tooltip_chevron::after {
         border-right-color: $tooltip-timeline-bg-color;
diff --git a/res/css/views/messages/_ReactionsRowButtonTooltip.scss b/res/css/views/messages/_ReactionsRowButtonTooltip.scss
index 95e339144f..cf4219fcec 100644
--- a/res/css/views/messages/_ReactionsRowButtonTooltip.scss
+++ b/res/css/views/messages/_ReactionsRowButtonTooltip.scss
@@ -14,11 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_ReactionsRowButtonTooltip {
-    font-size: 8px;
-    padding: 6px;
-
-    .mx_ReactionsRowButtonTooltip_reactedWith {
-        opacity: 0.7;
-    }
+.mx_ReactionsRowButtonTooltip_reactedWith {
+    opacity: 0.7;
 }
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index aa473ec317..8f67069c82 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -490,11 +490,6 @@ 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/ReactionsRowButtonTooltip.js b/src/components/views/messages/ReactionsRowButtonTooltip.js
index 709c20c113..4f26cea708 100644
--- a/src/components/views/messages/ReactionsRowButtonTooltip.js
+++ b/src/components/views/messages/ReactionsRowButtonTooltip.js
@@ -69,7 +69,7 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent {
         let tooltip;
         if (tooltipLabel) {
             tooltip = <Tooltip
-                tooltipClassName="mx_ReactionsRowButtonTooltip mx_Tooltip_timeline"
+                tooltipClassName="mx_Tooltip_timeline"
                 visible={visible}
                 label={tooltipLabel}
             />;
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 44c807e4e4..ea7f634691 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -449,8 +449,8 @@ module.exports = React.createClass({
             const editEvent = this.props.mxEvent.replacingEvent();
             const date = editEvent && formatDate(editEvent.getDate());
             editedTooltip = <Tooltip
-                tooltipClassName="mx_EventTile_editedTooltip mx_Tooltip_timeline"
-                label={_t("Edited at %(date)s.", {date})}
+                tooltipClassName="mx_Tooltip_timeline"
+                label={_t("Edited at %(date)s", {date})}
             />;
         }
         return (
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9d54a65eda..86131645cf 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -917,7 +917,7 @@
     "Failed to copy": "Failed to copy",
     "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 at %(date)s": "Edited at %(date)s",
     "edited": "edited",
     "Removed or unknown message type": "Removed or unknown message type",
     "Message removed by %(userId)s": "Message removed by %(userId)s",