diff --git a/webapp/src/components/viewTitle.tsx b/webapp/src/components/viewTitle.tsx
index 6dfea7e36..63cc9e5c5 100644
--- a/webapp/src/components/viewTitle.tsx
+++ b/webapp/src/components/viewTitle.tsx
@@ -54,8 +54,8 @@ class ViewTitle extends React.Component<Props, State> {
                             const newIcon = BlockIcons.shared.randomIcon()
                             mutator.changeIcon(board, newIcon)
                         }}
+                        icon={<EmojiIcon/>}
                     >
-                        <EmojiIcon/>
                         <FormattedMessage
                             id='TableComponent.add-icon'
                             defaultMessage='Add Icon'
diff --git a/webapp/src/widgets/buttons/button.scss b/webapp/src/widgets/buttons/button.scss
index 87db45ea1..f98c3796a 100644
--- a/webapp/src/widgets/buttons/button.scss
+++ b/webapp/src/widgets/buttons/button.scss
@@ -13,10 +13,7 @@
 	&:hover {
         background-color: rgba(var(--main-fg), 0.1);
 	}
-	.octo-hovercontrol {
-		background: rgb(239, 239, 238);
-	}
-    
+
     .Icon {
         width: 14px;
         height: 14px;
diff --git a/webapp/src/widgets/buttons/button.tsx b/webapp/src/widgets/buttons/button.tsx
index 301465cae..ad66575e9 100644
--- a/webapp/src/widgets/buttons/button.tsx
+++ b/webapp/src/widgets/buttons/button.tsx
@@ -6,22 +6,20 @@ import './button.scss'
 
 type Props = {
     onClick?: (e: React.MouseEvent<HTMLDivElement>) => void
-    style?: React.CSSProperties
-    backgroundColor?: string
     children?: React.ReactNode
     title?: string
+    icon?: React.ReactNode
 }
 
 export default class Button extends React.Component<Props> {
     render() {
-        const style = {...this.props.style, backgroundColor: this.props.backgroundColor}
         return (
             <div
                 onClick={this.props.onClick}
-                className='Button octo-button'
-                style={style}
+                className='Button'
                 title={this.props.title}
             >
+                {this.props.icon}
                 {this.props.children}
             </div>)
     }