diff --git a/src/components/Login/index.jsx b/src/components/Login/index.jsx
index f102a18..dfdee13 100644
--- a/src/components/Login/index.jsx
+++ b/src/components/Login/index.jsx
@@ -4,7 +4,7 @@ import classNames from 'classnames';
 import withStyles from '@material-ui/core/styles/withStyles';
 import Grid from '@material-ui/core/Grid';
 
-import PrimaryButton from '../Buttons';
+import { Button } from '../Buttons';
 import Link from '../Links';
 import TextField from '../Inputs/TextField';
 
@@ -72,9 +72,7 @@ const Login = ({
       <div className={classes.textRight}>{recoveryPass}</div>
 
       <div className={classNames(classes.textCenter, classes.action)}>
-        <PrimaryButton tag="button" type="submit" id="buttonLogin">
-          {labels.submit}
-        </PrimaryButton>
+        <Button id="buttonLogin" type="submit">{labels.submit}</Button>
       </div>
 
       <div className={classes.textCenter}>{createAccount}</div>
diff --git a/src/components/PasswordRecovery/index.jsx b/src/components/PasswordRecovery/index.jsx
index 6831e97..eed3f84 100644
--- a/src/components/PasswordRecovery/index.jsx
+++ b/src/components/PasswordRecovery/index.jsx
@@ -4,7 +4,7 @@ import withStyles from '@material-ui/core/styles/withStyles';
 import Grid from '@material-ui/core/Grid';
 import Typography from '@material-ui/core/Typography';
 
-import PrimaryButton from '../Buttons';
+import { Button } from '../Buttons';
 import TextField from '../Inputs/TextField';
 
 const style = {
@@ -62,9 +62,7 @@ const PasswordRecovery = ({
       />
 
       <div className={classes.action}>
-        <PrimaryButton tag="button" type="submit" id="buttonRecoveryPass">
-          {labels.submit}
-        </PrimaryButton>
+        <Button id="buttonRecoveryPass" type="submit">{labels.submit}</Button>
       </div>
     </Grid>
   </Grid>
diff --git a/src/components/SignUp/index.jsx b/src/components/SignUp/index.jsx
index a5d42cc..9bfe019 100644
--- a/src/components/SignUp/index.jsx
+++ b/src/components/SignUp/index.jsx
@@ -4,7 +4,7 @@ import withStyles from '@material-ui/core/styles/withStyles';
 import Grid from '@material-ui/core/Grid';
 import Typography from '@material-ui/core/Typography';
 
-import PrimaryButton from '../Buttons';
+import { Button } from '../Buttons';
 import Link from '../Links';
 import TextField from '../Inputs/TextField';
 
@@ -83,9 +83,7 @@ const SingUp = ({
       />
 
       <div className={classes.action}>
-        <PrimaryButton tag="button" type="submit" id="buttonSignUp">
-          {labels.submit}
-        </PrimaryButton>
+        <Button id="buttonSignUp" type="submit">{labels.submit}</Button>
       </div>
 
       <Typography