diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 0c36f2e2..2892a121 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -133,12 +133,14 @@
 <script src="./user_profile.js"></script>
 
 <style lang="scss">
+@import '../../_variables.scss';
 
 .user-profile {
   flex: 2;
   flex-basis: 500px;
 
   .user-profile-fields {
+    margin: 0 0.5em;
     img {
       object-fit: contain;
       vertical-align: middle;
@@ -146,28 +148,28 @@
       max-height: 400px;
 
       &.emoji {
-        width: 18px;
-        height: 18px;
+        width: 24px;
+        height: 24px;
       }
     }
 
     .user-profile-field {
       display: flex;
-      margin: 1em 1.5em;
+      margin: 0.25em auto;
+      max-width: 32em;
 
       .user-profile-field-name {
-        flex: 0 0 auto;
+        flex: 0 1 30%;
         font-weight: 500;
         text-align: right;
         color: var(--lightText);
-        width: 30%;
         min-width: 120px;
       }
 
       .user-profile-field-value {
         flex: 1 1 auto;
         color: var(--text);
-        margin-left: 10px;
+        margin: 0 0 0 0.25em;
       }
 
       .user-profile-field-name, .user-profile-field-value {
@@ -175,6 +177,14 @@
         text-overflow: ellipsis;
         white-space: nowrap;
         overflow: hidden;
+        padding: 0.5em 1.5em;
+        box-sizing: border-box;
+
+        border: var(--border, $fallback--border);
+        border-radius: $fallback--inputRadius;
+        border-radius: var(--inputRadius, $fallback--inputRadius);
+        border-style: solid;
+        border-width: 1px;
       }
     }
   }
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index ff99e944..c30f6f0a 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -58,8 +58,8 @@ export const parseUser = (data) => {
     })
     output.fields_text = data.fields.map(field => {
       return {
-        name: field.name.replace(/<[^>]*>/g, ''),
-        value: field.value.replace(/<[^>]*>/g, '')
+        name: unescape(field.name.replace(/<[^>]*>/g, '')),
+        value: unescape(field.value.replace(/<[^>]*>/g, ''))
       }
     })