diff --git a/app/assets/stylesheets/snippets.scss b/app/assets/stylesheets/snippets.scss
index e1f540c0f5fecd2b3da5807ccf802761c8194106..e249ecbd10b7a864be0ce8df6fa7e07f161da92c 100644
--- a/app/assets/stylesheets/snippets.scss
+++ b/app/assets/stylesheets/snippets.scss
@@ -145,6 +145,10 @@
   }
 
   .btn-group {
+    position: relative;
+    display: inline-flex;
+    vertical-align: middle;
+
     button.btn,
     a.btn {
       background-color: $white;
diff --git a/app/helpers/snippets_helper.rb b/app/helpers/snippets_helper.rb
index 2f9117a74beaa0886ea9a917912efc6d89f3b553..31ce8317d5101000449ef1052e9e01a8052036d3 100644
--- a/app/helpers/snippets_helper.rb
+++ b/app/helpers/snippets_helper.rb
@@ -45,36 +45,26 @@ def snippet_report_abuse_path(snippet)
   def embedded_raw_snippet_button(snippet, blob)
     return if blob.empty? || blob.binary? || blob.stored_externally?
 
-    link_to(
-      external_snippet_icon('doc-code'),
-      gitlab_raw_snippet_blob_url(snippet, blob.path),
-      class: 'gl-button btn btn-default',
-      target: '_blank',
-      rel: 'noopener noreferrer',
-      title: 'Open raw'
-    )
+    render Pajamas::ButtonComponent.new(href: gitlab_raw_snippet_blob_url(snippet, blob.path), target: '_blank',
+      button_options: { rel: 'noopener noreferrer', title: 'Open raw' }) do
+      external_snippet_icon('doc-code')
+    end
   end
 
   def embedded_snippet_download_button(snippet, blob)
-    link_to(
-      external_snippet_icon('download'),
-      gitlab_raw_snippet_blob_url(snippet, blob.path, nil, inline: false),
-      class: 'gl-button btn btn-default',
-      target: '_blank',
-      title: 'Download',
-      rel: 'noopener noreferrer'
-    )
+    render Pajamas::ButtonComponent.new(href: gitlab_raw_snippet_blob_url(snippet, blob.path, nil, inline: false),
+      target: '_blank', button_options: { rel: 'noopener noreferrer', title: 'Download' }) do
+      external_snippet_icon('download')
+    end
   end
 
   def embedded_copy_snippet_button(blob)
     return unless blob.rendered_as_text?(ignore_errors: false)
 
-    content_tag(
-      :button,
-      class: 'gl-button btn btn-default copy-to-clipboard-btn',
-      title: 'Copy snippet contents',
-      onclick: "copyToClipboard('.blob-content[data-blob-id=\"#{blob.id}\"] > pre')"
-    ) do
+    button_options = { title: 'Copy snippet contents',
+                       onclick: "copyToClipboard('.blob-content[data-blob-id=\"#{blob.id}\"] > pre')" }
+
+    render Pajamas::ButtonComponent.new(button_options: button_options) do
       external_snippet_icon('copy-to-clipboard')
     end
   end
diff --git a/app/views/groups/_import_group_from_file_panel.html.haml b/app/views/groups/_import_group_from_file_panel.html.haml
index 91f7b574dbf562940d7d3b1d139f4ba7e6d02053..e3d54e52aab0ad4c192a131a007fa8013fa4c40c 100644
--- a/app/views/groups/_import_group_from_file_panel.html.haml
+++ b/app/views/groups/_import_group_from_file_panel.html.haml
@@ -20,6 +20,6 @@
         - import_export_link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: help_page_path('user/group/import/index') }
         = s_('GroupsNew|To import a group, navigate to the group settings for the GitLab source instance, %{link_start}generate an export file%{link_end}, and upload it here.').html_safe % { link_start: import_export_link_start, link_end: '</a>'.html_safe }
       .gl-mt-3
-        = render 'shared/file_picker_button', f: f, field: :file, help_text: nil, classes: 'gl-button btn-confirm-secondary gl-mr-2'
+        = render 'shared/file_picker_button', f: f, field: :file, help_text: nil
   .gl-border-gray-100.gl-border-solid.gl-border-1.gl-bg-gray-10.gl-p-5
     = f.submit _('Import'), pajamas_button: true
diff --git a/app/views/import/fogbugz/new_user_map.html.haml b/app/views/import/fogbugz/new_user_map.html.haml
index 9d4c0f621342dcbcef09fd1a8b3fe2198b24a5a0..6aac7aa65af2e282aa91f272115bbb9a584003ea 100644
--- a/app/views/import/fogbugz/new_user_map.html.haml
+++ b/app/views/import/fogbugz/new_user_map.html.haml
@@ -40,4 +40,5 @@
             .js-gitlab-user{ data: { name: "users[#{id}][gitlab_user]" } }
 
   .form-actions
-    = submit_tag _('Continue to the next step'), class: 'gl-button btn btn-confirm'
+    = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm) do
+      = _('Continue to the next step')
diff --git a/spec/helpers/snippets_helper_spec.rb b/spec/helpers/snippets_helper_spec.rb
index 43e663464c85ea5b02232392bb281b73dc847173..1e899396de44caa2bc89148287ce9c2e4713a70e 100644
--- a/spec/helpers/snippets_helper_spec.rb
+++ b/spec/helpers/snippets_helper_spec.rb
@@ -33,7 +33,7 @@
     end
 
     def download_link(url)
-      "<a class=\"gl-button btn btn-default\" target=\"_blank\" rel=\"noopener noreferrer\" title=\"Open raw\" href=\"#{url}\">#{external_snippet_icon('doc-code')}</a>"
+      "<a rel=\"noopener noreferrer\" title=\"Open raw\" class=\"gl-button btn btn-md btn-default \" target=\"_blank\" href=\"#{url}\"><span class=\"gl-button-text\">\n#{external_snippet_icon('doc-code')}\n</span>\n\n</a>"
     end
   end
 
@@ -60,7 +60,7 @@ def download_link(url)
     end
 
     def download_link(url)
-      "<a class=\"gl-button btn btn-default\" target=\"_blank\" title=\"Download\" rel=\"noopener noreferrer\" href=\"#{url}?inline=false\">#{external_snippet_icon('download')}</a>"
+      "<a rel=\"noopener noreferrer\" title=\"Download\" class=\"gl-button btn btn-md btn-default \" target=\"_blank\" href=\"#{url}?inline=false\"><span class=\"gl-button-text\">\n#{external_snippet_icon('download')}\n</span>\n\n</a>"
     end
   end
 
@@ -102,7 +102,7 @@ def download_link(url)
     end
 
     def copy_button(blob_id)
-      "<button class=\"gl-button btn btn-default copy-to-clipboard-btn\" title=\"Copy snippet contents\" onclick=\"copyToClipboard(&#39;.blob-content[data-blob-id=&quot;#{blob_id}&quot;] &gt; pre&#39;)\">#{external_snippet_icon('copy-to-clipboard')}</button>"
+      "<button title=\"Copy snippet contents\" onclick=\"copyToClipboard(&#39;.blob-content[data-blob-id=&quot;#{blob_id}&quot;] &gt; pre&#39;)\" type=\"button\" class=\"gl-button btn btn-md btn-default \"><span class=\"gl-button-text\">\n#{external_snippet_icon('copy-to-clipboard')}\n</span>\n\n</button>"
     end
   end