diff --git a/src/apps/components/HorizontalSpacer/HorizontalSpacer.stories.tsx b/src/apps/components/HorizontalSpacer/HorizontalSpacer.stories.tsx
index 2bc42bab160..753f337665b 100644
--- a/src/apps/components/HorizontalSpacer/HorizontalSpacer.stories.tsx
+++ b/src/apps/components/HorizontalSpacer/HorizontalSpacer.stories.tsx
@@ -15,7 +15,7 @@ const HelperWrapper: React.FC<HelperWrapperProps> = ({ children }) => (
 
 const Text: React.FC = () => <Typography>{"<- The spacer is here"}</Typography>;
 
-storiesOf("Generic / Horizontal Spacer", module)
+storiesOf("Generics / Horizontal Spacer", module)
   .addDecorator(Decorator)
   .add("without", () => (
     <HelperWrapper>
diff --git a/src/channels/components/ShippingZonesCard/ShippingZoneItem.tsx b/src/channels/components/ShippingZonesCard/ShippingZoneItem.tsx
index 895c4dc0f1f..6927fe2475c 100644
--- a/src/channels/components/ShippingZonesCard/ShippingZoneItem.tsx
+++ b/src/channels/components/ShippingZonesCard/ShippingZoneItem.tsx
@@ -1,21 +1,9 @@
 import { Divider, Typography } from "@material-ui/core";
-import { makeStyles } from "@material-ui/core/styles";
 import { ChannelShippingZone } from "@saleor/channels/pages/ChannelDetailsPage/types";
 import DeletableItem from "@saleor/components/DeletableItem";
 import React from "react";
 
-const useStyles = makeStyles(
-  theme => ({
-    container: {
-      paddingLeft: theme.spacing(3),
-      display: "flex",
-      flexDirection: "row",
-      justifyContent: "space-between",
-      alignItems: "center"
-    }
-  }),
-  { name: "ShippingZoneItem" }
-);
+import useStyles from "./styles";
 
 interface ShippingZoneItemProps {
   zone: ChannelShippingZone;
diff --git a/src/channels/components/ShippingZonesCard/ShippingZonesCard.tsx b/src/channels/components/ShippingZonesCard/ShippingZonesCard.tsx
index 090e050f221..91971bc1171 100644
--- a/src/channels/components/ShippingZonesCard/ShippingZonesCard.tsx
+++ b/src/channels/components/ShippingZonesCard/ShippingZonesCard.tsx
@@ -6,13 +6,13 @@ import {
   Typography
 } from "@material-ui/core";
 import CardTitle from "@saleor/components/CardTitle";
-import { makeStyles } from "@saleor/macaw-ui";
 import React from "react";
 import { defineMessages, useIntl } from "react-intl";
 
 import ShippingZoneItem from "./ShippingZoneItem";
 import ShippingZonesCardListFooter from "./ShippingZonesCardListFooter";
 import ShippingZonesListHeader from "./ShippingZonesListHeader";
+import { useExpanderStyles } from "./styles";
 import { ShippingZonesProps } from "./types";
 
 const messages = defineMessages({
@@ -27,26 +27,6 @@ const messages = defineMessages({
   }
 });
 
-const useExpanderStyles = makeStyles(
-  () => ({
-    // empty expanded needed for mui to use root styles
-    expanded: {},
-    root: {
-      boxShadow: "none",
-
-      "&:before": {
-        content: "none"
-      },
-
-      "&$expanded": {
-        margin: 0,
-        border: "none"
-      }
-    }
-  }),
-  { name: "ShippingZonesCardExpander" }
-);
-
 type ShippingZonesCardProps = ShippingZonesProps;
 
 const ShippingZonesCard: React.FC<ShippingZonesCardProps> = props => {
diff --git a/src/channels/components/ShippingZonesCard/ShippingZonesCardListFooter.tsx b/src/channels/components/ShippingZonesCard/ShippingZonesCardListFooter.tsx
index 1755fbcbe36..4affd5b0b8f 100644
--- a/src/channels/components/ShippingZonesCard/ShippingZonesCardListFooter.tsx
+++ b/src/channels/components/ShippingZonesCard/ShippingZonesCardListFooter.tsx
@@ -6,6 +6,7 @@ import { mapNodeToChoice } from "@saleor/utils/maps";
 import React, { useEffect, useRef, useState } from "react";
 import { defineMessages } from "react-intl";
 
+import useStyles from "./styles";
 import { ShippingZonesProps } from "./types";
 
 const messages = defineMessages({
@@ -24,6 +25,8 @@ const ShippingZonesCardListFooter: React.FC<ShippingZonesCardListFooterProps> =
   addShippingZone,
   shippingZones
 }) => {
+  const classes = useStyles();
+
   const [isChoicesSelectShown, setIsChoicesSelectShown] = useState(false);
   const shippingZonesRef = useRef<ChannelShippingZones>(shippingZones);
 
@@ -49,7 +52,7 @@ const ShippingZonesCardListFooter: React.FC<ShippingZonesCardListFooterProps> =
 
   return isChoicesSelectShown ? (
     <ClickAwayListener onClickAway={handleFooterClickAway}>
-      <div>
+      <div className={classes.root}>
         <SingleAutocompleteSelectField
           data-test-id="shippingAutoCompleteSelect"
           value=""
diff --git a/src/channels/components/ShippingZonesCard/ShippingZonesListHeader.tsx b/src/channels/components/ShippingZonesCard/ShippingZonesListHeader.tsx
index effe9143454..3f69fdb7d78 100644
--- a/src/channels/components/ShippingZonesCard/ShippingZonesListHeader.tsx
+++ b/src/channels/components/ShippingZonesCard/ShippingZonesListHeader.tsx
@@ -20,6 +20,7 @@ const useStyles = makeStyles(
       width: "100%",
       border: "none",
       marginRight: theme.spacing(1),
+      padding: 0,
       paddingBottom: theme.spacing(2),
       minHeight: 0,
 
@@ -28,7 +29,6 @@ const useStyles = makeStyles(
       }
     },
     content: {
-      paddingLeft: theme.spacing(1),
       margin: 0,
 
       "&$expanded": {
diff --git a/src/channels/components/ShippingZonesCard/styles.ts b/src/channels/components/ShippingZonesCard/styles.ts
new file mode 100644
index 00000000000..6cbf7aa7208
--- /dev/null
+++ b/src/channels/components/ShippingZonesCard/styles.ts
@@ -0,0 +1,39 @@
+import { makeStyles } from "@saleor/macaw-ui";
+
+export const useExpanderStyles = makeStyles(
+  theme => ({
+    expanded: {},
+    root: {
+      boxShadow: "none",
+      padding: theme.spacing(1, 4),
+
+      "&:before": {
+        content: "none"
+      },
+
+      "&$expanded": {
+        margin: 0,
+        border: "none"
+      }
+    }
+  }),
+  { name: "Expander" }
+);
+
+const useStyles = makeStyles(
+  theme => ({
+    container: {
+      padding: theme.spacing(1, 0),
+      display: "flex",
+      flexDirection: "row",
+      justifyContent: "space-between",
+      alignItems: "center"
+    },
+    root: {
+      paddingRight: theme.spacing(1)
+    }
+  }),
+  { name: "ShippingZonesCard" }
+);
+
+export default useStyles;
diff --git a/src/components/AssignAttributeDialog/AssignAttributeDialog.tsx b/src/components/AssignAttributeDialog/AssignAttributeDialog.tsx
index 71c220cbb4c..aac5a17dec3 100644
--- a/src/components/AssignAttributeDialog/AssignAttributeDialog.tsx
+++ b/src/components/AssignAttributeDialog/AssignAttributeDialog.tsx
@@ -51,6 +51,7 @@ const useStyles = makeStyles(
     loadMoreLoaderContainer: {
       alignItems: "center",
       display: "flex",
+      marginTop: theme.spacing(2),
       height: theme.spacing(3),
       justifyContent: "center"
     },
@@ -146,7 +147,7 @@ const AssignAttributeDialog: React.FC<AssignAttributeDialogProps> = ({
         id={scrollableTargetId}
       >
         <InfiniteScroll
-          dataLength={attributes?.length}
+          dataLength={attributes?.length || 0}
           next={onFetchMore}
           hasMore={hasMore}
           scrollThreshold="100px"
diff --git a/src/components/ChannelsAvailability/styles.ts b/src/components/ChannelsAvailability/styles.ts
index 5c4074292d8..783ad89b5ae 100644
--- a/src/components/ChannelsAvailability/styles.ts
+++ b/src/components/ChannelsAvailability/styles.ts
@@ -50,9 +50,7 @@ export const useStyles = makeStyles(
       position: "relative"
     },
     label: {
-      lineHeight: 1.2,
-      marginBottom: 5,
-      marginTop: 0
+      lineHeight: 1.2
     },
     listingLabel: {
       marginTop: 9
diff --git a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx
index 69d8d24e74e..6b3c36e6f2a 100644
--- a/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx
+++ b/src/components/ChannelsAvailabilityCard/Channel/ChannelAvailabilityItemContent.tsx
@@ -73,6 +73,9 @@ const ChannelContent: React.FC<ChannelContentProps> = ({
   return (
     <div className={classes.container}>
       <RadioSwitchField
+        classes={{
+          radioLabel: classes.radioLabel
+        }}
         className={classes.radioField}
         disabled={disabled}
         firstOptionLabel={
@@ -156,6 +159,9 @@ const ChannelContent: React.FC<ChannelContentProps> = ({
         <>
           <Hr />
           <RadioSwitchField
+            classes={{
+              radioLabel: classes.radioLabel
+            }}
             className={classes.radioField}
             disabled={disabled}
             firstOptionLabel={
diff --git a/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCard.stories.tsx b/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCard.stories.tsx
index 822b25165f6..976a6907e8e 100644
--- a/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCard.stories.tsx
+++ b/src/components/ChannelsAvailabilityCard/ChannelsAvailabilityCard.stories.tsx
@@ -10,7 +10,6 @@ import React from "react";
 import ChannelsAvailabilityCard, {
   ChannelsAvailabilityCardProps
 } from "./ChannelsAvailabilityCard";
-import { Messages } from "./types";
 
 const user: User = {
   __typename: "User",
@@ -53,16 +52,16 @@ storiesOf("Generics / Channels availability card", module)
       {...props}
       channelsList={undefined}
       channels={productChannels}
-      messages={productChannels.reduce(
-        (prevVal, currVal) => ({
-          ...prevVal,
-          [currVal.id]: {
-            availableLabel: "Available",
-            availableSecondLabel: "Will become available",
-            hiddenSecondLabel: "Will become published"
-          }
-        }),
-        {} as Messages
-      )}
+      messages={{
+        availableLabel: "Available",
+        availableSecondLabel: "Will become available",
+        unavailableLabel: "Lorem Ipsum",
+        visibleSecondLabel: "Dolor Sit Amet",
+        hiddenSecondLabel: "Will become published",
+        hiddenLabel: "Hidden",
+        visibleLabel: "Visible",
+        availableDateText: "available from 07/30/2020",
+        setAvailabilityDateLabel: "xd4"
+      }}
     />
   ));
diff --git a/src/components/ChannelsAvailabilityCard/styles.ts b/src/components/ChannelsAvailabilityCard/styles.ts
index 3e721a5ac13..335254af956 100644
--- a/src/components/ChannelsAvailabilityCard/styles.ts
+++ b/src/components/ChannelsAvailabilityCard/styles.ts
@@ -57,13 +57,16 @@ export const useStyles = makeStyles(
       position: "relative"
     },
     label: {
-      lineHeight: 1.2,
-      marginBottom: 5,
-      marginTop: 0
+      lineHeight: 1.2
     },
     listingLabel: {
       marginTop: 9
     },
+    radioLabel: {
+      "& > span": {
+        padding: theme.spacing(0, 0.5)
+      }
+    },
     rotate: {
       transform: "rotate(180deg)"
     },
diff --git a/src/components/DeletableItem/DeletableItem.tsx b/src/components/DeletableItem/DeletableItem.tsx
index ed28b6a11c0..b37d59a14b5 100644
--- a/src/components/DeletableItem/DeletableItem.tsx
+++ b/src/components/DeletableItem/DeletableItem.tsx
@@ -1,34 +1,18 @@
-import { makeStyles } from "@material-ui/core/styles";
-import TrashIcon from "@saleor/icons/Trash";
+import { DeleteIcon, IconButton } from "@saleor/macaw-ui";
 import React from "react";
 
-const useStyles = makeStyles(
-  theme => ({
-    container: {
-      cursor: "pointer",
-      padding: theme.spacing(3),
-      display: "flex",
-      justifyContent: "center",
-      alignItems: "center"
-    }
-  }),
-  { name: "DeletableItem" }
-);
-
 interface DeletableItemProps {
   onDelete: (id: string) => void;
   id: string;
 }
 
 const DeletableItem: React.FC<DeletableItemProps> = ({ onDelete, id }) => {
-  const classes = useStyles({});
-
   const handleDelete = () => onDelete(id);
 
   return (
-    <div className={classes.container} onClick={handleDelete}>
-      <TrashIcon />
-    </div>
+    <IconButton variant="secondary" hoverOutline onClick={handleDelete}>
+      <DeleteIcon />
+    </IconButton>
   );
 };
 
diff --git a/src/components/FilterBar/FilterBar.tsx b/src/components/FilterBar/FilterBar.tsx
index caa17342ee3..61cff2f3dda 100644
--- a/src/components/FilterBar/FilterBar.tsx
+++ b/src/components/FilterBar/FilterBar.tsx
@@ -22,12 +22,12 @@ const useStyles = makeStyles(
       borderBottom: `1px solid ${theme.palette.divider}`,
       display: "flex",
       flexWrap: "wrap",
-      padding: theme.spacing(1, 3)
+      padding: theme.spacing(1, 4)
     },
     tabActionButton: {
       marginLeft: theme.spacing(2),
-      paddingLeft: theme.spacing(3),
-      paddingRight: theme.spacing(3)
+      paddingLeft: theme.spacing(4),
+      paddingRight: theme.spacing(4)
     }
   }),
   {
diff --git a/src/components/LinkChoice/LinkChoice.tsx b/src/components/LinkChoice/LinkChoice.tsx
index 149297b28ff..d975cfc68dc 100644
--- a/src/components/LinkChoice/LinkChoice.tsx
+++ b/src/components/LinkChoice/LinkChoice.tsx
@@ -23,7 +23,8 @@ const useStyles = makeStyles(
     menuItem: {
       "&:not(:last-of-type)": {
         marginBottom: theme.spacing()
-      }
+      },
+      borderRadius: 4
     },
     paper: {
       padding: theme.spacing()
diff --git a/src/components/Metadata/MetadataCard.tsx b/src/components/Metadata/MetadataCard.tsx
index 0b91611f717..d3e5cd9dd65 100644
--- a/src/components/Metadata/MetadataCard.tsx
+++ b/src/components/Metadata/MetadataCard.tsx
@@ -203,7 +203,7 @@ const MetadataCard: React.FC<MetadataCardProps> = ({
                   </TableBody>
                 </Table>
               )}
-              <CardActions>
+              <CardActions className={classes.actions}>
                 <Button
                   data-test="addField"
                   onClick={() =>
diff --git a/src/components/Metadata/styles.ts b/src/components/Metadata/styles.ts
index dbe8f9ec956..531783228f4 100644
--- a/src/components/Metadata/styles.ts
+++ b/src/components/Metadata/styles.ts
@@ -28,6 +28,12 @@ const useStyles = makeStyles(
         ...colName
       },
       colValue: {},
+      actions: {
+        "&&": {
+          paddingBottom: theme.spacing(2),
+          paddingTop: theme.spacing(2)
+        }
+      },
       content: {
         paddingBottom: 0,
         paddingTop: theme.spacing()
diff --git a/src/components/RadioSwitchField/RadioSwitchField.tsx b/src/components/RadioSwitchField/RadioSwitchField.tsx
index 3e75a84b25e..f4942e97c32 100644
--- a/src/components/RadioSwitchField/RadioSwitchField.tsx
+++ b/src/components/RadioSwitchField/RadioSwitchField.tsx
@@ -9,7 +9,7 @@ import classNames from "classnames";
 import React from "react";
 
 const useStyles = makeStyles(
-  {
+  theme => ({
     formControl: {
       padding: 0,
       width: "100%"
@@ -20,18 +20,20 @@ const useStyles = makeStyles(
     },
     radioLabel: {
       "& > span": {
-        padding: "10px 6px"
+        paddingTop: theme.spacing(),
+        paddingBottom: theme.spacing()
       }
     },
     secondLabel: {
       display: "block",
       fontSize: "12px"
     }
-  },
+  }),
   { name: "RadioSwitchField" }
 );
 
 interface RadioSwitchFieldProps {
+  classes?: Record<"radioLabel", string>;
   className?: string;
   disabled?: boolean;
   error?: boolean;
@@ -44,6 +46,7 @@ interface RadioSwitchFieldProps {
 
 export const RadioSwitchField: React.FC<RadioSwitchFieldProps> = props => {
   const {
+    classes: overrideClasses,
     className,
     disabled,
     error,
@@ -80,14 +83,20 @@ export const RadioSwitchField: React.FC<RadioSwitchFieldProps> = props => {
       >
         <FormControlLabel
           value="true"
-          className={classes.radioLabel}
+          className={classNames(
+            classes.radioLabel,
+            overrideClasses?.radioLabel
+          )}
           control={<Radio color="primary" />}
           label={firstOptionLabel}
           name={name}
         />
         <FormControlLabel
           value="false"
-          className={classes.radioLabel}
+          className={classNames(
+            classes.radioLabel,
+            overrideClasses?.radioLabel
+          )}
           control={<Radio color="primary" />}
           label={secondOptionLabel}
           name={name}
diff --git a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx
index fb3b8306827..c268c27aa0b 100644
--- a/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx
+++ b/src/components/SingleAutocompleteSelectField/SingleAutocompleteSelectField.tsx
@@ -22,7 +22,7 @@ const useStyles = makeStyles(
       position: "relative"
     },
     nakedInput: {
-      padding: theme.spacing(2, 3)
+      padding: theme.spacing(2, 0)
     },
     adornment: {
       cursor: "pointer",
diff --git a/src/components/TableFilter/FilterTabs.tsx b/src/components/TableFilter/FilterTabs.tsx
index b5fd2757927..d84fe017037 100644
--- a/src/components/TableFilter/FilterTabs.tsx
+++ b/src/components/TableFilter/FilterTabs.tsx
@@ -6,7 +6,7 @@ const useStyles = makeStyles(
   theme => ({
     tabsRoot: {
       borderBottom: `1px solid ${theme.palette.divider}`,
-      paddingLeft: theme.spacing(3)
+      paddingLeft: theme.spacing(4)
     }
   }),
   { name: "FilterTabs" }
diff --git a/src/components/VisibilityCard/DateVisibilitySelector.tsx b/src/components/VisibilityCard/DateVisibilitySelector.tsx
index 21afd43274e..97dd11ccf26 100644
--- a/src/components/VisibilityCard/DateVisibilitySelector.tsx
+++ b/src/components/VisibilityCard/DateVisibilitySelector.tsx
@@ -13,7 +13,7 @@ const useStyles = makeStyles(
       color: theme.palette.primary.main,
       cursor: "pointer",
       fontSize: 14,
-      marginBottom: theme.spacing(1),
+      margin: theme.spacing(1, 0),
       paddingBottom: 10,
       paddingTop: 0
     },
diff --git a/src/navigation/components/MenuItems/MenuItems.tsx b/src/navigation/components/MenuItems/MenuItems.tsx
index 2aca4268bd7..fd2bed8c8c4 100644
--- a/src/navigation/components/MenuItems/MenuItems.tsx
+++ b/src/navigation/components/MenuItems/MenuItems.tsx
@@ -32,6 +32,9 @@ export interface MenuItemsProps {
 const useStyles = makeStyles(
   theme => ({
     actions: {
+      "&&": {
+        padding: theme.spacing(2, 4)
+      },
       flexDirection: "row"
     },
     container: {
@@ -172,12 +175,13 @@ const Node: React.FC<NodeRendererProps> = props => {
         <Button onClick={node.onClick}>
           <FormattedMessage {...buttonMessages.show} />
         </Button>
-        <IconButton variant="secondary" color="primary" onClick={node.onEdit}>
+        <IconButton variant="secondary" hoverOutline onClick={node.onEdit}>
           <EditIcon />
         </IconButton>
         <IconButton
           className={classes.deleteButton}
-          color="primary"
+          variant="secondary"
+          hoverOutline
           onClick={() =>
             node.onChange({
               id: node.id as any,
diff --git a/src/navigation/components/MenuList/MenuList.tsx b/src/navigation/components/MenuList/MenuList.tsx
index c3503a409b3..f2abcdc6d72 100644
--- a/src/navigation/components/MenuList/MenuList.tsx
+++ b/src/navigation/components/MenuList/MenuList.tsx
@@ -41,7 +41,7 @@ const useStyles = makeStyles(
       colTitle: {}
     },
     colAction: {
-      width: 80
+      width: 84
     },
     colItems: {
       textAlign: "right"
diff --git a/src/pages/components/PageList/PageList.tsx b/src/pages/components/PageList/PageList.tsx
index fe5b3d1c36e..82ac394b328 100644
--- a/src/pages/components/PageList/PageList.tsx
+++ b/src/pages/components/PageList/PageList.tsx
@@ -170,13 +170,13 @@ const PageList: React.FC<PageListProps> = props => {
                       onChange={() => toggle(page.id)}
                     />
                   </TableCell>
-                  <TableCellHeader className={classes.colTitle}>
+                  <TableCell className={classes.colTitle}>
                     {maybe<React.ReactNode>(() => page.title, <Skeleton />)}
-                  </TableCellHeader>
-                  <TableCellHeader className={classes.colSlug}>
+                  </TableCell>
+                  <TableCell className={classes.colSlug}>
                     {maybe<React.ReactNode>(() => page.slug, <Skeleton />)}
-                  </TableCellHeader>
-                  <TableCellHeader className={classes.colVisibility}>
+                  </TableCell>
+                  <TableCell className={classes.colVisibility}>
                     {maybe<React.ReactNode>(
                       () => (
                         <StatusLabel
@@ -196,7 +196,7 @@ const PageList: React.FC<PageListProps> = props => {
                       ),
                       <Skeleton />
                     )}
-                  </TableCellHeader>
+                  </TableCell>
                 </TableRow>
               );
             },
diff --git a/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx b/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx
index 0601d22a3c5..9ea11d7f891 100644
--- a/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx
+++ b/src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx
@@ -27,7 +27,7 @@ const useStyles = makeStyles(
       "&:last-child": {
         paddingRight: 0
       },
-      width: 80
+      width: 84
     },
     colGrab: {
       width: 60
@@ -104,6 +104,7 @@ const ProductTypeAttributes: React.FC<ProductTypeAttributesProps> = props => {
         }
         toolbar={
           <Button
+            disabled={disabled}
             data-test-id={testId}
             variant="tertiary"
             onClick={() => onAttributeAssign(ProductAttributeType[type])}
@@ -190,12 +191,13 @@ const ProductTypeAttributes: React.FC<ProductTypeAttributesProps> = props => {
                   </TableCell>
                   <TableCell className={classes.colAction}>
                     <IconButton
+                      disabled={disabled}
                       variant="secondary"
                       onClick={stopPropagation(() =>
                         onAttributeUnassign(attribute.id)
                       )}
                     >
-                      <DeleteIcon color="primary" />
+                      <DeleteIcon />
                     </IconButton>
                   </TableCell>
                 </SortableTableRow>
diff --git a/src/products/components/ProductStocks/CardAddItemsFooter.tsx b/src/products/components/ProductStocks/CardAddItemsFooter.tsx
index a56f22216e5..c52f451b898 100644
--- a/src/products/components/ProductStocks/CardAddItemsFooter.tsx
+++ b/src/products/components/ProductStocks/CardAddItemsFooter.tsx
@@ -9,8 +9,6 @@ const useStyles = makeStyles(
     container: {
       paddingTop: theme.spacing(1),
       paddingBottom: theme.spacing(1),
-      paddingLeft: theme.spacing(3),
-      paddingRight: theme.spacing(2),
       display: "flex",
       flexDirection: "row",
       justifyContent: "space-between",
@@ -48,6 +46,7 @@ const CardAddItemsFooter: React.FC<CardAddItemsFooterProps> = ({
         {intl.formatMessage(title)}
       </Link>
       <IconButton
+        hoverOutline
         variant="secondary"
         data-test-id={testIds.button}
         color="primary"
diff --git a/src/taxes/components/TaxConfiguration/TaxConfiguration.tsx b/src/taxes/components/TaxConfiguration/TaxConfiguration.tsx
index bf506315909..f1c15cb2487 100644
--- a/src/taxes/components/TaxConfiguration/TaxConfiguration.tsx
+++ b/src/taxes/components/TaxConfiguration/TaxConfiguration.tsx
@@ -2,7 +2,6 @@ import { Card, CardActions, CardContent } from "@material-ui/core";
 import CardTitle from "@saleor/components/CardTitle";
 import ControlledCheckbox from "@saleor/components/ControlledCheckbox";
 import FormSpacer from "@saleor/components/FormSpacer";
-import Hr from "@saleor/components/Hr";
 import { sectionNames } from "@saleor/intl";
 import { Button, makeStyles } from "@saleor/macaw-ui";
 import React from "react";
@@ -67,7 +66,6 @@ export const TaxConfiguration: React.FC<TaxConfigurationProps> = props => {
         />
         <FormSpacer />
       </CardContent>
-      <Hr />
       <CardActions>
         <Button disabled={disabled} onClick={onTaxFetch}>
           <FormattedMessage defaultMessage="Fetch taxes" description="button" />