diff --git a/packages/admin-ui/src/components/02_atoms/MultipleFields/MultipleFields.js b/packages/admin-ui/src/components/02_atoms/MultipleFields/MultipleFields.js
index 63a0d5ab9..c40e114b6 100644
--- a/packages/admin-ui/src/components/02_atoms/MultipleFields/MultipleFields.js
+++ b/packages/admin-ui/src/components/02_atoms/MultipleFields/MultipleFields.js
@@ -8,6 +8,7 @@ import ListItem from '@material-ui/core/ListItem';
 import DeleteIcon from '@material-ui/icons/Delete';
 import FormLabel from '@material-ui/core/FormLabel';
 import ReorderIcon from '@material-ui/icons/Reorder';
+import Fab from '@material-ui/core/Fab';
 import FormControl from '@material-ui/core/FormControl';
 import ListItemText from '@material-ui/core/ListItemText';
 import ListItemIcon from '@material-ui/core/ListItemIcon';
@@ -210,9 +211,8 @@ class MultipleFields extends Component {
                   })}
                 </ListItemText>
                 <Fragment>
-                  <Button
+                  <Fab
                     mini
-                    variant="fab"
                     color="secondary"
                     className="remove"
                     aria-label="Remove Image"
@@ -224,7 +224,7 @@ class MultipleFields extends Component {
                     }}
                   >
                     <DeleteIcon />
-                  </Button>
+                  </Fab>
                 </Fragment>
               </ListItem>
             ))}
diff --git a/packages/admin-ui/src/components/02_atoms/Widgets/FileUploadWidget.js b/packages/admin-ui/src/components/02_atoms/Widgets/FileUploadWidget.js
index cafb1211b..c167c8481 100644
--- a/packages/admin-ui/src/components/02_atoms/Widgets/FileUploadWidget.js
+++ b/packages/admin-ui/src/components/02_atoms/Widgets/FileUploadWidget.js
@@ -10,7 +10,7 @@ import FormLabel from '@material-ui/core/FormLabel';
 import TextField from '@material-ui/core/TextField';
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
-import Button from '@material-ui/core/Button';
+import Fab from '@material-ui/core/Fab';
 import DeleteIcon from '@material-ui/icons/Delete';
 
 import WidgetPropTypes from '../../05_pages/NodeForm/WidgetPropTypes';
@@ -250,10 +250,9 @@ class FileUploadWidget extends React.Component {
                                 )
                               }
                             />
-                            <Button
+                            <Fab
                               mini
                               id={id}
-                              variant="fab"
                               color="secondary"
                               className="remove"
                               aria-label="Remove Image"
@@ -268,7 +267,7 @@ class FileUploadWidget extends React.Component {
                               }}
                             >
                               <DeleteIcon />
-                            </Button>
+                            </Fab>
                           </ListItem>
                           {!last && <Divider />}
                         </Fragment>
diff --git a/packages/admin-ui/src/components/05_pages/Content/Content.js b/packages/admin-ui/src/components/05_pages/Content/Content.js
index 5a86d50a5..035503d0f 100644
--- a/packages/admin-ui/src/components/05_pages/Content/Content.js
+++ b/packages/admin-ui/src/components/05_pages/Content/Content.js
@@ -10,6 +10,7 @@ import Paper from '@material-ui/core/Paper';
 import Input from '@material-ui/core/Input';
 import InputLabel from '@material-ui/core/InputLabel';
 import MenuItem from '@material-ui/core/MenuItem';
+import Fab from '@material-ui/core/Fab';
 import FormControl from '@material-ui/core/FormControl';
 import ListItemText from '@material-ui/core/ListItemText';
 import Select from '@material-ui/core/Select';
@@ -310,8 +311,7 @@ class Content extends Component {
                 </Fragment>
               )}
 
-              <Button
-                variant="fab"
+              <Fab
                 color="primary"
                 aria-label="add"
                 className={styles.addButton}
@@ -319,7 +319,7 @@ class Content extends Component {
                 to="/node/add"
               >
                 <AddIcon />
-              </Button>
+              </Fab>
             </div>
             <ContentTable
               pageChangeHandler={this.pageChangeHandler}
diff --git a/packages/admin-ui/src/components/05_pages/TaxonomyTermsOverview/TaxonomyTermsOverview.js b/packages/admin-ui/src/components/05_pages/TaxonomyTermsOverview/TaxonomyTermsOverview.js
index 0b7773409..35d549a90 100644
--- a/packages/admin-ui/src/components/05_pages/TaxonomyTermsOverview/TaxonomyTermsOverview.js
+++ b/packages/admin-ui/src/components/05_pages/TaxonomyTermsOverview/TaxonomyTermsOverview.js
@@ -14,7 +14,7 @@ import TableCell from '@material-ui/core/TableCell';
 import TableHead from '@material-ui/core/TableHead';
 import TableRow from '@material-ui/core/TableRow';
 
-import Button from '@material-ui/core/Button';
+import Fab from '@material-ui/core/Fab';
 import AddIcon from '@material-ui/icons/Add';
 
 import FormControl from '@material-ui/core/FormControl';
@@ -119,8 +119,7 @@ export default class TaxonomyTermsOverview extends React.Component {
             </TableBody>
           </Table>
         </Paper>
-        <Button
-          variant="fab"
+        <Fab
           color="primary"
           aria-label="add"
           className={styles.addButton}
@@ -128,7 +127,7 @@ export default class TaxonomyTermsOverview extends React.Component {
           to={`/admin/structure/taxonomy/manage/${this.props.vocabulary}/add`}
         >
           <AddIcon />
-        </Button>
+        </Fab>
       </Fragment>
     );
   }