diff --git a/src/Journals/Journal.tsx b/src/Journals/Journal.tsx
index a02b1df..519c1cf 100644
--- a/src/Journals/Journal.tsx
+++ b/src/Journals/Journal.tsx
@@ -107,7 +107,7 @@ class Journal extends React.Component<PropsTypeInner> {
           }
         </AppBarOverride>
         <Tabs
-          fullWidth={true}
+          variant="fullWidth"
           style={{ backgroundColor: theme.palette.primary.main }}
           value={currentTab}
           onChange={(event, tab) => this.setState({ tab })}
diff --git a/src/Journals/JournalEdit.tsx b/src/Journals/JournalEdit.tsx
index d42e56f..d59f95d 100644
--- a/src/Journals/JournalEdit.tsx
+++ b/src/Journals/JournalEdit.tsx
@@ -123,7 +123,7 @@ class JournalEdit extends React.PureComponent<PropsTypeInner> {
 
             <div style={styles.submit}>
               <Button
-                variant="raised"
+                variant="contained"
                 onClick={onCancel}
               >
                <IconCancel style={{marginRight: 8}} />
@@ -132,7 +132,7 @@ class JournalEdit extends React.PureComponent<PropsTypeInner> {
 
               {this.props.item &&
                 <Button
-                  variant="raised"
+                  variant="contained"
                   style={{marginLeft: 15, backgroundColor: colors.red[500], color: 'white'}}
                   onClick={this.onDeleteRequest}
                 >
@@ -143,7 +143,7 @@ class JournalEdit extends React.PureComponent<PropsTypeInner> {
 
               <Button
                 type="submit"
-                variant="raised"
+                variant="contained"
                 color="secondary"
                 style={{marginLeft: 15}}
               >
diff --git a/src/Pim/PimMain.tsx b/src/Pim/PimMain.tsx
index 6a0e240..bbf58e7 100644
--- a/src/Pim/PimMain.tsx
+++ b/src/Pim/PimMain.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import Button from '@material-ui/core/Button';
+import Fab from '@material-ui/core/Fab';
 import ContentAdd from '@material-ui/icons/Add';
 import Tab from '@material-ui/core/Tab';
 import Tabs from '@material-ui/core/Tabs';
@@ -95,7 +95,7 @@ class PimMain extends React.PureComponent<PropsType> {
     return (
       <React.Fragment>
         <Tabs
-          fullWidth={true}
+          variant="fullWidth"
           style={{ backgroundColor: theme.palette.primary.main }}
           value={tab}
           onChange={(event, value) => this.setState({tab: value})}
@@ -122,14 +122,13 @@ class PimMain extends React.PureComponent<PropsType> {
           </Container>
         }
 
-        <Button
-          variant="fab"
+        <Fab
           color="primary"
           style={style.floatingButton}
           onClick={this.floatingButtonClicked}
         >
           <ContentAdd />
-        </Button>
+        </Fab>
       </React.Fragment>
     );
   }
diff --git a/src/components/ContactEdit.tsx b/src/components/ContactEdit.tsx
index 6984435..326946d 100644
--- a/src/components/ContactEdit.tsx
+++ b/src/components/ContactEdit.tsx
@@ -479,7 +479,7 @@ class ContactEdit extends React.PureComponent {
 
           <div style={styles.submit}>
             <Button
-              variant="raised"
+              variant="contained"
               onClick={this.props.onCancel}
             >
              <IconCancel style={{marginRight: 8}} />
@@ -488,7 +488,7 @@ class ContactEdit extends React.PureComponent {
 
             {this.props.item &&
               <Button
-                variant="raised"
+                variant="contained"
                 style={{marginLeft: 15, backgroundColor: colors.red[500], color: 'white'}}
                 onClick={this.onDeleteRequest}
               >
@@ -499,7 +499,7 @@ class ContactEdit extends React.PureComponent {
 
             <Button
               type="submit"
-              variant="raised"
+              variant="contained"
               color="secondary"
               style={{marginLeft: 15}}
             >
diff --git a/src/components/EncryptionLoginForm.tsx b/src/components/EncryptionLoginForm.tsx
index fb888da..616775a 100644
--- a/src/components/EncryptionLoginForm.tsx
+++ b/src/components/EncryptionLoginForm.tsx
@@ -85,7 +85,7 @@ class EncryptionLoginForm extends React.PureComponent {
           <div style={styles.submit}>
             <Button
               type="submit"
-              variant="raised"
+              variant="contained"
               color="secondary"
               disabled={this.props.loading}
             >
diff --git a/src/components/EventEdit.tsx b/src/components/EventEdit.tsx
index ed854f9..832f0c1 100644
--- a/src/components/EventEdit.tsx
+++ b/src/components/EventEdit.tsx
@@ -305,7 +305,7 @@ class EventEdit extends React.PureComponent {
 
           <div style={styles.submit}>
             <Button
-              variant="raised"
+              variant="contained"
               onClick={this.props.onCancel}
             >
              <IconCancel style={{marginRight: 8}} />
@@ -314,7 +314,7 @@ class EventEdit extends React.PureComponent {
 
             {this.props.item &&
               <Button
-                variant="raised"
+                variant="contained"
                 style={{marginLeft: 15, backgroundColor: colors.red[500], color: 'white'}}
                 onClick={this.onDeleteRequest}
               >
@@ -325,7 +325,7 @@ class EventEdit extends React.PureComponent {
 
             <Button
               type="submit"
-              variant="raised"
+              variant="contained"
               color="secondary"
               style={{marginLeft: 15}}
             >
diff --git a/src/components/LoginForm.tsx b/src/components/LoginForm.tsx
index 717ae24..ce0b73d 100644
--- a/src/components/LoginForm.tsx
+++ b/src/components/LoginForm.tsx
@@ -184,7 +184,7 @@ class LoginForm extends React.PureComponent {
 
           <div style={styles.submit}>
             <Button
-              variant="raised"
+              variant="contained"
               type="submit"
               color="secondary"
               disabled={this.props.loading}