diff --git a/src/components/SnackbarContent/index.jsx b/src/components/SnackbarContent/index.jsx
index 603e3f53..0cfe8012 100644
--- a/src/components/SnackbarContent/index.jsx
+++ b/src/components/SnackbarContent/index.jsx
@@ -64,7 +64,7 @@ const styles = theme => ({
   },
   iconVariant: {
     opacity: 0.9,
-    marginRight: theme.spacing.unit,
+    marginRight: theme.spacing(1),
   },
   message: {
     display: 'flex',
diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/style.js b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/style.js
index de9ac3f3..222e8214 100644
--- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/style.js
+++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/TokenSelectField/style.js
@@ -9,6 +9,8 @@ export const selectedTokenStyles = () => ({
   },
   tokenData: {
     padding: 0,
+    margin: 0,
+    lineHeight: '14px',
   },
   tokenImage: {
     marginRight: sm,
diff --git a/src/routes/safe/components/Balances/style.js b/src/routes/safe/components/Balances/style.js
index ff073921..38ca7014 100644
--- a/src/routes/safe/components/Balances/style.js
+++ b/src/routes/safe/components/Balances/style.js
@@ -13,7 +13,7 @@ export const styles = (theme: Object) => ({
     margin: `${sm} 0`,
   },
   actionIcon: {
-    marginRight: theme.spacing.unit,
+    marginRight: theme.spacing(1),
   },
   iconSmall: {
     fontSize: 16,
diff --git a/src/theme/mui.js b/src/theme/mui.js
index fec7f53e..5db892fe 100644
--- a/src/theme/mui.js
+++ b/src/theme/mui.js
@@ -12,6 +12,7 @@ import {
   bolderFont,
   boldFont,
   buttonLargeFontSize,
+  xs,
 } from './variables'
 
 export type WithStyles = {
@@ -135,6 +136,7 @@ export default createMuiTheme({
         padding: 0,
         letterSpacing: '0.5px',
         color: primary,
+        height: 'auto',
         textOverflow: 'ellipsis',
         display: 'flex',
         '&::-webkit-input-placeholder': {
@@ -217,6 +219,8 @@ export default createMuiTheme({
         color: primary,
         letterSpacing: '-0.5px',
         fontWeight: 'normal',
+        paddingTop: xs,
+        paddingBottom: xs,
       },
     },
     MuiBackdrop: {
@@ -230,6 +234,11 @@ export default createMuiTheme({
         fontFamily: 'Roboto Mono, monospace',
       },
     },
+    MuiListItemIcon: {
+      root: {
+        minWidth: 'auto',
+      },
+    },
     MuiListItemText: {
       primary: {
         fontFamily: 'Roboto Mono, monospace',