diff --git a/packages/harmony/.svgrrc.js b/packages/harmony/.svgrrc.js
index a5001bf7b27..440396b94e4 100644
--- a/packages/harmony/.svgrrc.js
+++ b/packages/harmony/.svgrrc.js
@@ -3,7 +3,7 @@ module.exports = {
   titleProp: true,
   descProp: true,
   replaceAttrValues: {
-    red: '{props.fillColor}',
-    '#FF0000': '{props.fillColor}'
+    red: '{props.fillcolor}',
+    '#FF0000': '{props.fillcolor}'
   }
 }
diff --git a/packages/harmony/src/components/button/BaseButton/BaseButton.tsx b/packages/harmony/src/components/button/BaseButton/BaseButton.tsx
index 8921dd75308..1910e88ad53 100644
--- a/packages/harmony/src/components/button/BaseButton/BaseButton.tsx
+++ b/packages/harmony/src/components/button/BaseButton/BaseButton.tsx
@@ -63,7 +63,6 @@ export const BaseButton = forwardRef<HTMLButtonElement, BaseButtonProps>(
       userSelect: 'none',
       whiteSpace: 'nowrap',
       paddingInline: 0,
-      '-webkit-padding': 0,
       transition: `
         transform ${motion.hover},
         border-color ${motion.hover},
diff --git a/packages/mobile/.svgrrc.js b/packages/mobile/.svgrrc.js
index 7183003f3d5..8dbfa378d55 100644
--- a/packages/mobile/.svgrrc.js
+++ b/packages/mobile/.svgrrc.js
@@ -3,7 +3,7 @@ module.exports = {
   titleProp: true,
   descProp: true,
   replaceAttrValues: {
-    '#FF0000': '{props.fillColor}',
+    '#FF0000': '{props.fillcolor}',
     '#000': '{props.fill}',
     '#f00': '{props.fillSecondary}'
   }
diff --git a/packages/sdk/src/sdk/services/AudiusWalletClient/createHedgehogWalletClient.ts b/packages/sdk/src/sdk/services/AudiusWalletClient/createHedgehogWalletClient.ts
index cff84898ae4..f78d2b7c336 100644
--- a/packages/sdk/src/sdk/services/AudiusWalletClient/createHedgehogWalletClient.ts
+++ b/packages/sdk/src/sdk/services/AudiusWalletClient/createHedgehogWalletClient.ts
@@ -31,9 +31,9 @@ export function createHedgehogWalletClient(
   let account_: AudiusAccount | undefined
   const getAccount = async () => {
     await hedgehog.waitUntilReady()
-    const wallet = hedgehog.getWallet()
+    let wallet = hedgehog.getWallet()
     if (!wallet) {
-      throw new Error('Hedgehog wallet not found. Is the user logged in?')
+      wallet = await hedgehog.createWalletObj(Date.now().toString())
     }
 
     if (!account_ || account_.address !== wallet.getAddressString()) {
diff --git a/packages/web/.svgrrc.js b/packages/web/.svgrrc.js
index 7183003f3d5..8dbfa378d55 100644
--- a/packages/web/.svgrrc.js
+++ b/packages/web/.svgrrc.js
@@ -3,7 +3,7 @@ module.exports = {
   titleProp: true,
   descProp: true,
   replaceAttrValues: {
-    '#FF0000': '{props.fillColor}',
+    '#FF0000': '{props.fillcolor}',
     '#000': '{props.fill}',
     '#f00': '{props.fillSecondary}'
   }
diff --git a/packages/web/src/pages/trending-page/components/desktop/TrendingGenreFilters.tsx b/packages/web/src/pages/trending-page/components/desktop/TrendingGenreFilters.tsx
index 5e9e531543e..d984df616e5 100644
--- a/packages/web/src/pages/trending-page/components/desktop/TrendingGenreFilters.tsx
+++ b/packages/web/src/pages/trending-page/components/desktop/TrendingGenreFilters.tsx
@@ -40,7 +40,8 @@ export const TrendingGenreFilters = (props: TrendingGenreFiltersProps) => {
   // even if it's not selected.
   if (
     isSelectedFromModal(currentGenre) &&
-    currentGenre !== lastModalSelectedGenre
+    currentGenre !== lastModalSelectedGenre &&
+    currentGenre
   ) {
     genres.push(currentGenre)
   } else if (lastModalSelectedGenre) {
diff --git a/svgr-template.js b/svgr-template.js
index 75b3d3c2a0c..bd4ac757999 100644
--- a/svgr-template.js
+++ b/svgr-template.js
@@ -83,14 +83,14 @@ const ${variables.componentName} = forwardRef((${variables.props}, ref) => {
     other.width = width
   }
 
-  const fillColor = other.fill ?? theme.color?.icon[color] ?? 'red'
+  const fillcolor = other.fill ?? theme.color?.icon[color] ?? 'red'
 
   ${native ? nativeStyles : webStyles}
 
   other.role = title ? 'img' : undefined
   other['aria-hidden'] = title ? undefined : true
 
-  props = {...other, ref, fillColor}
+  props = {...other, ref, fillcolor}
 
   ${native ? `const Path = animatedProps ? AnimatedPath : RNSVGPath` : ''}