diff --git a/lib/config/themes.dart b/lib/config/themes.dart
index a29f50c91..236188cf7 100644
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@@ -59,7 +59,7 @@ abstract class FluffyThemes {
             ? Colors.blueGrey.shade50
             : Colors.blueGrey.shade900,
         inputDecorationTheme: const InputDecorationTheme(
-          border: UnderlineInputBorder(borderSide: BorderSide(width: 1)),
+          border: InputBorder.none,
           filled: true,
         ),
         appBarTheme: AppBarTheme(
diff --git a/lib/pages/connect/connect_page_view.dart b/lib/pages/connect/connect_page_view.dart
index e40919c88..d10639266 100644
--- a/lib/pages/connect/connect_page_view.dart
+++ b/lib/pages/connect/connect_page_view.dart
@@ -122,7 +122,7 @@ class ConnectPageView extends StatelessWidget {
                   Expanded(
                     child: Divider(
                       thickness: 1,
-                      color: Theme.of(context).textTheme.subtitle1?.color,
+                      color: Theme.of(context).dividerColor,
                     ),
                   ),
                   Padding(
@@ -135,7 +135,7 @@ class ConnectPageView extends StatelessWidget {
                   Expanded(
                     child: Divider(
                       thickness: 1,
-                      color: Theme.of(context).textTheme.subtitle1?.color,
+                      color: Theme.of(context).dividerColor,
                     ),
                   ),
                 ],
diff --git a/lib/pages/login/login_view.dart b/lib/pages/login/login_view.dart
index dc98757b3..f76cc3ede 100644
--- a/lib/pages/login/login_view.dart
+++ b/lib/pages/login/login_view.dart
@@ -103,7 +103,7 @@ class LoginView extends StatelessWidget {
                     Expanded(
                       child: Divider(
                         thickness: 1,
-                        color: Theme.of(context).textTheme.subtitle1?.color,
+                        color: Theme.of(context).dividerColor,
                       ),
                     ),
                     Padding(
@@ -116,7 +116,7 @@ class LoginView extends StatelessWidget {
                     Expanded(
                       child: Divider(
                         thickness: 1,
-                        color: Theme.of(context).textTheme.subtitle1?.color,
+                        color: Theme.of(context).dividerColor,
                       ),
                     ),
                   ],