diff --git a/lib/config/themes.dart b/lib/config/themes.dart
index 6f5f88ac..3f060cea 100644
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@@ -71,7 +71,6 @@ abstract class FluffyThemes {
       style: ElevatedButton.styleFrom(
         primary: AppConfig.primaryColor,
         onPrimary: Colors.white,
-        elevation: 7,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(AppConfig.borderRadius),
         ),
@@ -171,7 +170,6 @@ abstract class FluffyThemes {
       style: ElevatedButton.styleFrom(
         primary: AppConfig.primaryColor,
         onPrimary: Colors.white,
-        elevation: 7,
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(AppConfig.borderRadius),
         ),
diff --git a/lib/pages/views/homeserver_picker_view.dart b/lib/pages/views/homeserver_picker_view.dart
index 9408b977..46b7f1bd 100644
--- a/lib/pages/views/homeserver_picker_view.dart
+++ b/lib/pages/views/homeserver_picker_view.dart
@@ -69,10 +69,7 @@ class HomeserverPickerView extends StatelessWidget {
                       : controller.checkHomeserverAction,
                   child: controller.isLoading
                       ? LinearProgressIndicator()
-                      : Text(
-                          L10n.of(context).connect,
-                          style: TextStyle(color: Colors.white, fontSize: 16),
-                        ),
+                      : Text(L10n.of(context).connect),
                 ),
               ),
             ),
diff --git a/lib/pages/views/login_view.dart b/lib/pages/views/login_view.dart
index c5f222c6..81979638 100644
--- a/lib/pages/views/login_view.dart
+++ b/lib/pages/views/login_view.dart
@@ -57,17 +57,18 @@ class LoginView extends StatelessWidget {
                   obscureText: !controller.showPassword,
                   onSubmitted: controller.login,
                   decoration: InputDecoration(
-                      prefixIcon: Icon(Icons.lock_outlined),
-                      hintText: '****',
-                      errorText: controller.passwordError,
-                      suffixIcon: IconButton(
-                        tooltip: L10n.of(context).showPassword,
-                        icon: Icon(controller.showPassword
-                            ? Icons.visibility_off_outlined
-                            : Icons.visibility_outlined),
-                        onPressed: controller.toggleShowPassword,
-                      ),
-                      labelText: L10n.of(context).password),
+                    prefixIcon: Icon(Icons.lock_outlined),
+                    hintText: '****',
+                    errorText: controller.passwordError,
+                    suffixIcon: IconButton(
+                      tooltip: L10n.of(context).showPassword,
+                      icon: Icon(controller.showPassword
+                          ? Icons.visibility_off_outlined
+                          : Icons.visibility_outlined),
+                      onPressed: controller.toggleShowPassword,
+                    ),
+                    labelText: L10n.of(context).password,
+                  ),
                 ),
               ),
               SizedBox(height: 12),
@@ -81,10 +82,7 @@ class LoginView extends StatelessWidget {
                         : () => controller.login(context),
                     child: controller.loading
                         ? LinearProgressIndicator()
-                        : Text(
-                            L10n.of(context).login,
-                            style: TextStyle(color: Colors.white, fontSize: 16),
-                          ),
+                        : Text(L10n.of(context).login),
                   ),
                 ),
               ),
diff --git a/lib/pages/views/sign_up_password_view.dart b/lib/pages/views/sign_up_password_view.dart
index 46e36845..6abf741d 100644
--- a/lib/pages/views/sign_up_password_view.dart
+++ b/lib/pages/views/sign_up_password_view.dart
@@ -72,10 +72,7 @@ class SignUpPasswordView extends StatelessWidget {
                       controller.loading ? null : controller.signUpAction,
                   child: controller.loading
                       ? LinearProgressIndicator()
-                      : Text(
-                          L10n.of(context).createAccountNow,
-                          style: TextStyle(color: Colors.white, fontSize: 16),
-                        ),
+                      : Text(L10n.of(context).createAccountNow),
                 ),
               ),
             ),
diff --git a/lib/pages/views/sign_up_view.dart b/lib/pages/views/sign_up_view.dart
index 7500a99f..79ee65f7 100644
--- a/lib/pages/views/sign_up_view.dart
+++ b/lib/pages/views/sign_up_view.dart
@@ -61,7 +61,13 @@ class SignUpView extends StatelessWidget {
                           ? null
                           : [AutofillHints.newUsername],
                       decoration: InputDecoration(
-                        prefixIcon: Icon(Icons.account_circle_outlined),
+                        prefixIcon: Padding(
+                          padding: const EdgeInsets.only(
+                            left: 12.0,
+                            right: 22,
+                          ),
+                          child: Icon(Icons.account_circle_outlined),
+                        ),
                         hintText: L10n.of(context).username,
                         errorText: controller.usernameError,
                         labelText: L10n.of(context).chooseAUsername,
@@ -107,11 +113,7 @@ class SignUpView extends StatelessWidget {
                             controller.loading ? null : controller.signUpAction,
                         child: controller.loading
                             ? LinearProgressIndicator()
-                            : Text(
-                                L10n.of(context).signUp,
-                                style: TextStyle(
-                                    color: Colors.white, fontSize: 16),
-                              ),
+                            : Text(L10n.of(context).signUp),
                       ),
                     ),
                   ),
@@ -144,7 +146,6 @@ class SignUpView extends StatelessWidget {
                             primary: Theme.of(context).secondaryHeaderColor,
                             onPrimary:
                                 Theme.of(context).textTheme.bodyText1.color,
-                            //elevation: 1,
                           ),
                           onPressed: () => context.vRouter.push('/login'),
                           child: Text(L10n.of(context).login),