diff --git a/src/ui/component/button/view.jsx b/src/ui/component/button/view.jsx
index f34e0cf7e..e7531bcd7 100644
--- a/src/ui/component/button/view.jsx
+++ b/src/ui/component/button/view.jsx
@@ -77,10 +77,10 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
 
   const content = (
     <span className="button__content">
-      {icon && <Icon icon={icon} iconColor={iconColor} size={iconSize} />}
+      {icon && <Icon icon={icon} size={iconSize} />}
       {label && <span className="button__label">{label}</span>}
       {children && children}
-      {iconRight && <Icon icon={iconRight} iconColor={iconColor} size={iconSize} />}
+      {iconRight && <Icon icon={iconRight} size={iconSize} />}
     </span>
   );
 
diff --git a/src/ui/page/following/index.js b/src/ui/page/following/index.js~HEAD
similarity index 100%
rename from src/ui/page/following/index.js
rename to src/ui/page/following/index.js~HEAD
diff --git a/src/ui/page/following/index.js~cleanup and add tags to publish page b/src/ui/page/following/index.js~cleanup and add tags to publish page
new file mode 100644
index 000000000..97edfb98c
--- /dev/null
+++ b/src/ui/page/following/index.js~cleanup and add tags to publish page	
@@ -0,0 +1,16 @@
+import { connect } from 'react-redux';
+import { selectFollowedTags } from 'lbry-redux';
+import { selectSubscriptions } from 'redux/selectors/subscriptions';
+import TagsEdit from './view';
+
+const select = state => ({
+  followedTags: selectFollowedTags(state),
+  subscribedChannels: selectSubscriptions(state),
+});
+
+const perform = {};
+
+export default connect(
+  select,
+  perform
+)(TagsEdit);
diff --git a/src/ui/page/subscriptions/view.jsx b/src/ui/page/subscriptions/view.jsx
index 193098d70..790eb5712 100644
--- a/src/ui/page/subscriptions/view.jsx
+++ b/src/ui/page/subscriptions/view.jsx
@@ -73,7 +73,8 @@ export default function SubscriptionsPage(props: Props) {
               onClick={() => onClick()}
             />
           }
-          uris={viewingSuggestedSubs ? suggestedSubscriptions.map(sub => sub.uri) : uris}
+          // Fix the need to reverse this
+          uris={viewingSuggestedSubs ? suggestedSubscriptions.map(sub => sub.uri) : uris.reverse()}
         />
       </div>
     </Page>