diff --git a/lib/app_config.dart b/lib/app_config.dart
index dd8d74e5..502ecf58 100644
--- a/lib/app_config.dart
+++ b/lib/app_config.dart
@@ -41,6 +41,8 @@ abstract class AppConfig {
   static const String emojiFontName = 'Noto Emoji';
   static const String emojiFontUrl =
       'https://github.com/googlefonts/noto-emoji/';
+  static const double borderRadius = 12.0;
+  static const double messageBubbleBorderRadius = 16.0;
 
   static void loadFromJson(Map<String, dynamic> json) {
     if (json['application_name'] is String) {
diff --git a/lib/components/default_app_bar_search_field.dart b/lib/components/default_app_bar_search_field.dart
index b6234c7f..00fc6075 100644
--- a/lib/components/default_app_bar_search_field.dart
+++ b/lib/components/default_app_bar_search_field.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 
+import '../app_config.dart';
+
 class DefaultAppBarSearchField extends StatefulWidget {
   final TextEditingController searchController;
   final void Function(String) onChanged;
@@ -81,7 +83,7 @@ class DefaultAppBarSearchFieldState extends State<DefaultAppBarSearchField> {
         decoration: InputDecoration(
           prefixText: widget.prefixText,
           enabledBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(12),
+            borderRadius: BorderRadius.circular(AppConfig.borderRadius),
             borderSide:
                 BorderSide(color: Theme.of(context).secondaryHeaderColor),
           ),
diff --git a/lib/components/list_items/message.dart b/lib/components/list_items/message.dart
index 93c5cbf5..a5fa9382 100644
--- a/lib/components/list_items/message.dart
+++ b/lib/components/list_items/message.dart
@@ -76,8 +76,6 @@ class Message extends StatelessWidget {
           : Theme.of(context).primaryColor;
     }
 
-    final radius = 16.0;
-
     var rowChildren = <Widget>[
       Expanded(
         child: Container(
@@ -87,7 +85,8 @@ class Message extends StatelessWidget {
             padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 10),
             decoration: BoxDecoration(
               color: color,
-              borderRadius: BorderRadius.circular(radius),
+              borderRadius:
+                  BorderRadius.circular(AppConfig.messageBubbleBorderRadius),
             ),
             constraints:
                 BoxConstraints(maxWidth: FluffyThemes.columnWidth * 1.5),
diff --git a/lib/config/themes.dart b/lib/config/themes.dart
index 33f3f685..5d2b378c 100644
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@@ -42,12 +42,12 @@ abstract class FluffyThemes {
     ),
     dialogTheme: DialogTheme(
       shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(8.0),
+        borderRadius: BorderRadius.circular(AppConfig.borderRadius),
       ),
     ),
     popupMenuTheme: PopupMenuThemeData(
       shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(8.0),
+        borderRadius: BorderRadius.circular(AppConfig.borderRadius),
       ),
     ),
     floatingActionButtonTheme: FloatingActionButtonThemeData(
@@ -55,9 +55,10 @@ abstract class FluffyThemes {
       foregroundColor: Colors.white,
     ),
     inputDecorationTheme: InputDecorationTheme(
-      border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
+      border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(AppConfig.borderRadius)),
       enabledBorder: OutlineInputBorder(
-        borderRadius: BorderRadius.circular(12),
+        borderRadius: BorderRadius.circular(AppConfig.borderRadius),
         borderSide: BorderSide(
           color: AppConfig.primaryColor.withAlpha(16),
         ),
@@ -90,12 +91,12 @@ abstract class FluffyThemes {
     textTheme: Typography.material2018().white.merge(fallback_text_theme),
     dialogTheme: DialogTheme(
       shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(8.0),
+        borderRadius: BorderRadius.circular(AppConfig.borderRadius),
       ),
     ),
     popupMenuTheme: PopupMenuThemeData(
       shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(8.0),
+        borderRadius: BorderRadius.circular(AppConfig.borderRadius),
       ),
     ),
     floatingActionButtonTheme: FloatingActionButtonThemeData(
@@ -103,11 +104,12 @@ abstract class FluffyThemes {
       foregroundColor: Colors.white,
     ),
     inputDecorationTheme: InputDecorationTheme(
-      border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
+      border: OutlineInputBorder(
+          borderRadius: BorderRadius.circular(AppConfig.borderRadius)),
       filled: true,
       fillColor: AppConfig.primaryColorLight.withAlpha(32),
       enabledBorder: OutlineInputBorder(
-        borderRadius: BorderRadius.circular(12),
+        borderRadius: BorderRadius.circular(AppConfig.borderRadius),
         borderSide: BorderSide(
           color: AppConfig.primaryColor.withAlpha(16),
         ),
diff --git a/lib/views/home_view_parts/contact_list.dart b/lib/views/home_view_parts/contact_list.dart
index 58cf3483..f656bdce 100644
--- a/lib/views/home_view_parts/contact_list.dart
+++ b/lib/views/home_view_parts/contact_list.dart
@@ -7,6 +7,7 @@ import 'package:fluffychat/components/list_items/contact_list_tile.dart';
 import 'package:fluffychat/components/matrix.dart';
 import 'package:fluffychat/utils/fluffy_share.dart';
 import 'package:flutter/material.dart';
+import '../../app_config.dart';
 import '../../utils/client_presence_extension.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
@@ -96,7 +97,8 @@ class _ContactListState extends State<ContactList> {
                       elevation: 7,
                       color: Theme.of(context).primaryColor,
                       shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(12),
+                        borderRadius:
+                            BorderRadius.circular(AppConfig.borderRadius),
                       ),
                       child: Row(
                         mainAxisSize: MainAxisSize.min,
diff --git a/lib/views/homeserver_picker.dart b/lib/views/homeserver_picker.dart
index e6a855c0..0571e786 100644
--- a/lib/views/homeserver_picker.dart
+++ b/lib/views/homeserver_picker.dart
@@ -172,7 +172,7 @@ class _HomeserverPickerState extends State<HomeserverPicker> {
                   elevation: 7,
                   color: Theme.of(context).primaryColor,
                   shape: RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(12),
+                    borderRadius: BorderRadius.circular(AppConfig.borderRadius),
                   ),
                   child: _isLoading
                       ? LinearProgressIndicator()
diff --git a/lib/views/login.dart b/lib/views/login.dart
index 7754d9be..53892d6f 100644
--- a/lib/views/login.dart
+++ b/lib/views/login.dart
@@ -9,6 +9,8 @@ import 'package:flushbar/flushbar_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
+import '../app_config.dart';
+
 class Login extends StatefulWidget {
   @override
   _LoginState createState() => _LoginState();
@@ -222,7 +224,7 @@ class _LoginState extends State<Login> {
                   elevation: 7,
                   color: Theme.of(context).primaryColor,
                   shape: RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(12),
+                    borderRadius: BorderRadius.circular(AppConfig.borderRadius),
                   ),
                   child: loading
                       ? LinearProgressIndicator()
diff --git a/lib/views/sign_up.dart b/lib/views/sign_up.dart
index 1a8130cc..7d8f3230 100644
--- a/lib/views/sign_up.dart
+++ b/lib/views/sign_up.dart
@@ -9,6 +9,8 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
+import '../app_config.dart';
+
 class SignUp extends StatefulWidget {
   @override
   _SignUpState createState() => _SignUpState();
@@ -143,7 +145,7 @@ class _SignUpState extends State<SignUp> {
                   elevation: 7,
                   color: Theme.of(context).primaryColor,
                   shape: RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(12),
+                    borderRadius: BorderRadius.circular(AppConfig.borderRadius),
                   ),
                   child: loading
                       ? LinearProgressIndicator()
diff --git a/lib/views/sign_up_password.dart b/lib/views/sign_up_password.dart
index ec3ab52c..8d49a2bd 100644
--- a/lib/views/sign_up_password.dart
+++ b/lib/views/sign_up_password.dart
@@ -9,6 +9,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:url_launcher/url_launcher.dart';
 
+import '../app_config.dart';
+
 class SignUpPassword extends StatefulWidget {
   final MatrixFile avatar;
   final String username;
@@ -176,7 +178,7 @@ class _SignUpPasswordState extends State<SignUpPassword> {
                 elevation: 7,
                 color: Theme.of(context).primaryColor,
                 shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(12),
+                  borderRadius: BorderRadius.circular(AppConfig.borderRadius),
                 ),
                 child: loading
                     ? LinearProgressIndicator()