diff --git a/app/soapbox/features/account/components/header.js b/app/soapbox/features/account/components/header.js
index e477306e1..70e2190fa 100644
--- a/app/soapbox/features/account/components/header.js
+++ b/app/soapbox/features/account/components/header.js
@@ -323,13 +323,13 @@ class Header extends ImmutablePureComponent {
             {info}
           </div>
 
-          <div className='account__header__subscribe'>
-            <SubscriptionButton account={account} />
-          </div>
-
           {header && <a className='account__header__header' href={account.get('header')} onClick={this.handleHeaderClick} target='_blank'>
             <StillImage src={account.get('header')} alt='' className='parallax' />
           </a>}
+
+          <div className='account__header__subscribe'>
+            <SubscriptionButton account={account} />
+          </div>
         </div>
 
         <div className='account__header__bar'>
diff --git a/app/soapbox/features/account_timeline/index.js b/app/soapbox/features/account_timeline/index.js
index d14899ad2..0b0a7f400 100644
--- a/app/soapbox/features/account_timeline/index.js
+++ b/app/soapbox/features/account_timeline/index.js
@@ -193,7 +193,7 @@ class AccountTimeline extends ImmutablePureComponent {
         </div>
         <div className={classNames('column-header__collapsible', { collapsed, animating })} onTransitionEnd={this.handleTransitionEnd}>
           <div className='column-header__collapsible-inner'>
-            <ColumnSettingsContainer />
+            {(!collapsed || animating) && <ColumnSettingsContainer />}
           </div>
         </div>
         <StatusList
diff --git a/app/soapbox/features/reactions/index.js b/app/soapbox/features/reactions/index.js
index 8e3ab9884..88f6c20f5 100644
--- a/app/soapbox/features/reactions/index.js
+++ b/app/soapbox/features/reactions/index.js
@@ -73,7 +73,7 @@ class Reactions extends ImmutablePureComponent {
 
   render() {
     const { params, reactions, accounts, status } = this.props;
-    const { username, statusId } = params;
+    const { username, statusId, reaction } = params;
 
     const back = `/@${username}/posts/${statusId}`;
 
@@ -95,13 +95,14 @@ class Reactions extends ImmutablePureComponent {
 
     const emptyMessage = <FormattedMessage id='status.reactions.empty' defaultMessage='No one has reacted to this post yet. When someone does, they will show up here.' />;
 
+    console.log(params.reaction);
     return (
       <Column back={back}>
         {
           reactions.size > 0 && (
             <div className='reaction__filter-bar'>
-              <button onClick={this.handleFilterChange('')}>All</button>
-              {reactions?.filter(reaction => reaction.count).map(reaction => <button key={reaction.name} onClick={this.handleFilterChange(reaction.name)}>{reaction.name} {reaction.count}</button>)}
+              <button className={!params.reaction ? 'active' : ''} onClick={this.handleFilterChange('')}>All</button>
+              {reactions?.filter(reaction => reaction.count).map(reaction => <button key={reaction.name} className={params.reaction === reaction.name ? 'active' : ''} onClick={this.handleFilterChange(reaction.name)}>{reaction.name} {reaction.count}</button>)}
             </div>
           )
         }
diff --git a/app/styles/accounts.scss b/app/styles/accounts.scss
index 14f74f59a..2138a66f6 100644
--- a/app/styles/accounts.scss
+++ b/app/styles/accounts.scss
@@ -524,6 +524,7 @@ a .account__avatar {
   border-radius: 4px;
   opacity: 0.7;
   white-space: nowrap;
+  transition: 0.2s;
 
   &:hover {
     opacity: 1;
diff --git a/app/styles/components/account-header.scss b/app/styles/components/account-header.scss
index cc3cbd95e..42f21e4d6 100644
--- a/app/styles/components/account-header.scss
+++ b/app/styles/components/account-header.scss
@@ -34,6 +34,12 @@
       border-radius: 4px;
       opacity: 0.7;
 
+      &:active,
+      &:focus,
+      &:hover {
+        opacity: 1;
+      }
+
       &:not(.button-active) i.fa {
         margin: 0;
       }
diff --git a/app/styles/ui.scss b/app/styles/ui.scss
index 8a111f31e..d05a18e4c 100644
--- a/app/styles/ui.scss
+++ b/app/styles/ui.scss
@@ -638,9 +638,14 @@
     position: relative;
     background: transparent;
 
+    &:active,
+    &:focus,
+    &:hover,
     &.active {
       color: var(--primary-text-color);
+    }
 
+    &.active {
       &::before,
       &::after {
         display: block;
@@ -668,6 +673,7 @@
   overflow-x: auto;
   overflow-y: hidden;
 
+  button,
   a {
     flex: unset;
     padding: 15px 24px;