diff --git a/packages/asc-web-components/button/styled-button.js b/packages/asc-web-components/button/styled-button.js
index ea2b5ed943..320c03ee76 100644
--- a/packages/asc-web-components/button/styled-button.js
+++ b/packages/asc-web-components/button/styled-button.js
@@ -143,11 +143,10 @@ const StyledButton = styled(ButtonWrapper).attrs((props) => ({
       : props.theme.button.border.base};
 
   ${(props) => props.scale && `width: 100%;`}
-
-  padding: ${(props) => `${props.theme.button.padding[props.size]}`};
-
   ${(props) => (props.minwidth ? `min-width: ${props.minwidth};` : null)}
 
+  padding: ${(props) => `${props.theme.button.padding[props.size]}`};
+  
   cursor: ${(props) =>
     props.isDisabled || props.isLoading ? "default !important" : "pointer"};
 
diff --git a/packages/asc-web-components/save-cancel-buttons/index.js b/packages/asc-web-components/save-cancel-buttons/index.js
index 4d89a44b75..5e95303c58 100644
--- a/packages/asc-web-components/save-cancel-buttons/index.js
+++ b/packages/asc-web-components/save-cancel-buttons/index.js
@@ -62,26 +62,16 @@ class SaveCancelButtons extends React.Component {
         <div className="buttons-flex">
           <Button
             className="save-button"
-<<<<<<< HEAD
             size="normal"
-            isDisabled={false}
-=======
-            size="big"
             isDisabled={isDisabled}
->>>>>>> feature/virtual-rooms-1.2
             primary
             onClick={onSaveClick}
             label={saveButtonLabel}
           />
           <Button
             className="cancel-button"
-<<<<<<< HEAD
             size="normal"
-            isDisabled={false}
-=======
-            size="big"
             isDisabled={isDisabled}
->>>>>>> feature/virtual-rooms-1.2
             onClick={onCancelClick}
             label={cancelButtonLabel}
           />
diff --git a/packages/asc-web-components/themes/dark.js b/packages/asc-web-components/themes/dark.js
index ed51061759..09ecb894e3 100644
--- a/packages/asc-web-components/themes/dark.js
+++ b/packages/asc-web-components/themes/dark.js
@@ -96,36 +96,43 @@ const Dark = {
     paddingRight: "4px",
 
     height: {
-      base: "24px",
-      medium: "32px",
-      big: "36px",
-      large: "44px",
+      extraSmall: "24px",
+      small: "32px",
+      normalDesktop: "36px",
+      normalTouchscreen: "40px",
+      medium: "44px",
     },
 
     lineHeight: {
-      base: "15px",
-      medium: "18px",
-      big: "20px",
-      large: "20px",
+      extraSmall: "15px",
+      small: "20px",
+      normalDesktop: "16px",
+      normalTouchscreen: "16px",
+      medium: "22px",
     },
 
     fontSize: {
-      base: "12px",
-      medium: "13px",
-      big: "14px",
-      large: "16px",
+      extraSmall: "12px",
+      small: "13px",
+      normalDesktop: "14px",
+      normalTouchscreen: "14px",
+      medium: "16px",
     },
 
     padding: {
-      base: "0 14px",
-      medium: "0 18px",
-      big: "0 20px",
+      extraSmall: "0 12px",
+      small: "0 28px",
+      normalDesktop: "0 28px",
+      normalTouchscreen: "0 28px",
+      medium: "0 32px",
     },
 
     minWidth: {
-      base: "65px",
-      medium: "80px",
-      big: "85px",
+      extraSmall: "none",
+      small: "100px",
+      normalDesktop: "100px",
+      normalTouchscreen: "100px",
+      medium: "100px",
     },
 
     color: {
@@ -330,96 +337,6 @@ const Dark = {
     },
   },
 
-  button: {
-    fontWeight: "600",
-    margin: "0",
-    display: "inline-block",
-    textAlign: "center",
-    textDecoration: "none",
-
-    topVerticalAlign: "text-top",
-    middleVerticalAlign: "middle",
-    bottomVerticalAlign: "text-bottom",
-
-    borderRadius: "3px",
-    stroke: "none",
-    overflow: "hidden",
-    textOverflow: "ellipsis",
-    whiteSpace: "nowrap",
-    outline: "none",
-    boxSizing: "border-box",
-
-    paddingRight: "4px",
-
-    height: {
-      extraSmall: "24px",
-      small: "32px",
-      normalDesktop: "36px",
-      normalTouchscreen: "40px",
-      medium: "44px",
-    },
-
-    lineHeight: {
-      extraSmall: "15px",
-      small: "20px",
-      normalDesktop: "16px",
-      normalTouchscreen: "16px",
-      medium: "22px",
-    },
-
-    fontSize: {
-      extraSmall: "12px",
-      small: "13px",
-      normalDesktop: "14px",
-      normalTouchscreen: "14px",
-      medium: "16px",
-    },
-
-    padding: {
-      extraSmall: "0 12px",
-      small: "0 28px",
-      normalDesktop: "0 28px",
-      normalTouchscreen: "0 28px",
-      medium: "0 32px",
-    },
-
-    minWidth: {
-      extraSmall: "none",
-      small: "100px",
-      normalDesktop: "100px",
-      normalTouchscreen: "100px",
-      medium: "100px",
-    },
-
-    color: {
-      base: black,
-      primary: white,
-      disabled: grayLightMid,
-    },
-
-    backgroundColor: {
-      base: white,
-      baseHover: white,
-      baseActive: grayLightMid,
-      baseDisabled: grayLight,
-      primary: blueMain,
-      primaryHover: blueHover,
-      primaryActive: blueActive,
-      primaryDisabled: blueDisabled,
-    },
-
-    border: {
-      base: `1px solid ${globalColors.grayMid}`,
-      baseHover: `1px solid ${globalColors.blueMain}`,
-      baseActive: `1px solid ${globalColors.blueMain}`,
-      baseDisabled: `1px solid ${globalColors.grayLightMid}`,
-      primary: `1px solid ${globalColors.blueMain}`,
-      primaryHover: `1px solid ${globalColors.blueHover}`,
-      primaryActive: `1px solid ${globalColors.blueActive}`,
-      primaryDisabled: `1px solid ${globalColors.blueDisabled}`,
-    },
-  },
-
   groupButton: {
     fontSize: "14px",
     lineHeight: "19px",