diff --git a/lib/models/irc.dart b/lib/models/irc.dart
index 76e2f01f..38b52802 100644
--- a/lib/models/irc.dart
+++ b/lib/models/irc.dart
@@ -189,7 +189,7 @@ class IRCMessage {
     // Add FFZ badges to span
     if (ffzUserBadges != null) {
       for (final badge in ffzUserBadges) {
-        final color = Color(int.parse(badge.color!.replaceFirst('#', '0xff')));
+        final color = Color(int.parse(badge.color!.replaceFirst('#', '0xFF')));
 
         if (badge.name == 'Bot') {
           if (!skipBot) {
@@ -243,7 +243,7 @@ class IRCMessage {
       }
     }
 
-    var color = Color(int.parse((tags['color'] ?? '#868686').replaceFirst('#', '0xff')));
+    var color = Color(int.parse((tags['color'] ?? '#868686').replaceFirst('#', '0xFF')));
 
     if (useReadableColors) {
       final hsl = HSLColor.fromColor(color);
diff --git a/lib/screens/channel/chat/details/chat_users_list.dart b/lib/screens/channel/chat/details/chat_users_list.dart
index 0dc8c52d..cec8f08c 100644
--- a/lib/screens/channel/chat/details/chat_users_list.dart
+++ b/lib/screens/channel/chat/details/chat_users_list.dart
@@ -78,7 +78,7 @@ class _ChattersListState extends State<ChattersList> {
                   icon: const Icon(Icons.clear),
                 ),
                 border: const OutlineInputBorder(
-                  borderRadius: BorderRadius.all(Radius.circular(10.0)),
+                  borderRadius: BorderRadius.all(Radius.circular(15.0)),
                 ),
               ),
             ),
diff --git a/lib/screens/channel/chat/widgets/chat_bottom_bar.dart b/lib/screens/channel/chat/widgets/chat_bottom_bar.dart
index 12ee3a26..30f1a7a8 100644
--- a/lib/screens/channel/chat/widgets/chat_bottom_bar.dart
+++ b/lib/screens/channel/chat/widgets/chat_bottom_bar.dart
@@ -54,7 +54,7 @@ class ChatBottomBar extends StatelessWidget {
                 hintMaxLines: 1,
                 contentPadding: const EdgeInsets.all(10.0),
                 border: const OutlineInputBorder(
-                  borderRadius: BorderRadius.all(Radius.circular(10.0)),
+                  borderRadius: BorderRadius.all(Radius.circular(15.0)),
                 ),
                 hintText: chatStore.auth.isLoggedIn ? 'Send a message' : "Log in to chat",
               ),
diff --git a/lib/screens/home/search/search.dart b/lib/screens/home/search/search.dart
index 8e0a604b..b1c5d30f 100644
--- a/lib/screens/home/search/search.dart
+++ b/lib/screens/home/search/search.dart
@@ -35,7 +35,7 @@ class _SearchState extends State<Search> {
               hintText: 'Search for a channel or category',
               contentPadding: const EdgeInsets.all(10.0),
               border: const OutlineInputBorder(
-                borderRadius: BorderRadius.all(Radius.circular(10.0)),
+                borderRadius: BorderRadius.all(Radius.circular(15.0)),
               ),
               suffixIcon: IconButton(
                 tooltip: 'Clear Search',
@@ -48,9 +48,7 @@ class _SearchState extends State<Search> {
                 icon: const Icon(Icons.clear),
               ),
             ),
-            onSubmitted: (query) => setState(() {
-              searchStore.handleQuery(query);
-            }),
+            onSubmitted: (query) => setState(() => searchStore.handleQuery(query)),
           ),
         ),
         Expanded(