diff --git a/js/CommonComponents.js b/js/CommonComponents.js
index 408ab37..87791dd 100644
--- a/js/CommonComponents.js
+++ b/js/CommonComponents.js
@@ -82,15 +82,15 @@ class InvisibleLoginLogoutButtons extends React.Component {
         if(isSignedIn) {
             return (
                 <ButtonGroup className="nav-item">
-                    <Button href="/profile" className="btn navbar-btn btn-outline-success my-2 my-sm-0 px-5">{ username }</Button>
-                    <Button onClick={logout.bind(this)} className="btn navbar-btn btn-outline-success my-2 my-sm-0 px-5">Logout</Button>
+                    <Button outline color="success"  href="/profile" className="navbar-btn my-2 my-sm-0 px-5">{ username }</Button>
+                    <Button outline color="success" onClick={logout.bind(this)} className="navbar-btn my-2 my-sm-0 px-5">Logout</Button>
                 </ButtonGroup>
             );
         } else {
             return (
                 <ButtonGroup className="nav-item">
-                    <Button href="/login" className="btn navbar-btn btn-outline-success my-2 my-sm-0 px-5">Login</Button>
-                    <Button href="/register" className="btn navbar-btn btn-outline-success my-2 my-sm-0 px-5">Registrieren</Button>
+                    <Button outline color="success" href="/login" className="navbar-btn my-2 my-sm-0 px-5">Login</Button>
+                    <Button outline color="success" href="/register" className="navbar-btn my-2 my-sm-0 px-5">Registrieren</Button>
                 </ButtonGroup>
             );
         }
diff --git a/pages/index.js b/pages/index.js
index 8dfc2ea..b49f80d 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -118,7 +118,7 @@ function PromotedLinkTournamentCode() {
             <CardBody className="row">
                 <form id="turniercode-form" className="col-lg-4" action="/t" method="get">
                     <input className="form-control" type="search" name="code" placeholder="Turnier-Code"/>
-                    <Button className="btn btn-outline-success w-100 my-2" type="submit">Turnier-Code öffnen</Button>
+                    <Button outline color="success" className="w-100 my-2" type="submit">Turnier-Code öffnen</Button>
                 </form>
                 <div className="col-lg-8">
                     <p>Gib hier einen Turnier Code ein, um direkt zum entsprechenden Turnier zu gelangen.</p>