diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
index 36c6d8d5b..3304c0e00 100644
--- a/webapp/assets/_new/styles/tokens.scss
+++ b/webapp/assets/_new/styles/tokens.scss
@@ -310,6 +310,7 @@ $z-index-page-submenu: 2500;
 $z-index-page-header: 2000;
 $z-index-page-sidebar: 1500;
 $z-index-sticky: 100;
+$z-index-post-card-link: 5;
 
 /**
  * @tokens Media Query
diff --git a/webapp/components/CommentList/CommentList.vue b/webapp/components/CommentList/CommentList.vue
index 538b29595..96edf9bc3 100644
--- a/webapp/components/CommentList/CommentList.vue
+++ b/webapp/components/CommentList/CommentList.vue
@@ -56,7 +56,7 @@ export default {
     margin-top: 0;
 
     > .counter-icon {
-      margin-right: 12px;
+      margin-right: $space-small;
     }
   }
 }
diff --git a/webapp/components/FilterPosts/FilterPosts.spec.js b/webapp/components/FilterPosts/FilterPosts.spec.js
index c05a3d85f..d7069baa0 100644
--- a/webapp/components/FilterPosts/FilterPosts.spec.js
+++ b/webapp/components/FilterPosts/FilterPosts.spec.js
@@ -127,19 +127,19 @@ describe('FilterPosts.vue', () => {
       expect(spanishButton.attributes().class).toContain('--filled')
     })
 
-    it('sets "filter-by-followed-authors-only" button attribute `filled`', () => {
+    it('sets "filter-by-followed" button attribute `filled`', () => {
       getters['posts/filteredByUsersFollowed'] = jest.fn(() => true)
       const wrapper = openFilterPosts()
       expect(
-        wrapper.find('.base-button[name="filter-by-followed-authors-only"]').classes('--filled'),
+        wrapper.find('.base-button[data-test="filter-by-followed"]').classes('--filled'),
       ).toBe(true)
     })
 
-    describe('click "filter-by-followed-authors-only" button', () => {
+    describe('click "filter-by-followed" button', () => {
       let wrapper
       beforeEach(() => {
         wrapper = openFilterPosts()
-        wrapper.find('.base-button[name="filter-by-followed-authors-only"]').trigger('click')
+        wrapper.find('.base-button[data-test="filter-by-followed"]').trigger('click')
       })
 
       it('calls TOGGLE_FILTER_BY_FOLLOWED', () => {
diff --git a/webapp/components/FilterPosts/GeneralFilterMenuItems.vue b/webapp/components/FilterPosts/GeneralFilterMenuItems.vue
index cf0b4c667..8c965c744 100644
--- a/webapp/components/FilterPosts/GeneralFilterMenuItems.vue
+++ b/webapp/components/FilterPosts/GeneralFilterMenuItems.vue
@@ -15,7 +15,7 @@
           <ds-flex-item width="100%">
             <div class="follow-filter-button">
               <base-button
-                name="filter-by-followed-authors-only"
+                data-test="filter-by-followed"
                 icon="user-plus"
                 circle
                 :filled="filteredByUsersFollowed"
diff --git a/webapp/components/PostCard/PostCard.vue b/webapp/components/PostCard/PostCard.vue
index 5b9a792a9..76829ae5f 100644
--- a/webapp/components/PostCard/PostCard.vue
+++ b/webapp/components/PostCard/PostCard.vue
@@ -177,7 +177,7 @@ export default {
 
   .content-menu {
     position: relative;
-    z-index: 99;
+    z-index: $z-index-post-card-link;
     display: inline-block;
     margin-left: $space-xx-small;
     margin-right: -$space-x-small;
diff --git a/webapp/components/_new/generic/BaseButton/BaseButton.vue b/webapp/components/_new/generic/BaseButton/BaseButton.vue
index b616995c5..5997ea8f1 100644
--- a/webapp/components/_new/generic/BaseButton/BaseButton.vue
+++ b/webapp/components/_new/generic/BaseButton/BaseButton.vue
@@ -61,7 +61,7 @@ export default {
     buttonClass() {
       let buttonClass = 'base-button'
 
-      if (this.$slots.default == null) buttonClass += ' --icon-only'
+      if (this.$slots.default === undefined) buttonClass += ' --icon-only'
       if (this.circle) buttonClass += ' --circle'
       if (this.danger) buttonClass += ' --danger'
       if (this.loading) buttonClass += ' --loading'