2 files changed, 22 insertions, 24 deletions
diff --git a/app/views/profiles/chat_names/_chat_name.html.haml b/app/views/profiles/chat_names/_chat_name.html.haml
index afc3894c23b..0ac8ede3c62 100644
--- a/app/views/profiles/chat_names/_chat_name.html.haml
+++ b/app/views/profiles/chat_names/_chat_name.html.haml
@@ -10,4 +10,4 @@
       = _('Never')
 
   %td
-    = link_to _('Remove'), profile_chat_name_path(chat_name), method: :delete, class: 'gl-button btn btn-danger float-right', aria: { label: _('Remove') }, data: { confirm: _('Are you sure you want to remove this nickname?'), confirm_btn_variant: 'danger' }
+    = link_button_to _('Remove'), profile_chat_name_path(chat_name), method: :delete, class: 'float-right', aria: { label: _('Remove') }, data: { confirm: _('Are you sure you want to remove this nickname?'), confirm_btn_variant: 'danger' }, variant: :danger
diff --git a/app/views/profiles/chat_names/index.html.haml b/app/views/profiles/chat_names/index.html.haml
index 264ee040d7d..7a63fc30d9c 100644
--- a/app/views/profiles/chat_names/index.html.haml
+++ b/app/views/profiles/chat_names/index.html.haml
@@ -2,29 +2,27 @@
 - @hide_search_settings = true
 - @force_desktop_expanded_sidebar = true
 
-.row.gl-mt-5.js-search-settings-section
-  .col-lg-4.profile-settings-sidebar
-    %h4.gl-mt-0
-      = page_title
-    %p
-      = _('You can see your chat accounts.')
+.settings-section.js-search-settings-section.gl-mt-3
+  .settings-sticky-header
+    .settings-sticky-header-inner
+      %h4.gl-my-0
+        = page_title
 
-  .col-lg-8
-    %h5.gl-mt-0
-      = sprintf(_('Active chat names (%{count})'), { count: @chat_names.size })
+  %h5.gl-font-lg.gl-mt-0
+    = sprintf(_('Active chat names (%{count})'), { count: @chat_names.size })
 
-    - if @chat_names.present?
-      .table-responsive
-        %table.table
-          %thead
-            %tr
-              %th= _('Team domain')
-              %th= _('Nickname')
-              %th= _('Last used')
-              %th
-          %tbody
-            = render @chat_names
+  - if @chat_names.present?
+    .table-responsive
+      %table.table
+        %thead
+          %tr
+            %th= _('Team domain')
+            %th= _('Nickname')
+            %th= _('Last used')
+            %th
+        %tbody
+          = render @chat_names
 
-    - else
-      .settings-message.text-center
-        = _("You don't have any active chat names.")
+  - else
+    .gl-text-secondary.settings-message
+      = _("You don't have any active chat names.")