diff --git a/src/shared/components/DateRangePicker/DateInput/style.scss b/src/shared/components/DateRangePicker/DateInput/style.scss
index ef4919068e..615e2d9c4e 100644
--- a/src/shared/components/DateRangePicker/DateInput/style.scss
+++ b/src/shared/components/DateRangePicker/DateInput/style.scss
@@ -9,7 +9,7 @@
 
   input {
     padding: 5px;
-    height: 30px !important;
+    height: 40px !important;
     font-size: 13px !important;
     line-height: 16px !important;
     margin-bottom: 0 !important;
@@ -43,5 +43,5 @@
   position: absolute;
   cursor: pointer;
   margin-left: -22px;
-  margin-top: 6px;
+  margin-top: 11px;
 }
diff --git a/src/shared/components/DateRangePicker/style.scss b/src/shared/components/DateRangePicker/style.scss
index 56f9560b3e..0f09f9a941 100644
--- a/src/shared/components/DateRangePicker/style.scss
+++ b/src/shared/components/DateRangePicker/style.scss
@@ -21,12 +21,15 @@
 
 .isRange {
   :global {
-    .rdrStartEdge, .rdrEndEdge {
+    .rdrStartEdge,
+    .rdrEndEdge {
       color: $listing-checkbox-green !important;
     }
+
     .rdrDayHovered {
       background: $listing-checkbox-green !important;
     }
+
     .rdrDay {
       .rdrInRange {
         background: lighten($listing-checkbox-green, 30%) !important;
diff --git a/src/shared/components/SortingSelectBar/style.scss b/src/shared/components/SortingSelectBar/style.scss
index 1d2d0d4701..f9696ea943 100644
--- a/src/shared/components/SortingSelectBar/style.scss
+++ b/src/shared/components/SortingSelectBar/style.scss
@@ -196,6 +196,9 @@ $down-arrow-size: $base-unit;
       display: block;
       padding: 8px 20px;
       z-index: 100000;
+      border-bottom: 1px solid #aaa;
+      border-left: 1px solid #aaa;
+      border-right: 1px solid #aaa;
     }
 
     .Select-option:last-child {
diff --git a/src/shared/components/SwitchWithLabel/index.jsx b/src/shared/components/SwitchWithLabel/index.jsx
index 43c3b0fba0..edcc343934 100644
--- a/src/shared/components/SwitchWithLabel/index.jsx
+++ b/src/shared/components/SwitchWithLabel/index.jsx
@@ -35,7 +35,7 @@ function SwitchWithLabel({
           switch: theme.switch,
         }}
       />
-      {labelAfter}
+      <span>{labelAfter}</span>
     </div>
   );
 }
diff --git a/src/shared/components/Tooltip/style.scss b/src/shared/components/Tooltip/style.scss
index 9e65bce94a..1f714259ca 100644
--- a/src/shared/components/Tooltip/style.scss
+++ b/src/shared/components/Tooltip/style.scss
@@ -8,7 +8,7 @@
   }
 
   .rc-tooltip-inner {
-    border-radius: 3px;
+    border-radius: 8px;
     background: $tc-gray-80;
     padding: 0;
   }
diff --git a/src/shared/components/challenge-listing/ChallengeCard/NumRegistrants/style.scss b/src/shared/components/challenge-listing/ChallengeCard/NumRegistrants/style.scss
index 521c7584bb..ead9f5b189 100644
--- a/src/shared/components/challenge-listing/ChallengeCard/NumRegistrants/style.scss
+++ b/src/shared/components/challenge-listing/ChallengeCard/NumRegistrants/style.scss
@@ -6,7 +6,7 @@
 }
 
 .link:hover {
-  color: $tc-dark-blue-110;
+  color: $tc-black;
 }
 
 .number {
diff --git a/src/shared/components/challenge-listing/ChallengeCard/Prize/Tip/style.scss b/src/shared/components/challenge-listing/ChallengeCard/Prize/Tip/style.scss
index c488224dd7..cb4a75e059 100644
--- a/src/shared/components/challenge-listing/ChallengeCard/Prize/Tip/style.scss
+++ b/src/shared/components/challenge-listing/ChallengeCard/Prize/Tip/style.scss
@@ -16,6 +16,7 @@ $prize-space-10: $base-unit * 2;
 
   h1 {
     @include roboto-regular;
+
     border: none;
     color: $tc-white;
     font-size: 14px;
diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
index 346f77683b..fed47a114f 100644
--- a/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
+++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/index.jsx
@@ -510,7 +510,7 @@ export default function FiltersPanel({
                             onSwitch={(e) => {
                               let { types } = filterState;
 
-                              if (e.target.checked) {
+                              if (e) {
                                 types = types.concat(option.value);
                               } else {
                                 types = types.filter(type => type !== option.value);
diff --git a/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss b/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss
index 1cdeb019c8..a1d7176970 100644
--- a/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss
+++ b/src/shared/components/challenge-listing/Filters/FiltersPanel/style.scss
@@ -339,6 +339,10 @@ hr.hr {
             width: 130px;
           }
 
+          @include md-to-lg {
+            width: 26%;
+          }
+
           .radio-label {
             display: inline-block;
             padding-left: 24px;
@@ -362,6 +366,7 @@ hr.hr {
               border: 1px solid #aaa;
               border-radius: 50%;
               box-shadow: 0 1px 2px 0 rgba($tc-black, 0.29);
+              background: #fff;
             }
 
             &::after {
@@ -585,12 +590,17 @@ hr.hr {
         .Select.is-focused > .Select-control {
           outline: none;
           box-shadow: none;
-          border-color: #137d60 !important;
+          border-color: #151516 !important;
         }
 
         .Select-menu-outer {
           margin-top: 1px;
           font-size: 14px;
+
+          .Select-option.is-selected {
+            background-color: #137d60 !important;
+            color: $tc-white !important;
+          }
         }
       }
     }
@@ -611,7 +621,7 @@ hr.hr {
 
     .recommended-challenge-tooltip {
       position: absolute;
-      right: 54px;
+      left: 210px;
       display: flex;
       flex-direction: column;
       justify-content: center;
@@ -625,9 +635,9 @@ hr.hr {
 }
 
 .tctooltiptext {
-  background: $tc-white;
-  color: $tc-gray-90;
-  border-radius: 3px;
+  background: $tc-black;
+  color: $tc-white;
+  border-radius: 8px;
   padding: 10px;
 }
 
@@ -642,6 +652,6 @@ hr.hr {
   margin-left: -5px;
   border-width: 5px 5px 0;
   left: 50%;
-  border-top-color: $tc-white;
+  border-top-color: $tc-black;
   z-index: 1000;
 }
diff --git a/src/shared/components/challenge-listing/Tooltips/ProgressBarTooltip/style.scss b/src/shared/components/challenge-listing/Tooltips/ProgressBarTooltip/style.scss
index db7634b56f..2a2b3f1d2a 100644
--- a/src/shared/components/challenge-listing/Tooltips/ProgressBarTooltip/style.scss
+++ b/src/shared/components/challenge-listing/Tooltips/ProgressBarTooltip/style.scss
@@ -18,6 +18,7 @@ div.progress-bar-tooltip {
 
   .rc-tooltip-inner {
     padding: 0 $base-unit * 3;
+    border-radius: 8px;
   }
 
   .tip {
diff --git a/src/shared/components/challenge-listing/style.scss b/src/shared/components/challenge-listing/style.scss
index 5c02fe9435..5f3dc39577 100644
--- a/src/shared/components/challenge-listing/style.scss
+++ b/src/shared/components/challenge-listing/style.scss
@@ -131,12 +131,6 @@ $challenge-radius-4: $corner-radius * 2;
   }
 }
 
-.recommended-plus-tag {
-  margin-left: 3px;
-  display: inline-block;
-  background-color: $tc-white;
-}
-
 .tag {
   button {
     border-radius: 2px;
@@ -146,13 +140,23 @@ $challenge-radius-4: $corner-radius * 2;
     font-weight: 500;
 
     &:hover {
-      background-color: #d4d4d4;
+      background-color: #d4d4d4 !important;
     }
   }
 }
 
+.recommended-plus-tag {
+  margin-left: 3px;
+  display: inline-block;
+  background-color: $tc-white;
+
+  button:hover {
+    background-color: #d4d4d4 !important;
+  }
+}
+
 .additionalTagWrapper {
-  background: $tc-white;
+  background: $tc-black;
   display: inline-block;
   border-radius: 2px;
   padding: 3px 4px;
@@ -181,6 +185,10 @@ $challenge-radius-4: $corner-radius * 2;
   margin-top: 5px;
   margin-left: 3px;
   display: inline-block;
+
+  & > button:hover {
+    background-color: #d4d4d4 !important;
+  }
 }
 
 .tagContainer {