diff --git a/res/css/structures/_TabbedView.scss b/res/css/structures/_TabbedView.scss
index 1118ac7aea..72bbbeff22 100644
--- a/res/css/structures/_TabbedView.scss
+++ b/res/css/structures/_TabbedView.scss
@@ -55,6 +55,7 @@ limitations under the License.
 .mx_TabbedView_maskedIcon {;
   margin-left: 6px;
   margin-right: 9px;
+  margin-top: 1px;
   width: 14px;
   height: 14px;
   display: inline-block;
@@ -66,7 +67,7 @@ limitations under the License.
   mask-repeat: no-repeat;
   mask-size: 14px;
   width: 14px;
-  height: 15px;
+  height: 18px;
   mask-position: center;
   content: '';
   vertical-align: middle;
diff --git a/res/css/views/dialogs/_UserSettingsDialog.scss b/res/css/views/dialogs/_UserSettingsDialog.scss
index 6872149318..c29c04a273 100644
--- a/res/css/views/dialogs/_UserSettingsDialog.scss
+++ b/res/css/views/dialogs/_UserSettingsDialog.scss
@@ -46,6 +46,5 @@ limitations under the License.
 }
 
 .mx_UserSettingsDialog_flairIcon:before {
-  // TODO: Use the real icon
-  mask-image: url('$(res)/img/feather-icons/flag.svg');
+  mask-image: url('$(res)/img/feather-icons/flair.svg');
 }
diff --git a/res/img/feather-icons/flair.svg b/res/img/feather-icons/flair.svg
new file mode 100644
index 0000000000..ce3a5ed6ad
--- /dev/null
+++ b/res/img/feather-icons/flair.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="14" viewBox="0 0 10 14">
+    <g fill="none" fill-rule="evenodd" stroke="#454545" stroke-linecap="round" stroke-linejoin="round" transform="translate(1 1)">
+        <ellipse cx="4" cy="3.818" rx="4" ry="3.818"/>
+        <path d="M1.834 7.03L1.143 12 4 10.364 6.857 12l-.691-4.975"/>
+    </g>
+</svg>