diff --git a/lib/ui/auth/lock_screen.dart b/lib/ui/auth/lock_screen.dart
index 3fe8a95fb..88e3bdcdb 100644
--- a/lib/ui/auth/lock_screen.dart
+++ b/lib/ui/auth/lock_screen.dart
@@ -38,7 +38,7 @@ class LockScreen extends StatelessWidget {
               ),
             ],
           ),
-          RaisedButton(
+          ElevatedButton(
             onPressed: onAuthenticatePressed,
             child: Text(localization.authenticate),
           )
diff --git a/lib/ui/settings/user_details.dart b/lib/ui/settings/user_details.dart
index d1cb3bd57..bc7b0ab0e 100644
--- a/lib/ui/settings/user_details.dart
+++ b/lib/ui/settings/user_details.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
 import 'package:flutter_styled_toast/flutter_styled_toast.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
@@ -572,29 +571,30 @@ class _EnableTwoFactorState extends State<_EnableTwoFactor> {
                         ),
                       ],
                     ),
-                    if (false)
-                      Row(
-                        children: [
-                          Expanded(
-                            child: DecoratedFormField(
-                              label: localzation.smsCode,
-                              onChanged: (value) {
-                                _smsCode = value;
-                              },
-                            ),
+                    /*
+                    Row(
+                      children: [
+                        Expanded(
+                          child: DecoratedFormField(
+                            label: localzation.smsCode,
+                            onChanged: (value) {
+                              _smsCode = value;
+                            },
                           ),
-                          SizedBox(width: kTableColumnGap),
-                          SizedBox(
-                            width: 100,
-                            child: TextButton(
-                              onPressed: () {
-                                //
-                              },
-                              child: Text(localzation.sendSms),
-                            ),
+                        ),
+                        SizedBox(width: kTableColumnGap),
+                        SizedBox(
+                          width: 100,
+                          child: TextButton(
+                            onPressed: () {
+                              //
+                            },
+                            child: Text(localzation.sendSms),
                           ),
-                        ],
-                      ),
+                        ),
+                      ],
+                    ),
+                    */
                   ],
                 ),
               ),
diff --git a/samples/form_keys.dart b/samples/form_keys.dart
index 031ff1971..80b3b84d8 100644
--- a/samples/form_keys.dart
+++ b/samples/form_keys.dart
@@ -222,9 +222,7 @@ class ContactsPageState extends State<ContactsPage>
 
     items.add(Padding(
       padding: const EdgeInsets.all(16),
-      child: RaisedButton(
-        elevation: 4.0,
-        textColor: Theme.of(context).secondaryHeaderColor,
+      child: ElevatedButton(
         child: Text('ADD CONTACT'),
         onPressed: _onAddPressed,
       ),
diff --git a/samples/form_redux.dart b/samples/form_redux.dart
index 2cfffc189..5393922ba 100644
--- a/samples/form_redux.dart
+++ b/samples/form_redux.dart
@@ -257,9 +257,7 @@ class ContactsPage extends StatelessWidget {
           ..addAll(contacts)
           ..add(Padding(
             padding: const EdgeInsets.all(16),
-            child: RaisedButton(
-              elevation: 4.0,
-              textColor: Theme.of(context).secondaryHeaderColor,
+            child: ElevatedButton(
               child: Text('ADD CONTACT'),
               onPressed: () {
                 store.dispatch(AddContact());