diff --git a/res/css/views/settings/_EmailAddresses.scss b/res/css/views/settings/_EmailAddresses.scss
index 4f9541af2c..d7606ecea9 100644
--- a/res/css/views/settings/_EmailAddresses.scss
+++ b/res/css/views/settings/_EmailAddresses.scss
@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 .mx_ExistingEmailAddress {
+    display: flex;
+    align-items: center;
     margin-bottom: 5px;
 }
 
@@ -24,14 +26,12 @@ limitations under the License.
     vertical-align: middle;
 }
 
-.mx_ExistingEmailAddress_email {
-    vertical-align: middle;
-}
-
+.mx_ExistingEmailAddress_email,
 .mx_ExistingEmailAddress_promptText {
+    flex: 1;
     margin-right: 10px;
 }
 
 .mx_ExistingEmailAddress_confirmBtn {
-    margin-right: 5px;
+    margin-left: 5px;
 }
diff --git a/res/css/views/settings/_PhoneNumbers.scss b/res/css/views/settings/_PhoneNumbers.scss
index a3891882c2..7aaef2a56b 100644
--- a/res/css/views/settings/_PhoneNumbers.scss
+++ b/res/css/views/settings/_PhoneNumbers.scss
@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 .mx_ExistingPhoneNumber {
+    display: flex;
+    align-items: center;
     margin-bottom: 5px;
 }
 
@@ -24,16 +26,14 @@ limitations under the License.
     vertical-align: middle;
 }
 
-.mx_ExistingPhoneNumber_address {
-    vertical-align: middle;
-}
-
+.mx_ExistingPhoneNumber_address,
 .mx_ExistingPhoneNumber_promptText {
+    flex: 1;
     margin-right: 10px;
 }
 
 .mx_ExistingPhoneNumber_confirmBtn {
-    margin-right: 5px;
+    margin-left: 5px;
 }
 
 .mx_PhoneNumbers_input {
diff --git a/src/components/views/settings/EmailAddresses.js b/src/components/views/settings/EmailAddresses.js
index b221f91901..1bb41ae8b5 100644
--- a/src/components/views/settings/EmailAddresses.js
+++ b/src/components/views/settings/EmailAddresses.js
@@ -102,9 +102,10 @@ export class ExistingEmailAddress extends React.Component {
 
         return (
             <div className="mx_ExistingEmailAddress">
-                <img src={require("../../../../res/img/feather-customised/cancel.svg")} width={14} height={14}
-                     onClick={this._onRemove} className="mx_ExistingEmailAddress_delete" alt={_t("Remove")} />
                 <span className="mx_ExistingEmailAddress_email">{this.props.email.address}</span>
+                <AccessibleButton onClick={this._onRemove} kind="danger_sm">
+                    {_t("Remove")}
+                </AccessibleButton>
             </div>
         );
     }
diff --git a/src/components/views/settings/PhoneNumbers.js b/src/components/views/settings/PhoneNumbers.js
index 5d1d9b849f..4ebc2a20a6 100644
--- a/src/components/views/settings/PhoneNumbers.js
+++ b/src/components/views/settings/PhoneNumbers.js
@@ -97,9 +97,10 @@ export class ExistingPhoneNumber extends React.Component {
 
         return (
             <div className="mx_ExistingPhoneNumber">
-                <img src={require("../../../../res/img/feather-customised/cancel.svg")} width={14} height={14}
-                     onClick={this._onRemove} className="mx_ExistingPhoneNumber_delete" alt={_t("Remove")} />
                 <span className="mx_ExistingPhoneNumber_address">+{this.props.msisdn.address}</span>
+                <AccessibleButton onClick={this._onRemove} kind="danger_sm">
+                    {_t("Remove")}
+                </AccessibleButton>
             </div>
         );
     }