diff --git a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
index 57166ece9d..53d187959c 100644
--- a/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
+++ b/scm-ui-components/packages/ui-components/src/repos/changesets/ChangesetButtonGroup.js
@@ -16,24 +16,22 @@ type Props = {
 class ChangesetButtonGroup extends React.Component<Props> {
   render() {
     const { repository, changeset, t } = this.props;
-
     const changesetLink = createChangesetLink(repository, changeset);
     const sourcesLink = createSourcesLink(repository, changeset);
-
     return (
       <ButtonAddons className="is-marginless">
-        <Button link={changesetLink} className="reduced-mobile">
-          <span className="icon">
-            <i className="fas fa-exchange-alt" />
-          </span>
-          <span>{t("changeset.buttons.details")}</span>
-        </Button>
-        <Button link={sourcesLink} className="reduced-mobile">
-          <span className="icon">
-            <i className="fas fa-code" />
-          </span>
-          <span>{t("changeset.buttons.sources")}</span>
-        </Button>
+        <Button
+          link={changesetLink}
+          icon="exchange-alt"
+          label={t("changeset.buttons.details")}
+          reducedMobile={true}
+        />
+        <Button
+          link={sourcesLink}
+          icon="code"
+          label={t("changeset.buttons.sources")}
+          reducedMobile={true}
+        />
       </ButtonAddons>
     );
   }
diff --git a/scm-ui/src/repos/branches/components/BranchButtonGroup.js b/scm-ui/src/repos/branches/components/BranchButtonGroup.js
index c3ca11aa78..626abbada0 100644
--- a/scm-ui/src/repos/branches/components/BranchButtonGroup.js
+++ b/scm-ui/src/repos/branches/components/BranchButtonGroup.js
@@ -25,18 +25,18 @@ class BranchButtonGroup extends React.Component<Props> {
 
     return (
       <ButtonAddons>
-        <Button link={changesetLink} className="reduced-mobile">
-          <span className="icon">
-            <i className="fas fa-exchange-alt" />
-          </span>
-          <span>{t("branch.commits")}</span>
-        </Button>
-        <Button link={sourcesLink} className="reduced-mobile">
-          <span className="icon">
-            <i className="fas fa-code" />
-          </span>
-          <span>{t("branch.sources")}</span>
-        </Button>
+        <Button
+          link={changesetLink}
+          icon="exchange-alt"
+          label={t("branch.commits")}
+          reducedMobile={true}
+        />
+        <Button
+          link={sourcesLink}
+          icon="code"
+          label={t("branch.sources")}
+          reducedMobile={true}
+        />
       </ButtonAddons>
     );
   }