diff --git a/res/css/views/messages/_CallEvent.scss b/res/css/views/messages/_CallEvent.scss
index 9c5de99aba..fec5114a1c 100644
--- a/res/css/views/messages/_CallEvent.scss
+++ b/res/css/views/messages/_CallEvent.scss
@@ -28,13 +28,17 @@ limitations under the License.
     height: 60px;
 
     &.mx_CallEvent_voice {
-        .mx_CallEvent_type_icon::before {
+        .mx_CallEvent_type_icon::before,
+        .mx_CallEvent_content_button_callBack span::before,
+        .mx_CallEvent_content_button_answer span::before {
             mask-image: url('$(res)/img/element-icons/call/voice-call.svg');
         }
     }
 
     &.mx_CallEvent_video {
-        .mx_CallEvent_type_icon::before {
+        .mx_CallEvent_type_icon::before,
+        .mx_CallEvent_content_button_callBack span::before,
+        .mx_CallEvent_content_button_answer span::before {
             mask-image: url('$(res)/img/element-icons/call/video-call.svg');
         }
     }
@@ -95,10 +99,28 @@ limitations under the License.
             height: 24px;
             padding: 0px 12px;
             margin-left: 8px;
+
+            span {
+                padding: 8px 0;
+                display: flex;
+                align-items: center;
+
+                &::before {
+                    content: '';
+                    display: inline-block;
+                    background-color: $button-fg-color;
+                    mask-position: center;
+                    mask-repeat: no-repeat;
+                    mask-size: 16px;
+                    width: 16px;
+                    height: 16px;
+                    margin-right: 8px;
+                }
+            }
         }
 
-        .mx_CallEvent_content_button_callBack {
-            margin-left: 10px; // To match mx_callEvent
+        .mx_CallEvent_content_button_reject span::before {
+            mask-image: url('$(res)/img/element-icons/call/hangup.svg');
         }
 
         .mx_CallEvent_content_tooltip {
diff --git a/src/components/views/messages/CallEvent.tsx b/src/components/views/messages/CallEvent.tsx
index edbfdff6de..2d40d8cac1 100644
--- a/src/components/views/messages/CallEvent.tsx
+++ b/src/components/views/messages/CallEvent.tsx
@@ -85,18 +85,18 @@ export default class CallEvent extends React.Component<IProps, IState> {
                         title={this.state.silenced ? _t("Sound on"): _t("Silence call")}
                     />
                     <AccessibleButton
-                        className="mx_CallEvent_content_button"
+                        className="mx_CallEvent_content_button mx_CallEvent_content_button_reject"
                         onClick={ this.props.callEventGrouper.rejectCall }
                         kind="danger"
                     >
-                        { _t("Decline") }
+                        <span> { _t("Decline") } </span>
                     </AccessibleButton>
                     <AccessibleButton
-                        className="mx_CallEvent_content_button"
+                        className="mx_CallEvent_content_button mx_CallEvent_content_button_answer"
                         onClick={ this.props.callEventGrouper.answerCall }
                         kind="primary"
                     >
-                        { _t("Accept") }
+                        <span> { _t("Accept") } </span>
                     </AccessibleButton>
                 </div>
             );
@@ -168,7 +168,7 @@ export default class CallEvent extends React.Component<IProps, IState> {
                         onClick={ this.props.callEventGrouper.callBack }
                         kind="primary"
                     >
-                        { _t("Call back") }
+                        <span> { _t("Call back") } </span>
                     </AccessibleButton>
                 </div>
             );