diff --git a/app/soapbox/components/icon_button.js b/app/soapbox/components/icon_button.js
index 0d290c781..191c77e74 100644
--- a/app/soapbox/components/icon_button.js
+++ b/app/soapbox/components/icon_button.js
@@ -12,6 +12,7 @@ export default class IconButton extends React.PureComponent {
     className: PropTypes.string,
     title: PropTypes.string.isRequired,
     icon: PropTypes.string.isRequired,
+    iconset: PropTypes.string,
     onClick: PropTypes.func,
     onMouseDown: PropTypes.func,
     onKeyUp: PropTypes.func,
@@ -97,6 +98,7 @@ export default class IconButton extends React.PureComponent {
       disabled,
       expanded,
       icon,
+      iconset,
       inverted,
       overlay,
       pressed,
@@ -136,7 +138,7 @@ export default class IconButton extends React.PureComponent {
           <div style={style}>
             {emoji
               ? <div className='icon-button__emoji' dangerouslySetInnerHTML={{ __html: emojify(emoji) }} aria-hidden='true' />
-              : <Icon id={icon} fixedWidth aria-hidden='true' />}
+              : <Icon id={icon} iconset={iconset} fixedWidth aria-hidden='true' />}
           </div>
           {text && <span className='icon_button__text'>{text}</span>}
         </button>
@@ -165,7 +167,7 @@ export default class IconButton extends React.PureComponent {
             <div style={style}>
               {emoji
                 ? <div className='icon-button__emoji' style={{ transform: `rotate(${rotate}deg)` }} dangerouslySetInnerHTML={{ __html: emojify(emoji) }} aria-hidden='true' />
-                : <Icon id={icon} style={{ transform: `rotate(${rotate}deg)` }} fixedWidth aria-hidden='true' />}
+                : <Icon id={icon} iconset={iconset} style={{ transform: `rotate(${rotate}deg)` }} fixedWidth aria-hidden='true' />}
             </div>
             {text && <span className='icon_button__text'>{text}</span>}
           </button>
diff --git a/app/soapbox/components/icon_with_counter.js b/app/soapbox/components/icon_with_counter.js
index 0daf608da..fcbfe707e 100644
--- a/app/soapbox/components/icon_with_counter.js
+++ b/app/soapbox/components/icon_with_counter.js
@@ -3,10 +3,10 @@ import PropTypes from 'prop-types';
 import Icon from 'soapbox/components/icon';
 import { shortNumberFormat } from 'soapbox/utils/numbers';
 
-const IconWithCounter = ({ icon, count, fixedWidth }) => {
+const IconWithCounter = ({ icon, count, ...rest }) => {
   return (
     <div className='icon-with-counter'>
-      <Icon id={icon} fixedWidth={fixedWidth} />
+      <Icon id={icon} {...rest} />
       {count > 0 && <i className='icon-with-counter__counter'>
         {shortNumberFormat(count)}
       </i>}
@@ -17,7 +17,6 @@ const IconWithCounter = ({ icon, count, fixedWidth }) => {
 IconWithCounter.propTypes = {
   icon: PropTypes.string.isRequired,
   count: PropTypes.number.isRequired,
-  fixedWidth: PropTypes.bool,
 };
 
 export default IconWithCounter;