diff --git a/app/src/main/res/layout-land/layout_main.xml b/app/src/main/res/layout-land/layout_main.xml
index 28e63271cb3af86351ca0836bf62c82288999d64..8d68fa8d322ae19708e86964351555f6bf02ff8f 100644
--- a/app/src/main/res/layout-land/layout_main.xml
+++ b/app/src/main/res/layout-land/layout_main.xml
@@ -52,11 +52,12 @@
       android:layout_height="match_parent"
       app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-      <androidx.fragment.app.FragmentContainerView
+      <fragment
         android:id="@+id/fragment_messages"
         android:name="de.kuschku.quasseldroid.ui.chat.messages.MessageListFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        tools:ignore="FragmentTagUsage"
         tools:layout="@layout/chat_messages" />
 
       <de.kuschku.quasseldroid.util.ui.view.WarningBarView
diff --git a/app/src/main/res/layout-sw600dp-land/layout_main.xml b/app/src/main/res/layout-sw600dp-land/layout_main.xml
index ead43358a7bad3e59ce21b91f38ab7c960d071dd..e16f77cc75e8e4f2f4c42b5d66e3416b52d08eb0 100644
--- a/app/src/main/res/layout-sw600dp-land/layout_main.xml
+++ b/app/src/main/res/layout-sw600dp-land/layout_main.xml
@@ -58,11 +58,12 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <androidx.fragment.app.FragmentContainerView
+        <fragment
           android:id="@+id/fragment_messages"
           android:name="de.kuschku.quasseldroid.ui.chat.messages.MessageListFragment"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
+          tools:ignore="FragmentTagUsage"
           tools:layout="@layout/chat_messages" />
 
         <de.kuschku.quasseldroid.util.ui.view.WarningBarView
diff --git a/app/src/main/res/layout-sw720dp-land/activity_main.xml b/app/src/main/res/layout-sw720dp-land/activity_main.xml
index d7917a858ffe04a10a9e3990c06597eab19b5e82..b501d47ef06b5ba978061c3eccc2ec7d50006af4 100644
--- a/app/src/main/res/layout-sw720dp-land/activity_main.xml
+++ b/app/src/main/res/layout-sw720dp-land/activity_main.xml
@@ -55,21 +55,23 @@
       </com.google.android.material.appbar.AppBarLayout>
     </LinearLayout>
 
-    <androidx.fragment.app.FragmentContainerView
+    <fragment
       android:id="@+id/fragment_chat_list"
       android:name="de.kuschku.quasseldroid.ui.chat.buffers.BufferViewConfigFragment"
       android:layout_width="320dp"
       android:layout_height="match_parent"
+      tools:ignore="FragmentTagUsage"
       tools:layout="@layout/chat_chatlist" />
 
     <include android:id="@+id/layout_main" layout="@layout/layout_main" />
   </LinearLayout>
 
-  <androidx.fragment.app.FragmentContainerView
+  <fragment
     android:id="@+id/fragment_nick_list"
     android:name="de.kuschku.quasseldroid.ui.chat.nicks.NickListFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="end"
+    tools:ignore="FragmentTagUsage"
     tools:layout="@layout/chat_nicklist" />
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_drawable.xml b/app/src/main/res/layout/activity_drawable.xml
index 9a6db6a5ae13071f409d191864dd308612c42461..5f3965786f6bd5ce7dfbd1d45c490ac57c249c38 100644
--- a/app/src/main/res/layout/activity_drawable.xml
+++ b/app/src/main/res/layout/activity_drawable.xml
@@ -31,13 +31,6 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.AppCompatImageView
-      android:id="@+id/imageView"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_gravity="center"
-      android:scaleType="fitCenter" />
-
     <com.google.android.material.appbar.AppBarLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -51,6 +44,13 @@
         app:popupTheme="?attr/actionBarPopupTheme" />
 
     </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.appcompat.widget.AppCompatImageView
+      android:id="@+id/imageView"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_gravity="center"
+      android:scaleType="fitCenter" />
   </LinearLayout>
 
   <de.kuschku.quasseldroid.util.ui.view.NavigationDrawerLayout
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 61a9d6e55eeec9b083bafe4da3cfb35dcab33679..63a018189245ee7706d665006fcec99c0ac333b9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -25,14 +25,6 @@
   android:layout_height="match_parent"
   android:fitsSystemWindows="true">
 
-  <androidx.fragment.app.FragmentContainerView
-    android:id="@+id/fragment_nick_list"
-    android:name="de.kuschku.quasseldroid.ui.chat.nicks.NickListFragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="end"
-    tools:layout="@layout/chat_nicklist" />
-
   <de.kuschku.quasseldroid.util.ui.view.NavigationDrawerLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -41,13 +33,23 @@
     android:fitsSystemWindows="true"
     app:insetBackground="?attr/colorPrimaryDark">
 
-    <androidx.fragment.app.FragmentContainerView
+    <fragment
       android:id="@+id/fragment_chat_list"
       android:name="de.kuschku.quasseldroid.ui.chat.buffers.BufferViewConfigFragment"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
+      tools:ignore="FragmentTagUsage"
       tools:layout="@layout/chat_chatlist" />
   </de.kuschku.quasseldroid.util.ui.view.NavigationDrawerLayout>
 
+  <fragment
+    android:id="@+id/fragment_nick_list"
+    android:name="de.kuschku.quasseldroid.ui.chat.nicks.NickListFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="end"
+    tools:ignore="FragmentTagUsage"
+    tools:layout="@layout/chat_nicklist" />
+
   <include android:id="@+id/layout_main" layout="@layout/layout_main" />
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 448c8b4eec703a1bcb7e44f5e68b23f3573b9236..c239b44d1a7fd1dab2985e40e121b3bfdecc9287 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -29,11 +29,6 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <FrameLayout
-      android:id="@+id/fragment_container"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent" />
-
     <com.google.android.material.appbar.AppBarLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -47,6 +42,11 @@
         app:popupTheme="?attr/actionBarPopupTheme" />
 
     </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+      android:id="@+id/fragment_container"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent" />
   </LinearLayout>
 
 </androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index c73c20cbb50a12165583cccada7144db2ea02986..6abe56c07eea2136fe9ded8c21185691f18f0492 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -23,6 +23,11 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
+  <androidx.viewpager.widget.ViewPager
+    android:id="@+id/view_pager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
+
   <androidx.appcompat.widget.ActionMenuView
     android:id="@+id/menu_view"
     android:layout_width="56dp"
@@ -30,11 +35,6 @@
     android:layout_gravity="end|top"
     android:theme="?attr/actionBarPopupTheme" />
 
-  <androidx.viewpager.widget.ViewPager
-    android:id="@+id/view_pager"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
-
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     android:id="@+id/next_button"
     style="@style/Widget.MaterialComponents.FloatingActionButton"
diff --git a/app/src/main/res/layout/add_create.xml b/app/src/main/res/layout/add_create.xml
index 0d7fb60cd6a10ffd4ba6520f7478aea92aca9bbf..a1871b0094319a65b40c1b70c1057fe6f8c67e88 100644
--- a/app/src/main/res/layout/add_create.xml
+++ b/app/src/main/res/layout/add_create.xml
@@ -37,6 +37,32 @@
 
       <LinearLayout style="@style/Widget.CoreSettings.Wrapper">
 
+        <com.google.android.material.textfield.TextInputLayout
+          style="@style/Widget.CustomTextInput"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/label_channel_name">
+
+          <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/name"
+            style="@style/Widget.CoreSettings.EditText"
+            tools:text="#trees" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <de.kuschku.ui.spinner.MaterialSpinnerLayout
+          style="@style/Widget.CustomSpinnerLayout"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/label_network">
+
+          <androidx.appcompat.widget.AppCompatSpinner
+            android:id="@+id/network"
+            style="@style/Widget.MaterialSpinner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:listitem="@layout/widget_spinner_item_material" />
+        </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+
         <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -101,32 +127,6 @@
               tools:text="NickServ" />
           </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-          style="@style/Widget.CustomTextInput"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:hint="@string/label_channel_name">
-
-          <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/name"
-            style="@style/Widget.CoreSettings.EditText"
-            tools:text="#trees" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <de.kuschku.ui.spinner.MaterialSpinnerLayout
-          style="@style/Widget.CustomSpinnerLayout"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:hint="@string/label_network">
-
-          <androidx.appcompat.widget.AppCompatSpinner
-            android:id="@+id/network"
-            style="@style/Widget.MaterialSpinner"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:listitem="@layout/widget_spinner_item_material" />
-        </de.kuschku.ui.spinner.MaterialSpinnerLayout>
       </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
diff --git a/app/src/main/res/layout/add_join.xml b/app/src/main/res/layout/add_join.xml
index d2b475c60650e78abe62e755bcaabe68f32ee254..99bb236fc22fcce85b43cef1aad019bc2872686e 100644
--- a/app/src/main/res/layout/add_join.xml
+++ b/app/src/main/res/layout/add_join.xml
@@ -32,18 +32,6 @@
 
     <LinearLayout style="@style/Widget.CoreSettings.Wrapper">
 
-      <com.google.android.material.textfield.TextInputLayout
-        style="@style/Widget.CustomTextInput"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/label_channel_name">
-
-        <com.google.android.material.textfield.TextInputEditText
-          android:id="@+id/name"
-          style="@style/Widget.CoreSettings.EditText"
-          tools:text="#trees" />
-      </com.google.android.material.textfield.TextInputLayout>
-
       <de.kuschku.ui.spinner.MaterialSpinnerLayout
         style="@style/Widget.CustomSpinnerLayout"
         android:layout_width="match_parent"
@@ -57,6 +45,18 @@
           android:layout_height="wrap_content"
           tools:listitem="@layout/widget_spinner_item_material" />
       </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+
+      <com.google.android.material.textfield.TextInputLayout
+        style="@style/Widget.CustomTextInput"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/label_channel_name">
+
+        <com.google.android.material.textfield.TextInputEditText
+          android:id="@+id/name"
+          style="@style/Widget.CoreSettings.EditText"
+          tools:text="#trees" />
+      </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
 
     <de.kuschku.quasseldroid.util.ui.view.ShadowView
diff --git a/app/src/main/res/layout/add_query.xml b/app/src/main/res/layout/add_query.xml
index 8023ff206996c534ccb023762f447e4c2f463915..8ab6758eba2f8304670a31b4a9343aaab73654ef 100644
--- a/app/src/main/res/layout/add_query.xml
+++ b/app/src/main/res/layout/add_query.xml
@@ -35,18 +35,6 @@
 
       <LinearLayout style="@style/Widget.CoreSettings.Wrapper">
 
-        <com.google.android.material.textfield.TextInputLayout
-          style="@style/Widget.CustomTextInput"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:hint="@string/label_nick">
-
-          <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/name"
-            style="@style/Widget.CoreSettings.EditText"
-            tools:text="justJanne" />
-        </com.google.android.material.textfield.TextInputLayout>
-
         <de.kuschku.ui.spinner.MaterialSpinnerLayout
           style="@style/Widget.CustomSpinnerLayout"
           android:layout_width="match_parent"
@@ -60,6 +48,18 @@
             android:layout_height="wrap_content"
             tools:listitem="@layout/widget_spinner_item_material" />
         </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+          style="@style/Widget.CustomTextInput"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:hint="@string/label_nick">
+
+          <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/name"
+            style="@style/Widget.CoreSettings.EditText"
+            tools:text="justJanne" />
+        </com.google.android.material.textfield.TextInputLayout>
       </LinearLayout>
 
       <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
diff --git a/app/src/main/res/layout/chat_channel_join.xml b/app/src/main/res/layout/chat_channel_join.xml
index d545b333bf1e8cb13be58f2340b8665098f16115..b464c337d6ec8c1698bc64cfcc0f2f8fafab7adb 100644
--- a/app/src/main/res/layout/chat_channel_join.xml
+++ b/app/src/main/res/layout/chat_channel_join.xml
@@ -24,6 +24,13 @@
   android:layout_height="match_parent"
   android:orientation="vertical">
 
+  <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
+    android:id="@+id/search_results"
+    style="@style/Widget.FastScroller"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:listitem="@layout/widget_channel_search" />
+
   <androidx.cardview.widget.CardView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -86,13 +93,6 @@
 
   </androidx.cardview.widget.CardView>
 
-  <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
-    android:id="@+id/search_results"
-    style="@style/Widget.FastScroller"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:listitem="@layout/widget_channel_search" />
-
   <de.kuschku.quasseldroid.util.ui.view.WarningBarView
     android:id="@+id/error"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/chat_chatlist.xml b/app/src/main/res/layout/chat_chatlist.xml
index 05b8357395270573fccbb67ce64b969c73c0933e..fedcf742407af7c619ff40c3fdda1cda771c2aa2 100644
--- a/app/src/main/res/layout/chat_chatlist.xml
+++ b/app/src/main/res/layout/chat_chatlist.xml
@@ -28,22 +28,6 @@
     android:layout_height="wrap_content"
     android:theme="?attr/actionBarTheme">
 
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:orientation="vertical"
-      app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-      <de.kuschku.quasseldroid.util.ui.view.WarningBarView
-        android:id="@+id/feature_context_bufferactivitysync"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:icon="@drawable/ic_alert"
-        app:text="@string/label_feature_context_bufferactivitysync" />
-
-      <include layout="@layout/widget_search" />
-    </LinearLayout>
-
     <androidx.appcompat.widget.Toolbar
       android:id="@+id/chatListToolbar"
       android:layout_width="match_parent"
@@ -63,8 +47,32 @@
 
     </androidx.appcompat.widget.Toolbar>
 
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:orientation="vertical"
+      app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+      <de.kuschku.quasseldroid.util.ui.view.WarningBarView
+        android:id="@+id/feature_context_bufferactivitysync"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_alert"
+        app:text="@string/label_feature_context_bufferactivitysync" />
+
+      <include layout="@layout/widget_search" />
+    </LinearLayout>
+
   </com.google.android.material.appbar.AppBarLayout>
 
+  <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
+    android:id="@+id/chatList"
+    style="@style/Widget.FastScroller"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:listitem="@layout/widget_buffer" />
+
   <com.leinardi.android.speeddial.SpeedDialOverlayLayout
     android:id="@+id/fab_chatlist_overlay"
     android:layout_width="match_parent"
@@ -81,12 +89,4 @@
     app:sdMainFabClosedSrc="@drawable/ic_add"
     app:sdOverlayLayout="@id/fab_chatlist_overlay" />
 
-  <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
-    android:id="@+id/chatList"
-    style="@style/Widget.FastScroller"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:listitem="@layout/widget_buffer" />
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/chat_toolbar.xml b/app/src/main/res/layout/chat_toolbar.xml
index 81187243f38e216c5df6bafcb857e015ce0d78a4..0f3afc4d98ed9e93d762f63380b33c2d9c224064 100644
--- a/app/src/main/res/layout/chat_toolbar.xml
+++ b/app/src/main/res/layout/chat_toolbar.xml
@@ -32,6 +32,16 @@
   android:theme="?attr/actionBarTheme"
   tools:showIn="@layout/activity_main">
 
+  <androidx.appcompat.widget.AppCompatImageView
+    android:id="@+id/toolbar_icon"
+    android:layout_width="@dimen/avatar_size_buffer"
+    android:layout_height="@dimen/avatar_size_buffer"
+    android:layout_gravity="center_vertical"
+    android:layout_marginEnd="8dp"
+    android:visibility="gone"
+    tools:src="@tools:sample/avatars"
+    tools:visibility="visible" />
+
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -71,14 +81,4 @@
       android:visibility="gone" />
 
   </LinearLayout>
-
-  <androidx.appcompat.widget.AppCompatImageView
-    android:id="@+id/toolbar_icon"
-    android:layout_width="@dimen/avatar_size_buffer"
-    android:layout_height="@dimen/avatar_size_buffer"
-    android:layout_gravity="center_vertical"
-    android:layout_marginEnd="8dp"
-    android:visibility="gone"
-    tools:src="@tools:sample/avatars"
-    tools:visibility="visible" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_colorchooser_custom.xml b/app/src/main/res/layout/dialog_colorchooser_custom.xml
index 87eb234b118607e95b392486373e98ee9077ab15..b640bca165f3e4664b55ad64ba57c19b3014792c 100644
--- a/app/src/main/res/layout/dialog_colorchooser_custom.xml
+++ b/app/src/main/res/layout/dialog_colorchooser_custom.xml
@@ -34,6 +34,16 @@
     android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
     android:gravity="center">
 
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="2dp"
+      android:digits="0123456789abcdefABCDEF"
+      android:text="#"
+      android:textColor="?colorTextPrimary"
+      android:textSize="@dimen/md_title_textsize"
+      tools:ignore="HardcodedText,TextViewEdits" />
+
     <EditText
       android:id="@+id/md_hexInput"
       android:layout_width="wrap_content"
@@ -47,16 +57,6 @@
       android:textSize="@dimen/md_title_textsize"
       tools:ignore="HardcodedText" />
 
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginEnd="2dp"
-      android:digits="0123456789abcdefABCDEF"
-      android:text="#"
-      android:textColor="?colorTextPrimary"
-      android:textSize="@dimen/md_title_textsize"
-      tools:ignore="HardcodedText,TextViewEdits" />
-
   </LinearLayout>
 
   <RelativeLayout
@@ -68,39 +68,6 @@
 
     <!-- Alpha -->
 
-    <SeekBar
-      android:id="@+id/md_colorA"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
-      android:layout_toStartOf="@+id/md_colorAValue"
-      android:layout_toEndOf="@+id/md_colorALabel"
-      android:focusable="true"
-      android:max="255" />
-
-    <SeekBar
-      android:id="@+id/md_colorG"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_below="@+id/md_colorR"
-      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
-      android:layout_toStartOf="@+id/md_colorGValue"
-      android:layout_toEndOf="@+id/md_colorGLabel"
-      android:focusable="true"
-      android:max="255" />
-
-    <SeekBar
-      android:id="@+id/md_colorB"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_below="@+id/md_colorG"
-      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
-      android:layout_toStartOf="@+id/md_colorBValue"
-      android:layout_toEndOf="@+id/md_colorBLabel"
-      android:max="255" />
-
-    <!-- Red -->
-
     <TextView
       android:id="@+id/md_colorALabel"
       android:layout_width="wrap_content"
@@ -113,6 +80,16 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
+    <SeekBar
+      android:id="@+id/md_colorA"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
+      android:layout_toStartOf="@+id/md_colorAValue"
+      android:layout_toEndOf="@+id/md_colorALabel"
+      android:focusable="true"
+      android:max="255" />
+
     <TextView
       android:id="@+id/md_colorAValue"
       android:layout_width="wrap_content"
@@ -128,6 +105,8 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
+    <!-- Red -->
+
     <TextView
       android:id="@+id/md_colorRLabel"
       android:layout_width="wrap_content"
@@ -140,7 +119,16 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
-    <!-- Green -->
+    <SeekBar
+      android:id="@+id/md_colorG"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_below="@+id/md_colorR"
+      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
+      android:layout_toStartOf="@+id/md_colorGValue"
+      android:layout_toEndOf="@+id/md_colorGLabel"
+      android:focusable="true"
+      android:max="255" />
 
     <TextView
       android:id="@+id/md_colorRValue"
@@ -157,6 +145,8 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
+    <!-- Green -->
+
     <TextView
       android:id="@+id/md_colorGLabel"
       android:layout_width="wrap_content"
@@ -169,6 +159,16 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
+    <SeekBar
+      android:id="@+id/md_colorB"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_below="@+id/md_colorG"
+      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
+      android:layout_toStartOf="@+id/md_colorBValue"
+      android:layout_toEndOf="@+id/md_colorBLabel"
+      android:max="255" />
+
     <TextView
       android:id="@+id/md_colorGValue"
       android:layout_width="wrap_content"
@@ -198,6 +198,17 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
+    <androidx.appcompat.widget.AppCompatSeekBar
+      android:id="@+id/md_colorR"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_below="@+id/md_colorA"
+      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
+      android:layout_toStartOf="@+id/md_colorRValue"
+      android:layout_toEndOf="@+id/md_colorRLabel"
+      android:focusable="true"
+      android:max="255" />
+
     <TextView
       android:id="@+id/md_colorBValue"
       android:layout_width="wrap_content"
@@ -213,17 +224,6 @@
       android:textSize="@dimen/md_content_textsize"
       tools:ignore="HardcodedText" />
 
-    <androidx.appcompat.widget.AppCompatSeekBar
-      android:id="@+id/md_colorR"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_below="@+id/md_colorA"
-      android:layout_marginTop="@dimen/md_title_frame_margin_bottom"
-      android:layout_toStartOf="@+id/md_colorRValue"
-      android:layout_toEndOf="@+id/md_colorRLabel"
-      android:focusable="true"
-      android:max="255" />
-
   </RelativeLayout>
 
   <View
diff --git a/app/src/main/res/layout/info_certificate.xml b/app/src/main/res/layout/info_certificate.xml
index 033850119724e2ab68ec227addf6b612bf34b8db..2a1f977e17ab62d38305eaf05c1bf0659a9521fc 100644
--- a/app/src/main/res/layout/info_certificate.xml
+++ b/app/src/main/res/layout/info_certificate.xml
@@ -52,13 +52,13 @@
 
       <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroupHeader">
 
-        <TextView
-          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-          android:text="@string/certificate_subject" />
-
         <androidx.appcompat.widget.AppCompatImageView
           style="@style/Widget.CoreSettings.PrimaryItemIcon"
           app:srcCompat="@drawable/ic_account" />
+
+        <TextView
+          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+          android:text="@string/certificate_subject" />
       </LinearLayout>
 
       <LinearLayout
@@ -119,13 +119,13 @@
 
       <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroupHeader">
 
-        <TextView
-          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-          android:text="@string/certificate_issuer" />
-
         <androidx.appcompat.widget.AppCompatImageView
           style="@style/Widget.CoreSettings.PrimaryItemIcon"
           app:srcCompat="@drawable/ic_domain" />
+
+        <TextView
+          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+          android:text="@string/certificate_issuer" />
       </LinearLayout>
 
       <LinearLayout
@@ -172,13 +172,13 @@
 
       <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroupHeader">
 
-        <TextView
-          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-          android:text="@string/certificate_validity" />
-
         <androidx.appcompat.widget.AppCompatImageView
           style="@style/Widget.CoreSettings.PrimaryItemIcon"
           app:srcCompat="@drawable/ic_clock" />
+
+        <TextView
+          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+          android:text="@string/certificate_validity" />
       </LinearLayout>
 
       <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroup">
@@ -207,13 +207,13 @@
 
       <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroupHeader">
 
-        <TextView
-          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-          android:text="@string/certificate_fingerprints" />
-
         <androidx.appcompat.widget.AppCompatImageView
           style="@style/Widget.CoreSettings.PrimaryItemIcon"
           app:srcCompat="@drawable/ic_fingerprint" />
+
+        <TextView
+          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+          android:text="@string/certificate_fingerprints" />
       </LinearLayout>
 
       <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroup">
diff --git a/app/src/main/res/layout/info_channel.xml b/app/src/main/res/layout/info_channel.xml
index 1a9b1cd883a44d0818bd8dc2c96ff5d5075cec7b..6dce3124b01ab288ecd0e84ede953bbfcc59e0af 100644
--- a/app/src/main/res/layout/info_channel.xml
+++ b/app/src/main/res/layout/info_channel.xml
@@ -29,6 +29,26 @@
     android:animateLayoutChanges="true"
     android:orientation="vertical">
 
+    <LinearLayout style="@style/Widget.Info.Header">
+
+      <TextView
+        android:id="@+id/name"
+        style="@style/Widget.Info.Header.Name"
+        android:textIsSelectable="true"
+        tools:text="#quassel" />
+
+      <TextView
+        android:id="@+id/topic"
+        style="@style/Widget.Info.Header.Description"
+        android:textIsSelectable="true"
+        tools:text="Quassel IRC - https://quassel-irc.org || Latest: 0.12.4 || Mailing Lists: https://lists.quassel-irc.org || Tracker: https://bugs.quassel-irc.org || Activity RSS: #quassel-announce || German: #quassel.de || Quassel on Android: #quasseldroid; on iOS: #woboquassel || Server migration complete; new IPs may still need some time to propagate" />
+    </LinearLayout>
+
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="?colorDivider" />
+
     <HorizontalScrollView
       android:layout_width="match_parent"
       android:layout_height="wrap_content">
@@ -83,26 +103,6 @@
       </LinearLayout>
     </HorizontalScrollView>
 
-    <LinearLayout style="@style/Widget.Info.Header">
-
-      <TextView
-        android:id="@+id/name"
-        style="@style/Widget.Info.Header.Name"
-        android:textIsSelectable="true"
-        tools:text="#quassel" />
-
-      <TextView
-        android:id="@+id/topic"
-        style="@style/Widget.Info.Header.Description"
-        android:textIsSelectable="true"
-        tools:text="Quassel IRC - https://quassel-irc.org || Latest: 0.12.4 || Mailing Lists: https://lists.quassel-irc.org || Tracker: https://bugs.quassel-irc.org || Activity RSS: #quassel-announce || German: #quassel.de || Quassel on Android: #quasseldroid; on iOS: #woboquassel || Server migration complete; new IPs may still need some time to propagate" />
-    </LinearLayout>
-
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="?colorDivider" />
-
     <View
       android:layout_width="match_parent"
       android:layout_height="1dp"
diff --git a/app/src/main/res/layout/info_channellist.xml b/app/src/main/res/layout/info_channellist.xml
index 8152430a592774c6aa54fa270ba3a4997c15ea60..1d1f2321863fc5c4c57692c018d012e0f7a9d4df 100644
--- a/app/src/main/res/layout/info_channellist.xml
+++ b/app/src/main/res/layout/info_channellist.xml
@@ -86,13 +86,6 @@
 
   </androidx.cardview.widget.CardView>
 
-  <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
-    android:id="@+id/search_results"
-    style="@style/Widget.FastScroller"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:listitem="@layout/widget_channel_search" />
-
   <de.kuschku.quasseldroid.util.ui.view.WarningBarView
     android:id="@+id/error"
     android:layout_width="match_parent"
@@ -100,4 +93,11 @@
     app:icon="@drawable/ic_alert"
     app:mode="none" />
 
+  <de.kuschku.quasseldroid.util.ui.fastscroll.views.FastScrollRecyclerView
+    android:id="@+id/search_results"
+    style="@style/Widget.FastScroller"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:listitem="@layout/widget_channel_search" />
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/info_core.xml b/app/src/main/res/layout/info_core.xml
index 1601dcaac84c8c4ef06809aebc4b8ef0c2531993..4b1f3a1d27f5cdfb4bb5f041bfd5b843344aefbe 100644
--- a/app/src/main/res/layout/info_core.xml
+++ b/app/src/main/res/layout/info_core.xml
@@ -30,6 +30,10 @@
     android:animateLayoutChanges="true"
     android:orientation="vertical">
 
+    <TextView
+      style="@style/Widget.Info.Section"
+      android:text="@string/label_core_version" />
+
     <LinearLayout style="@style/Widget.Info.Item">
 
       <TextView
@@ -52,6 +56,14 @@
         android:text="@string/label_missing_features" />
     </LinearLayout>
 
+    <TextView
+      style="@style/Widget.Info.Section"
+      android:text="@string/label_core_uptime" />
+
+    <TextView
+      style="@style/Widget.Info.Section"
+      android:text="@string/label_core_security" />
+
     <LinearLayout
       android:id="@+id/uptime_container"
       style="@style/Widget.Info.Item"
@@ -64,6 +76,16 @@
         tools:text="30 minutes" />
     </LinearLayout>
 
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="?colorDivider" />
+
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="?colorDivider" />
+
     <LinearLayout
       style="@style/Widget.Info.Item"
       android:orientation="vertical">
@@ -109,17 +131,10 @@
         android:text="@string/label_info" />
     </LinearLayout>
 
-    <TextView
-      style="@style/Widget.Info.Section"
-      android:text="@string/label_core_version" />
-
-    <TextView
-      style="@style/Widget.Info.Section"
-      android:text="@string/label_core_uptime" />
-
-    <TextView
-      style="@style/Widget.Info.Section"
-      android:text="@string/label_core_security" />
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="?colorDivider" />
 
     <TextView
       android:id="@+id/clients_title"
@@ -128,21 +143,6 @@
       android:visibility="gone"
       tools:visibility="visible" />
 
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="?colorDivider" />
-
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="?colorDivider" />
-
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:background="?colorDivider" />
-
     <androidx.recyclerview.widget.RecyclerView
       android:id="@+id/clients"
       android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/info_user.xml b/app/src/main/res/layout/info_user.xml
index d5dd6c57e7c654edd9a67ec8d7f10eb0d3f26ed8..0ac01bda64a69a2021c69f02247c918bc6e62268 100644
--- a/app/src/main/res/layout/info_user.xml
+++ b/app/src/main/res/layout/info_user.xml
@@ -37,6 +37,52 @@
       android:orientation="vertical"
       tools:ignore="UnusedAttribute">
 
+      <LinearLayout style="@style/Widget.Info.Header">
+
+        <TextView
+          android:id="@+id/nick"
+          style="@style/Widget.Info.Header.Name"
+          android:textIsSelectable="true"
+          tools:text="justJanne" />
+
+        <TextView
+          android:id="@+id/real_name"
+          style="@style/Widget.Info.Header.Description"
+          android:textIsSelectable="true"
+          tools:text="Janne Mareike Koschinski https://kuschku.de/" />
+      </LinearLayout>
+
+      <LinearLayout
+        android:id="@+id/away_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+          style="@style/Widget.Info.Section"
+          android:text="@string/label_user_away" />
+
+        <LinearLayout style="@style/Widget.Info.Item">
+
+          <TextView
+            android:id="@+id/away_message"
+            style="@style/Widget.Info.Item.Content"
+            android:textIsSelectable="true"
+            tools:text="~justJanne" />
+
+          <TextView
+            style="@style/Widget.Info.Item.Description"
+            android:text="@string/label_user_away_reason" />
+        </LinearLayout>
+
+        <View
+          android:layout_width="match_parent"
+          android:layout_height="1dp"
+          android:background="?colorDivider" />
+      </LinearLayout>
+
       <HorizontalScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -89,51 +135,19 @@
         </LinearLayout>
       </HorizontalScrollView>
 
-      <LinearLayout style="@style/Widget.Info.Header">
-
-        <TextView
-          android:id="@+id/nick"
-          style="@style/Widget.Info.Header.Name"
-          android:textIsSelectable="true"
-          tools:text="justJanne" />
-
-        <TextView
-          android:id="@+id/real_name"
-          style="@style/Widget.Info.Header.Description"
-          android:textIsSelectable="true"
-          tools:text="Janne Mareike Koschinski https://kuschku.de/" />
-      </LinearLayout>
+      <TextView
+        style="@style/Widget.Info.Section"
+        android:text="@string/label_user_identity" />
 
-      <LinearLayout
-        android:id="@+id/away_container"
+      <View
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <LinearLayout style="@style/Widget.Info.Item">
-
-          <TextView
-            android:id="@+id/away_message"
-            style="@style/Widget.Info.Item.Content"
-            android:textIsSelectable="true"
-            tools:text="~justJanne" />
-
-          <TextView
-            style="@style/Widget.Info.Item.Description"
-            android:text="@string/label_user_away_reason" />
-        </LinearLayout>
-
-        <TextView
-          style="@style/Widget.Info.Section"
-          android:text="@string/label_user_away" />
+        android:layout_height="1dp"
+        android:background="?colorDivider" />
 
-        <View
-          android:layout_width="match_parent"
-          android:layout_height="1dp"
-          android:background="?colorDivider" />
-      </LinearLayout>
+      <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?colorDivider" />
 
       <LinearLayout
         android:id="@+id/account_container"
@@ -203,24 +217,10 @@
           android:text="@string/label_user_server" />
       </LinearLayout>
 
-      <TextView
-        style="@style/Widget.Info.Section"
-        android:text="@string/label_user_identity" />
-
       <TextView
         style="@style/Widget.Info.Section"
         android:text="@string/label_user_common_channels" />
 
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?colorDivider" />
-
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?colorDivider" />
-
       <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/common_channels"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_editor.xml b/app/src/main/res/layout/layout_editor.xml
index a4a85dc528d7829bba5289a6bd5ee51a3e5189a6..5b7ea6a01b6fa67182b9edca5ca7d056c049830a 100644
--- a/app/src/main/res/layout/layout_editor.xml
+++ b/app/src/main/res/layout/layout_editor.xml
@@ -51,23 +51,6 @@
         app:srcCompat="@drawable/ic_tab"
         app:tint="?attr/colorTextSecondary" />
 
-      <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/send"
-        style="?attr/buttonStyleSmall"
-        android:layout_width="?attr/actionBarSize"
-        android:layout_height="?attr/actionBarSize"
-        android:layout_gravity="top"
-        android:autoMirrored="true"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/label_send"
-        android:padding="12dp"
-        android:scaleType="fitXY"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_send"
-        app:tint="?attr/colorAccent"
-        tools:ignore="UnusedAttribute" />
-
       <de.kuschku.quasseldroid.util.ui.FixedNestingScrollView
         android:id="@+id/chatline_scroller"
         android:layout_width="0dip"
@@ -92,6 +75,23 @@
           android:textColor="?attr/colorForeground"
           android:textSize="16sp" />
       </de.kuschku.quasseldroid.util.ui.FixedNestingScrollView>
+
+      <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/send"
+        style="?attr/buttonStyleSmall"
+        android:layout_width="?attr/actionBarSize"
+        android:layout_height="?attr/actionBarSize"
+        android:layout_gravity="top"
+        android:autoMirrored="true"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/label_send"
+        android:padding="12dp"
+        android:scaleType="fitXY"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_send"
+        app:tint="?attr/colorAccent"
+        tools:ignore="UnusedAttribute" />
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/layout_history.xml b/app/src/main/res/layout/layout_history.xml
index 88b196732c8188a26f5a3bb6f64d13954cebfcf8..4d9b41b9bdffbf7d62133a1f15451de2a2cf2bab 100644
--- a/app/src/main/res/layout/layout_history.xml
+++ b/app/src/main/res/layout/layout_history.xml
@@ -48,11 +48,6 @@
         android:layout_height="48dp"
         android:orientation="horizontal">
 
-        <Space
-          android:layout_width="0dip"
-          android:layout_height="match_parent"
-          android:layout_weight="1" />
-
         <TextView
           style="@style/Widget.RtlConformTextView"
           android:layout_width="wrap_content"
@@ -64,6 +59,11 @@
           android:textAppearance="@style/TextAppearance.AppCompat.Body2"
           android:textColor="?attr/colorForegroundSecondary" />
 
+        <Space
+          android:layout_width="0dip"
+          android:layout_height="match_parent"
+          android:layout_weight="1" />
+
         <androidx.appcompat.widget.AppCompatImageButton
           android:id="@+id/close"
           android:layout_width="48dp"
diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml
index 73cee791cf1d31b2b478e260f870715ccf2e4764..22e77c757291864dbbe34605a89e3eb94de4d12c 100644
--- a/app/src/main/res/layout/layout_main.xml
+++ b/app/src/main/res/layout/layout_main.xml
@@ -58,11 +58,12 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <androidx.fragment.app.FragmentContainerView
+        <fragment
           android:id="@+id/fragment_messages"
           android:name="de.kuschku.quasseldroid.ui.chat.messages.MessageListFragment"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
+          tools:ignore="FragmentTagUsage"
           tools:layout="@layout/chat_messages" />
 
         <de.kuschku.quasseldroid.util.ui.view.WarningBarView
diff --git a/app/src/main/res/layout/layout_toolbar.xml b/app/src/main/res/layout/layout_toolbar.xml
index e256cc20f3eb401beb71e28d6035f6473e67ccad..738fe777caa8efe2ba78b2bee7378a9ad059fcce 100644
--- a/app/src/main/res/layout/layout_toolbar.xml
+++ b/app/src/main/res/layout/layout_toolbar.xml
@@ -36,11 +36,12 @@
       app:contentInsetStartWithNavigation="0dp"
       app:popupTheme="?attr/actionBarPopupTheme">
 
-      <androidx.fragment.app.FragmentContainerView
+      <fragment
         android:id="@+id/fragment_toolbar"
         android:name="de.kuschku.quasseldroid.ui.chat.ToolbarFragment"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
+        tools:ignore="FragmentTagUsage"
         tools:layout="@layout/chat_toolbar" />
 
     </androidx.appcompat.widget.Toolbar>
diff --git a/app/src/main/res/layout/preference_seekbar.xml b/app/src/main/res/layout/preference_seekbar.xml
index e29a6d01eae93d244373e61cc852e705912b7a8d..68e2fc5f4690fcaddc5e3f0219f63eaf63df8023 100644
--- a/app/src/main/res/layout/preference_seekbar.xml
+++ b/app/src/main/res/layout/preference_seekbar.xml
@@ -25,6 +25,13 @@
   android:paddingEnd="10dp"
   android:paddingBottom="5dp">
 
+  <androidx.appcompat.widget.AppCompatSeekBar
+    android:id="@+id/seekBarPrefSeekBar"
+    android:layout_width="0dip"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
+    android:layout_weight="1" />
+
   <TextView
     android:id="@+id/seekBarPrefUnitsRight"
     android:layout_width="wrap_content"
@@ -42,11 +49,4 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     tools:text="$" />
-
-  <androidx.appcompat.widget.AppCompatSeekBar
-    android:id="@+id/seekBarPrefSeekBar"
-    android:layout_width="0dip"
-    android:layout_height="wrap_content"
-    android:layout_gravity="bottom"
-    android:layout_weight="1" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/preferences_about.xml b/app/src/main/res/layout/preferences_about.xml
index 0a987b5b4058042e093f151acf9e863c3ee92421..271dcea7e458577fba792cf29de4139a0ccb2943 100644
--- a/app/src/main/res/layout/preferences_about.xml
+++ b/app/src/main/res/layout/preferences_about.xml
@@ -28,6 +28,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <include layout="@layout/preferences_about_header" />
+
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -102,7 +104,5 @@
 
     </LinearLayout>
 
-    <include layout="@layout/preferences_about_header" />
-
   </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/preferences_about_header.xml b/app/src/main/res/layout/preferences_about_header.xml
index c1fcc812e3fe922d2b5176d4dfafbead88af6f80..b08ab6f8a4ffc2b17a31decdd26fac00fac1e664 100644
--- a/app/src/main/res/layout/preferences_about_header.xml
+++ b/app/src/main/res/layout/preferences_about_header.xml
@@ -36,6 +36,13 @@
     android:focusable="true"
     android:orientation="horizontal">
 
+    <androidx.appcompat.widget.AppCompatImageView
+      android:layout_width="?actionBarSize"
+      android:layout_height="?actionBarSize"
+      android:layout_gravity="center"
+      android:layout_marginEnd="?listPreferredItemPaddingRight"
+      app:srcCompat="@mipmap/ic_launcher_legacy" />
+
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -55,13 +62,6 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         tools:text="v0.3.0-310-ge2d1d05" />
     </LinearLayout>
-
-    <androidx.appcompat.widget.AppCompatImageView
-      android:layout_width="?actionBarSize"
-      android:layout_height="?actionBarSize"
-      android:layout_gravity="center"
-      android:layout_marginEnd="?listPreferredItemPaddingRight"
-      app:srcCompat="@mipmap/ic_launcher_legacy" />
   </LinearLayout>
 
   <TextView
diff --git a/app/src/main/res/layout/preferences_crash.xml b/app/src/main/res/layout/preferences_crash.xml
index 8cf7c0730eb2fa5266dd9744e7901ea11f79d0c7..eb535042fdc134f74891ba504eba6e8af7ca0ea1 100644
--- a/app/src/main/res/layout/preferences_crash.xml
+++ b/app/src/main/res/layout/preferences_crash.xml
@@ -22,6 +22,13 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbars="vertical"
+    tools:listitem="@layout/widget_crash" />
+
   <TextView
     android:id="@+id/crashes_empty"
     android:layout_width="match_parent"
@@ -36,11 +43,4 @@
     android:textStyle="italic"
     android:visibility="gone"
     tools:visibility="visible" />
-
-  <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbars="vertical"
-    tools:listitem="@layout/widget_crash" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/preferences_whitelist.xml b/app/src/main/res/layout/preferences_whitelist.xml
index bbc99f6fe82284808c611824b36356ef58191bd6..28f700f93eaf968f3703a7e972cbe0bf86ffae60 100644
--- a/app/src/main/res/layout/preferences_whitelist.xml
+++ b/app/src/main/res/layout/preferences_whitelist.xml
@@ -45,6 +45,15 @@
       android:textStyle="italic"
       android:visibility="gone" />
 
+    <androidx.recyclerview.widget.RecyclerView
+      android:id="@+id/certificate_whitelist"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingLeft="2dp"
+      android:paddingRight="2dp"
+      tools:itemCount="2"
+      tools:listitem="@layout/preferences_whitelist_certificate_item" />
+
     <TextView
       style="@style/Widget.Subhead"
       android:text="@string/label_whitelist_hostnames" />
@@ -62,15 +71,6 @@
       android:textStyle="italic"
       android:visibility="gone" />
 
-    <androidx.recyclerview.widget.RecyclerView
-      android:id="@+id/certificate_whitelist"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:paddingLeft="2dp"
-      android:paddingRight="2dp"
-      tools:itemCount="2"
-      tools:listitem="@layout/preferences_whitelist_certificate_item" />
-
     <androidx.recyclerview.widget.RecyclerView
       android:id="@+id/hostname_whitelist"
       android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/settings_aliaslist_item.xml b/app/src/main/res/layout/settings_aliaslist_item.xml
index b92581af14c1defcfae8faeb689b5853dbee578e..386890896d26cc9923d338ef825d638bbf556794 100644
--- a/app/src/main/res/layout/settings_aliaslist_item.xml
+++ b/app/src/main/res/layout/settings_aliaslist_item.xml
@@ -26,6 +26,16 @@
   android:orientation="horizontal"
   tools:showIn="@layout/settings_aliaslist">
 
+  <androidx.appcompat.widget.AppCompatImageView
+    android:id="@+id/handle"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:paddingStart="?listPreferredItemPaddingLeft"
+    android:paddingEnd="32dp"
+    app:srcCompat="@drawable/ic_reorder"
+    app:tint="?colorTextSecondary" />
+
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -58,14 +68,4 @@
       tools:text="/quote away" />
 
   </LinearLayout>
-
-  <androidx.appcompat.widget.AppCompatImageView
-    android:id="@+id/handle"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:layout_gravity="center_vertical"
-    android:paddingStart="?listPreferredItemPaddingLeft"
-    android:paddingEnd="32dp"
-    app:srcCompat="@drawable/ic_reorder"
-    app:tint="?colorTextSecondary" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/settings_chatlist.xml b/app/src/main/res/layout/settings_chatlist.xml
index 594e2c090b0c77f831480dc7c7be8f4e56501c96..7a4f301a3ea91eea222f758743da00f627c6338e 100644
--- a/app/src/main/res/layout/settings_chatlist.xml
+++ b/app/src/main/res/layout/settings_chatlist.xml
@@ -31,19 +31,31 @@
       android:layout_height="wrap_content"
       android:minHeight="48dp">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_chatlist_ui" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_eye" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_chatlist_ui" />
     </LinearLayout>
 
     <LinearLayout
       style="@style/Widget.CoreSettings.DependentGroup"
       android:visibility="visible">
 
+      <com.google.android.material.textfield.TextInputLayout
+        style="@style/Widget.CustomTextInput"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/settings_chatlist_buffer_view_name">
+
+        <com.google.android.material.textfield.TextInputEditText
+          android:id="@+id/buffer_view_name"
+          style="@style/Widget.CoreSettings.EditText"
+          tools:text="All Chats" />
+      </com.google.android.material.textfield.TextInputLayout>
+
       <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/show_search"
         style="@style/Widget.CoreSettings.PrimaryItemSwitch"
@@ -61,18 +73,6 @@
         style="@style/Widget.CoreSettings.PrimaryItemSwitch"
         android:checked="true"
         android:text="@string/settings_chatlist_add_new_buffers_automatically" />
-
-      <com.google.android.material.textfield.TextInputLayout
-        style="@style/Widget.CustomTextInput"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/settings_chatlist_buffer_view_name">
-
-        <com.google.android.material.textfield.TextInputEditText
-          android:id="@+id/buffer_view_name"
-          style="@style/Widget.CoreSettings.EditText"
-          tools:text="All Chats" />
-      </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
 
     <LinearLayout
@@ -80,25 +80,19 @@
       android:layout_height="wrap_content"
       android:minHeight="48dp">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_chatlist_network" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_server_network" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_chatlist_network" />
     </LinearLayout>
 
     <LinearLayout
       style="@style/Widget.CoreSettings.DependentGroup"
       android:visibility="visible">
 
-      <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/show_status_buffer"
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:checked="true"
-        android:text="@string/settings_chatlist_show_status_buffer" />
-
       <de.kuschku.ui.spinner.MaterialSpinnerLayout
         style="@style/Widget.CustomSpinnerLayout"
         android:layout_width="match_parent"
@@ -112,6 +106,12 @@
           android:layout_height="wrap_content"
           tools:listitem="@layout/widget_spinner_item_material" />
       </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+
+      <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/show_status_buffer"
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:checked="true"
+        android:text="@string/settings_chatlist_show_status_buffer" />
     </LinearLayout>
 
     <LinearLayout
@@ -119,13 +119,13 @@
       android:layout_height="wrap_content"
       android:minHeight="48dp">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_chatlist_types" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_tag_text" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_chatlist_types" />
     </LinearLayout>
 
     <LinearLayout
@@ -150,29 +150,19 @@
       android:layout_height="wrap_content"
       android:minHeight="48dp">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_chatlist_activity" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_clock" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_chatlist_activity" />
     </LinearLayout>
 
     <LinearLayout
       style="@style/Widget.CoreSettings.DependentGroup"
       android:visibility="visible">
 
-      <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/hide_inactive_buffers"
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_chatlist_hide_inactive_buffers" />
-
-      <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/hide_inactive_networks"
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_chatlist_hide_inactive_networks" />
-
       <de.kuschku.ui.spinner.MaterialSpinnerLayout
         style="@style/Widget.CustomSpinnerLayout"
         android:layout_width="match_parent"
@@ -186,6 +176,16 @@
           android:layout_height="wrap_content"
           tools:listitem="@layout/widget_spinner_item_material" />
       </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+
+      <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/hide_inactive_buffers"
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_chatlist_hide_inactive_buffers" />
+
+      <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/hide_inactive_networks"
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_chatlist_hide_inactive_networks" />
     </LinearLayout>
   </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/settings_highlightlist.xml b/app/src/main/res/layout/settings_highlightlist.xml
index 0349be1f575fa75012f9f24718f24c1902d8c598..c23c9fc76c6317d78599b34d89a0eacc3419959f 100644
--- a/app/src/main/res/layout/settings_highlightlist.xml
+++ b/app/src/main/res/layout/settings_highlightlist.xml
@@ -36,24 +36,19 @@
         android:layout_height="wrap_content"
         android:minHeight="48dp">
 
-        <TextView
-          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-          android:text="@string/settings_highlightlist_highlight_nick" />
-
         <androidx.appcompat.widget.AppCompatImageView
           style="@style/Widget.CoreSettings.PrimaryItemIcon"
           app:srcCompat="@drawable/ic_server_network" />
+
+        <TextView
+          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+          android:text="@string/settings_highlightlist_highlight_nick" />
       </LinearLayout>
 
       <LinearLayout
         style="@style/Widget.CoreSettings.DependentGroup"
         android:visibility="visible">
 
-        <androidx.appcompat.widget.SwitchCompat
-          android:id="@+id/is_case_sensitive"
-          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-          android:text="@string/settings_highlightlist_nicks_case_sensitive" />
-
         <de.kuschku.ui.spinner.MaterialSpinnerLayout
           style="@style/Widget.CustomSpinnerLayout"
           android:layout_width="match_parent"
@@ -67,6 +62,11 @@
             android:layout_height="wrap_content"
             tools:listitem="@layout/widget_spinner_item_material" />
         </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+
+        <androidx.appcompat.widget.SwitchCompat
+          android:id="@+id/is_case_sensitive"
+          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+          android:text="@string/settings_highlightlist_nicks_case_sensitive" />
       </LinearLayout>
 
       <LinearLayout
@@ -74,19 +74,26 @@
         android:layout_height="wrap_content"
         android:minHeight="48dp">
 
-        <TextView
-          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-          android:text="@string/settings_highlightlist_rules" />
-
         <androidx.appcompat.widget.AppCompatImageView
           style="@style/Widget.CoreSettings.PrimaryItemIcon"
           app:srcCompat="@drawable/ic_server_network" />
+
+        <TextView
+          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+          android:text="@string/settings_highlightlist_rules" />
       </LinearLayout>
 
       <LinearLayout
         style="@style/Widget.CoreSettings.DependentGroup"
         android:visibility="visible">
 
+        <androidx.recyclerview.widget.RecyclerView
+          android:id="@+id/highlight_rules"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          tools:itemCount="2"
+          tools:listitem="@layout/settings_highlightlist_rule" />
+
         <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -99,13 +106,6 @@
             android:layout_height="wrap_content"
             android:text="@string/label_new_highlight_rule" />
         </LinearLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-          android:id="@+id/highlight_rules"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          tools:itemCount="2"
-          tools:listitem="@layout/settings_highlightlist_rule" />
       </LinearLayout>
 
       <LinearLayout
@@ -113,19 +113,26 @@
         android:layout_height="wrap_content"
         android:minHeight="48dp">
 
-        <TextView
-          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-          android:text="@string/settings_highlightlist_ignore_rules" />
-
         <androidx.appcompat.widget.AppCompatImageView
           style="@style/Widget.CoreSettings.PrimaryItemIcon"
           app:srcCompat="@drawable/ic_server_network" />
+
+        <TextView
+          style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+          android:text="@string/settings_highlightlist_ignore_rules" />
       </LinearLayout>
 
       <LinearLayout
         style="@style/Widget.CoreSettings.DependentGroup"
         android:visibility="visible">
 
+        <androidx.recyclerview.widget.RecyclerView
+          android:id="@+id/highlight_ignore_rules"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          tools:itemCount="2"
+          tools:listitem="@layout/settings_highlightlist_rule" />
+
         <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -138,13 +145,6 @@
             android:layout_height="wrap_content"
             android:text="@string/label_new_highlight_ignore_rule" />
         </LinearLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-          android:id="@+id/highlight_ignore_rules"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          tools:itemCount="2"
-          tools:listitem="@layout/settings_highlightlist_rule" />
       </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/settings_highlightlist_rule.xml b/app/src/main/res/layout/settings_highlightlist_rule.xml
index c85157da2b03e8fb7e756a753f206a64cda65609..f34f885c5d9d579e01bb82ec942395b595f0186f 100644
--- a/app/src/main/res/layout/settings_highlightlist_rule.xml
+++ b/app/src/main/res/layout/settings_highlightlist_rule.xml
@@ -48,6 +48,13 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
+        <androidx.appcompat.widget.AppCompatImageView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginEnd="8dp"
+          app:srcCompat="@drawable/ic_message_bulleted"
+          app:tint="?colorTextSecondary" />
+
         <TextView
           android:id="@+id/name"
           style="@style/Widget.RtlConformTextView"
@@ -62,13 +69,6 @@
           android:textSize="16sp"
           tools:text="(janne): " />
 
-        <androidx.appcompat.widget.AppCompatImageView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginEnd="8dp"
-          app:srcCompat="@drawable/ic_message_bulleted"
-          app:tint="?colorTextSecondary" />
-
       </LinearLayout>
 
       <LinearLayout
@@ -77,6 +77,13 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
+        <androidx.appcompat.widget.AppCompatImageView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginEnd="8dp"
+          app:srcCompat="@drawable/ic_account"
+          app:tint="?colorTextSecondary" />
+
         <TextView
           android:id="@+id/sender"
           style="@style/Widget.RtlConformTextView"
@@ -88,13 +95,6 @@
           android:textAppearance="?textAppearanceListItemSecondary"
           android:textColor="?colorTextSecondary"
           tools:text="TARS" />
-
-        <androidx.appcompat.widget.AppCompatImageView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginEnd="8dp"
-          app:srcCompat="@drawable/ic_account"
-          app:tint="?colorTextSecondary" />
       </LinearLayout>
 
       <LinearLayout
@@ -103,6 +103,13 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
+        <androidx.appcompat.widget.AppCompatImageView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginEnd="8dp"
+          app:srcCompat="@drawable/ic_channel"
+          app:tint="?colorTextSecondary" />
+
         <TextView
           android:id="@+id/channel"
           style="@style/Widget.RtlConformTextView"
@@ -114,13 +121,6 @@
           android:textAppearance="?textAppearanceListItemSecondary"
           android:textColor="?colorTextSecondary"
           tools:text="#yepityha" />
-
-        <androidx.appcompat.widget.AppCompatImageView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginEnd="8dp"
-          app:srcCompat="@drawable/ic_channel"
-          app:tint="?colorTextSecondary" />
       </LinearLayout>
 
       <TextView
diff --git a/app/src/main/res/layout/settings_highlightrule.xml b/app/src/main/res/layout/settings_highlightrule.xml
index 8fb2c3c140135a78fc859651dd045f5d27753e8a..4a40d07b77eeee678af851baedb5d00e98b6a63a 100644
--- a/app/src/main/res/layout/settings_highlightrule.xml
+++ b/app/src/main/res/layout/settings_highlightrule.xml
@@ -46,16 +46,6 @@
       style="@style/Widget.CoreSettings.DependentGroup"
       android:visibility="visible">
 
-      <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/is_regex"
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_highlightrule_regular_expression" />
-
-      <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/is_case_sensitive"
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_highlightrule_case_sensitive" />
-
       <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.CustomTextInput"
         android:layout_width="match_parent"
@@ -68,6 +58,16 @@
           tools:text="https://clbin.com/*.jpg*" />
       </com.google.android.material.textfield.TextInputLayout>
 
+      <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/is_regex"
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_highlightrule_regular_expression" />
+
+      <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/is_case_sensitive"
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_highlightrule_case_sensitive" />
+
       <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.CustomTextInput"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/settings_identity.xml b/app/src/main/res/layout/settings_identity.xml
index c731b448afc89c74dac8dc431f3443b68ca6f11c..473133c8e8ddb55b3a749f6e44b8c3ec23baa382 100644
--- a/app/src/main/res/layout/settings_identity.xml
+++ b/app/src/main/res/layout/settings_identity.xml
@@ -31,13 +31,13 @@
       android:layout_height="wrap_content"
       android:minHeight="48dp">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_identity_names" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_account_card" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_identity_names" />
     </LinearLayout>
 
     <LinearLayout
@@ -98,6 +98,13 @@
       android:orientation="vertical"
       android:visibility="visible">
 
+      <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/nicks"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:itemCount="4"
+        tools:listitem="@layout/settings_identity_nick" />
+
       <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -110,13 +117,6 @@
           android:layout_height="wrap_content"
           android:text="@string/label_new_nick" />
       </LinearLayout>
-
-      <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/nicks"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:itemCount="4"
-        tools:listitem="@layout/settings_identity_nick" />
     </LinearLayout>
 
     <LinearLayout
@@ -124,13 +124,13 @@
       android:layout_height="wrap_content"
       android:minHeight="48dp">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_identity_messages" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_message_bulleted" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_identity_messages" />
     </LinearLayout>
 
     <LinearLayout
@@ -179,13 +179,13 @@
       android:layout_height="wrap_content"
       android:minHeight="48dp">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_identity_away" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_clock" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_identity_away" />
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/settings_ignoreitem.xml b/app/src/main/res/layout/settings_ignoreitem.xml
index 1f51813a41d4e8d9dd624d72fad33e99e46f57c7..4edafc8f6dc2aac0a5da6ecec61eaaba254950ba 100644
--- a/app/src/main/res/layout/settings_ignoreitem.xml
+++ b/app/src/main/res/layout/settings_ignoreitem.xml
@@ -46,11 +46,6 @@
       style="@style/Widget.CoreSettings.DependentGroup"
       android:visibility="visible">
 
-      <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/isregex"
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_ignoreitem_isregex" />
-
       <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.CustomTextInput"
         android:layout_width="match_parent"
@@ -63,6 +58,11 @@
           tools:text="https://clbin.com/*.jpg*" />
       </com.google.android.material.textfield.TextInputLayout>
 
+      <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/isregex"
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_ignoreitem_isregex" />
+
       <de.kuschku.ui.spinner.MaterialSpinnerLayout
         style="@style/Widget.CustomSpinnerLayout"
         android:layout_width="match_parent"
@@ -97,13 +97,13 @@
       android:layout_height="wrap_content"
       android:minHeight="48dp">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_ignoreitem_scope" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_tag_text" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_ignoreitem_scope" />
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/settings_ignorelist_item.xml b/app/src/main/res/layout/settings_ignorelist_item.xml
index ef88a2ae3ecacc04e0dcf5d9ee8ed49da33041ac..6eb915e2f8efec56e8e34f2876558db269af7abb 100644
--- a/app/src/main/res/layout/settings_ignorelist_item.xml
+++ b/app/src/main/res/layout/settings_ignorelist_item.xml
@@ -28,6 +28,16 @@
   android:minHeight="?listPreferredItemHeightSmall"
   tools:showIn="@layout/settings_ignorelist">
 
+  <androidx.appcompat.widget.AppCompatImageView
+    android:id="@+id/handle"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:paddingStart="?listPreferredItemPaddingRight"
+    android:paddingEnd="32dp"
+    app:srcCompat="@drawable/ic_reorder"
+    app:tint="?colorTextSecondary" />
+
   <LinearLayout
     android:layout_width="0dip"
     android:layout_height="wrap_content"
@@ -62,16 +72,6 @@
 
   </LinearLayout>
 
-  <androidx.appcompat.widget.AppCompatImageView
-    android:id="@+id/handle"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:layout_gravity="center_vertical"
-    android:paddingStart="?listPreferredItemPaddingRight"
-    android:paddingEnd="32dp"
-    app:srcCompat="@drawable/ic_reorder"
-    app:tint="?colorTextSecondary" />
-
   <androidx.appcompat.widget.SwitchCompat
     android:id="@+id/toggle"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/settings_list.xml b/app/src/main/res/layout/settings_list.xml
index e683890cded8e5fb7cef4d01879d2dd14be8229e..600b14063bb85fa395eed1aa1ace805bf5ba5e6e 100644
--- a/app/src/main/res/layout/settings_list.xml
+++ b/app/src/main/res/layout/settings_list.xml
@@ -31,17 +31,24 @@
 
     <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroupHeader">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_networks_title" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_server_network" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_networks_title" />
     </LinearLayout>
 
     <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroup">
 
+      <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/networks"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:itemCount="2"
+        tools:listitem="@layout/settings_item" />
+
       <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -54,24 +61,17 @@
           android:layout_height="wrap_content"
           android:text="@string/label_new_network" />
       </LinearLayout>
-
-      <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/networks"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:itemCount="2"
-        tools:listitem="@layout/settings_item" />
     </LinearLayout>
 
     <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroupHeader">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_identities_title" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_account_card" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_identities_title" />
     </LinearLayout>
 
     <LinearLayout
@@ -80,6 +80,13 @@
       android:layout_marginStart="72dp"
       android:orientation="vertical">
 
+      <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/identities"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:itemCount="1"
+        tools:listitem="@layout/settings_item" />
+
       <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -92,28 +99,28 @@
           android:layout_height="wrap_content"
           android:text="@string/label_new_identity" />
       </LinearLayout>
-
-      <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/identities"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:itemCount="1"
-        tools:listitem="@layout/settings_item" />
     </LinearLayout>
 
     <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroupHeader">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_chatlists_title" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_list_bulleted" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_chatlists_title" />
     </LinearLayout>
 
     <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroup">
 
+      <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/chatlists"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:itemCount="2"
+        tools:listitem="@layout/settings_item" />
+
       <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -126,13 +133,6 @@
           android:layout_height="wrap_content"
           android:text="@string/label_new_chatlist" />
       </LinearLayout>
-
-      <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/chatlists"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:itemCount="2"
-        tools:listitem="@layout/settings_item" />
     </LinearLayout>
 
     <LinearLayout
@@ -140,13 +140,13 @@
       style="@style/Widget.CoreSettings.PrimaryItemGroupHeader"
       android:focusable="true">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_ignorelist_title" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_filter" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_ignorelist_title" />
     </LinearLayout>
 
     <LinearLayout
@@ -154,13 +154,13 @@
       style="@style/Widget.CoreSettings.PrimaryItemGroupHeader"
       android:focusable="true">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_highlightlist_title" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_bell" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_highlightlist_title" />
     </LinearLayout>
 
     <LinearLayout
@@ -168,13 +168,13 @@
       style="@style/Widget.CoreSettings.PrimaryItemGroupHeader"
       android:focusable="true">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_aliaslist_title" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_message_bulleted" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_aliaslist_title" />
     </LinearLayout>
 
     <LinearLayout
@@ -182,13 +182,13 @@
       style="@style/Widget.CoreSettings.PrimaryItemGroupHeader"
       android:focusable="true">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_networkconfig_title" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_settings" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_networkconfig_title" />
     </LinearLayout>
 
     <LinearLayout
@@ -196,13 +196,13 @@
       style="@style/Widget.CoreSettings.PrimaryItemGroupHeader"
       android:focusable="true">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/label_info_core" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_info" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/label_info_core" />
     </LinearLayout>
 
     <LinearLayout
@@ -210,13 +210,13 @@
       style="@style/Widget.CoreSettings.PrimaryItemGroupHeader"
       android:focusable="true">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/label_password_change" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_key_variant" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/label_password_change" />
     </LinearLayout>
 
     <de.kuschku.quasseldroid.util.ui.view.BannerView
diff --git a/app/src/main/res/layout/settings_network.xml b/app/src/main/res/layout/settings_network.xml
index 828ecec58c486bfbf99eb42650b9c72e8bb89932..70b9bbf63a78df89ffa56afcc72f1087bd012c93 100644
--- a/app/src/main/res/layout/settings_network.xml
+++ b/app/src/main/res/layout/settings_network.xml
@@ -32,13 +32,13 @@
       android:layout_height="wrap_content"
       android:minHeight="48dp">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_network_title" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_message_bulleted" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_network_title" />
     </LinearLayout>
 
     <LinearLayout
@@ -63,6 +63,14 @@
       android:orientation="vertical"
       android:visibility="visible">
 
+      <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/servers"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        tools:itemCount="4"
+        tools:listitem="@layout/settings_network_server" />
+
       <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -75,14 +83,6 @@
           android:layout_height="wrap_content"
           android:text="@string/label_new_server" />
       </LinearLayout>
-
-      <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/servers"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        tools:itemCount="4"
-        tools:listitem="@layout/settings_network_server" />
     </LinearLayout>
 
     <LinearLayout
@@ -90,13 +90,13 @@
       android:layout_height="wrap_content"
       android:minHeight="48dp">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_network_identity" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_account_card" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_network_identity" />
     </LinearLayout>
 
     <LinearLayout
@@ -191,6 +191,15 @@
       style="@style/Widget.CoreSettings.DependentGroup"
       tools:visibility="visible">
 
+      <de.kuschku.quasseldroid.util.ui.view.InlineSnackBar
+        android:id="@+id/autoidentify_warning"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        app:buttonText="@string/settings_network_sasl_upgrade"
+        app:text="@string/settings_network_sasl_supported" />
+
       <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.CustomTextInput"
         android:layout_width="match_parent"
@@ -218,15 +227,6 @@
           android:inputType="textPassword"
           tools:text="thisisasecurepassword" />
       </com.google.android.material.textfield.TextInputLayout>
-
-      <de.kuschku.quasseldroid.util.ui.view.InlineSnackBar
-        android:id="@+id/autoidentify_warning"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        app:buttonText="@string/settings_network_sasl_upgrade"
-        app:text="@string/settings_network_sasl_supported" />
     </LinearLayout>
 
     <LinearLayout
@@ -234,24 +234,19 @@
       android:layout_height="wrap_content"
       android:minHeight="48dp">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_network_connection" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_server_network" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_network_connection" />
     </LinearLayout>
 
     <LinearLayout
       style="@style/Widget.CoreSettings.DependentGroup"
       android:visibility="visible">
 
-      <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/rejoin_channels"
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_network_rejoin_channels" />
-
       <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.CustomTextInput"
         android:layout_width="match_parent"
@@ -264,6 +259,11 @@
           android:inputType="textMultiLine"
           tools:text="/mode -x" />
       </com.google.android.material.textfield.TextInputLayout>
+
+      <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/rejoin_channels"
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_network_rejoin_channels" />
     </LinearLayout>
 
     <LinearLayout
@@ -290,10 +290,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView
-          style="@style/Widget.CoreSettings.EditTextSuffix"
-          android:text="@string/settings_network_autoreconnect_interval_unit" />
-
         <com.google.android.material.textfield.TextInputLayout
           style="@style/Widget.CustomTextInput"
           android:layout_width="match_parent"
@@ -305,12 +301,11 @@
             style="@style/Widget.CoreSettings.EditText"
             tools:text="60" />
         </com.google.android.material.textfield.TextInputLayout>
-      </FrameLayout>
 
-      <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/autoreconnect_unlimited"
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_network_autoreconnect_unlimited" />
+        <TextView
+          style="@style/Widget.CoreSettings.EditTextSuffix"
+          android:text="@string/settings_network_autoreconnect_interval_unit" />
+      </FrameLayout>
 
       <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.CustomTextInput"
@@ -323,6 +318,11 @@
           style="@style/Widget.CoreSettings.EditText"
           tools:text="20" />
       </com.google.android.material.textfield.TextInputLayout>
+
+      <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/autoreconnect_unlimited"
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_network_autoreconnect_unlimited" />
     </LinearLayout>
 
     <LinearLayout
@@ -345,6 +345,23 @@
       style="@style/Widget.CoreSettings.DependentGroup"
       tools:visibility="visible">
 
+      <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/customratelimits_unlimited"
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_network_customratelimits_unlimited" />
+
+      <com.google.android.material.textfield.TextInputLayout
+        style="@style/Widget.CustomTextInput"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/settings_network_customratelimits_burstsize">
+
+        <com.google.android.material.textfield.TextInputEditText
+          android:id="@+id/customratelimits_burstsize"
+          style="@style/Widget.CoreSettings.EditText"
+          tools:text="5" />
+      </com.google.android.material.textfield.TextInputLayout>
+
       <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -365,23 +382,6 @@
             tools:text="2.20" />
         </com.google.android.material.textfield.TextInputLayout>
       </FrameLayout>
-
-      <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/customratelimits_unlimited"
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_network_customratelimits_unlimited" />
-
-      <com.google.android.material.textfield.TextInputLayout
-        style="@style/Widget.CustomTextInput"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/settings_network_customratelimits_burstsize">
-
-        <com.google.android.material.textfield.TextInputEditText
-          android:id="@+id/customratelimits_burstsize"
-          style="@style/Widget.CoreSettings.EditText"
-          tools:text="5" />
-      </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
   </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/settings_network_server.xml b/app/src/main/res/layout/settings_network_server.xml
index 12865a66c2fd84ee28eec60834a6c5347c5f66af..922b6f80670a4c945480cca6f8157a8a4bdee5ee 100644
--- a/app/src/main/res/layout/settings_network_server.xml
+++ b/app/src/main/res/layout/settings_network_server.xml
@@ -35,6 +35,16 @@
     android:paddingTop="10dp"
     android:paddingBottom="10dp">
 
+    <androidx.appcompat.widget.AppCompatImageView
+      android:id="@+id/ssl_enabled"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:layout_gravity="center_vertical"
+      android:paddingStart="?listPreferredItemPaddingLeft"
+      android:paddingEnd="32dp"
+      tools:srcCompat="@drawable/ic_lock"
+      tools:tint="?colorTintSecure" />
+
     <LinearLayout
       android:layout_width="0dip"
       android:layout_height="wrap_content"
@@ -64,16 +74,6 @@
         tools:text="@sample/networks.json/data/port" />
     </LinearLayout>
 
-    <androidx.appcompat.widget.AppCompatImageView
-      android:id="@+id/ssl_enabled"
-      android:layout_width="wrap_content"
-      android:layout_height="match_parent"
-      android:layout_gravity="center_vertical"
-      android:paddingStart="?listPreferredItemPaddingLeft"
-      android:paddingEnd="32dp"
-      tools:srcCompat="@drawable/ic_lock"
-      tools:tint="?colorTintSecure" />
-
     <androidx.appcompat.widget.AppCompatImageView
       android:id="@+id/handle"
       android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/settings_networkconfig.xml b/app/src/main/res/layout/settings_networkconfig.xml
index b37ad3a1175a27ab5225af5c0d07aa7d6b925506..4c63eba9f75a5cacf3aa5af5f5c23a6ad1a3e287 100644
--- a/app/src/main/res/layout/settings_networkconfig.xml
+++ b/app/src/main/res/layout/settings_networkconfig.xml
@@ -50,10 +50,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView
-          style="@style/Widget.CoreSettings.EditTextSuffix"
-          android:text="@string/settings_networkconfig_ping_interval_unit" />
-
         <com.google.android.material.textfield.TextInputLayout
           style="@style/Widget.CustomTextInput"
           android:layout_width="match_parent"
@@ -66,16 +62,16 @@
             android:inputType="number"
             tools:text="30" />
         </com.google.android.material.textfield.TextInputLayout>
+
+        <TextView
+          style="@style/Widget.CoreSettings.EditTextSuffix"
+          android:text="@string/settings_networkconfig_ping_interval_unit" />
       </FrameLayout>
 
       <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView
-          style="@style/Widget.CoreSettings.EditTextSuffix"
-          android:text="@string/settings_networkconfig_max_ping_count_unit" />
-
         <com.google.android.material.textfield.TextInputLayout
           style="@style/Widget.CustomTextInput"
           android:layout_width="match_parent"
@@ -88,6 +84,10 @@
             android:inputType="number"
             tools:text="10" />
         </com.google.android.material.textfield.TextInputLayout>
+
+        <TextView
+          style="@style/Widget.CoreSettings.EditTextSuffix"
+          android:text="@string/settings_networkconfig_max_ping_count_unit" />
       </FrameLayout>
     </LinearLayout>
 
@@ -115,10 +115,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView
-          style="@style/Widget.CoreSettings.EditTextSuffix"
-          android:text="@string/settings_networkconfig_auto_who_interval_unit" />
-
         <com.google.android.material.textfield.TextInputLayout
           style="@style/Widget.CustomTextInput"
           android:layout_width="match_parent"
@@ -131,16 +127,16 @@
             android:inputType="number"
             tools:text="90" />
         </com.google.android.material.textfield.TextInputLayout>
+
+        <TextView
+          style="@style/Widget.CoreSettings.EditTextSuffix"
+          android:text="@string/settings_networkconfig_auto_who_interval_unit" />
       </FrameLayout>
 
       <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView
-          style="@style/Widget.CoreSettings.EditTextSuffix"
-          android:text="@string/settings_networkconfig_auto_who_nick_limit_unit" />
-
         <com.google.android.material.textfield.TextInputLayout
           style="@style/Widget.CustomTextInput"
           android:layout_width="match_parent"
@@ -153,16 +149,16 @@
             android:inputType="number"
             tools:text="100" />
         </com.google.android.material.textfield.TextInputLayout>
+
+        <TextView
+          style="@style/Widget.CoreSettings.EditTextSuffix"
+          android:text="@string/settings_networkconfig_auto_who_nick_limit_unit" />
       </FrameLayout>
 
       <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView
-          style="@style/Widget.CoreSettings.EditTextSuffix"
-          android:text="@string/settings_networkconfig_auto_who_delay_unit" />
-
         <com.google.android.material.textfield.TextInputLayout
           style="@style/Widget.CustomTextInput"
           android:layout_width="match_parent"
@@ -175,6 +171,10 @@
             android:inputType="number"
             tools:text="5" />
         </com.google.android.material.textfield.TextInputLayout>
+
+        <TextView
+          style="@style/Widget.CoreSettings.EditTextSuffix"
+          android:text="@string/settings_networkconfig_auto_who_delay_unit" />
       </FrameLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/settings_networkserver.xml b/app/src/main/res/layout/settings_networkserver.xml
index ced991320621d29ce896044c66d78ee0579f9b46..f173de691326fab902d0eedd944c249afe3b6d66 100644
--- a/app/src/main/res/layout/settings_networkserver.xml
+++ b/app/src/main/res/layout/settings_networkserver.xml
@@ -31,29 +31,19 @@
       android:layout_height="wrap_content"
       android:minHeight="48dp">
 
-      <TextView
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_networkserver_connection" />
-
       <androidx.appcompat.widget.AppCompatImageView
         style="@style/Widget.CoreSettings.PrimaryItemIcon"
         app:srcCompat="@drawable/ic_server_network" />
+
+      <TextView
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_networkserver_connection" />
     </LinearLayout>
 
     <LinearLayout
       style="@style/Widget.CoreSettings.DependentGroup"
       android:visibility="visible">
 
-      <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/ssl_enabled"
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_networkserver_ssl_enabled" />
-
-      <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/ssl_verify"
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_networkserver_ssl_verify" />
-
       <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.CustomTextInput"
         android:layout_width="match_parent"
@@ -79,6 +69,16 @@
           tools:text="6667" />
       </com.google.android.material.textfield.TextInputLayout>
 
+      <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/ssl_enabled"
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_networkserver_ssl_enabled" />
+
+      <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/ssl_verify"
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_networkserver_ssl_verify" />
+
       <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.CustomTextInput"
         android:layout_width="match_parent"
@@ -114,6 +114,20 @@
       style="@style/Widget.CoreSettings.DependentGroup"
       tools:visibility="visible">
 
+      <de.kuschku.ui.spinner.MaterialSpinnerLayout
+        style="@style/Widget.CustomSpinnerLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/settings_networkserver_proxy_type">
+
+        <androidx.appcompat.widget.AppCompatSpinner
+          android:id="@+id/proxy_type"
+          style="@style/Widget.MaterialSpinner"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          tools:listitem="@layout/widget_spinner_item_material" />
+      </de.kuschku.ui.spinner.MaterialSpinnerLayout>
+
       <com.google.android.material.textfield.TextInputLayout
         style="@style/Widget.CustomTextInput"
         android:layout_width="match_parent"
@@ -164,20 +178,6 @@
           android:inputType="textPassword"
           tools:text="thisisasecurepassword" />
       </com.google.android.material.textfield.TextInputLayout>
-
-      <de.kuschku.ui.spinner.MaterialSpinnerLayout
-        style="@style/Widget.CustomSpinnerLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/settings_networkserver_proxy_type">
-
-        <androidx.appcompat.widget.AppCompatSpinner
-          android:id="@+id/proxy_type"
-          style="@style/Widget.MaterialSpinner"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          tools:listitem="@layout/widget_spinner_item_material" />
-      </de.kuschku.ui.spinner.MaterialSpinnerLayout>
     </LinearLayout>
   </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/setup_account_edit.xml b/app/src/main/res/layout/setup_account_edit.xml
index 6d5b0556fb1ace1d84425084e8be64b6277aad6f..26d6d956d5670eaac3d1a987a7431bbc4fb8227f 100644
--- a/app/src/main/res/layout/setup_account_edit.xml
+++ b/app/src/main/res/layout/setup_account_edit.xml
@@ -28,42 +28,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:paddingLeft="16dp"
-      android:paddingRight="16dp">
-
-      <FrameLayout
-        android:layout_width="56dp"
-        android:layout_height="68dp">
-
-        <androidx.appcompat.widget.AppCompatImageView
-          android:layout_width="24dp"
-          android:layout_height="24dp"
-          android:layout_gravity="center_vertical"
-          app:srcCompat="@drawable/ic_pencil"
-          app:tint="?android:textColorSecondary"
-          tools:ignore="ContentDescription" />
-      </FrameLayout>
-
-      <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/nameWrapper"
-        style="@style/Widget.CustomTextInput"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/label_account_name"
-        tools:ignore="LabelFor">
-
-        <com.google.android.material.textfield.TextInputEditText
-          android:id="@+id/name"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:inputType="text"
-          app:errorEnabled="true" />
-      </com.google.android.material.textfield.TextInputLayout>
-    </LinearLayout>
-
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -130,6 +94,55 @@
       </LinearLayout>
     </LinearLayout>
 
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:paddingLeft="16dp"
+      android:paddingRight="16dp">
+
+      <FrameLayout
+        android:layout_width="56dp"
+        android:layout_height="68dp">
+
+        <androidx.appcompat.widget.AppCompatImageView
+          android:layout_width="24dp"
+          android:layout_height="24dp"
+          android:layout_gravity="center_vertical"
+          app:srcCompat="@drawable/ic_pencil"
+          app:tint="?android:textColorSecondary"
+          tools:ignore="ContentDescription" />
+      </FrameLayout>
+
+      <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/nameWrapper"
+        style="@style/Widget.CustomTextInput"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/label_account_name"
+        tools:ignore="LabelFor">
+
+        <com.google.android.material.textfield.TextInputEditText
+          android:id="@+id/name"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:inputType="text"
+          app:errorEnabled="true" />
+      </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
+
+    <Space
+      android:layout_width="match_parent"
+      android:layout_height="16dp" />
+
+    <Space
+      android:layout_width="match_parent"
+      android:layout_height="16dp" />
+
+    <Space
+      android:layout_width="match_parent"
+      android:layout_height="16dp" />
+
+
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -193,18 +206,5 @@
     <Space
       android:layout_width="match_parent"
       android:layout_height="16dp" />
-
-    <Space
-      android:layout_width="match_parent"
-      android:layout_height="16dp" />
-
-
-    <Space
-      android:layout_width="match_parent"
-      android:layout_height="16dp" />
-
-    <Space
-      android:layout_width="match_parent"
-      android:layout_height="16dp" />
   </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/setup_core_backend_configure.xml b/app/src/main/res/layout/setup_core_backend_configure.xml
index 1fef8606af6062c52137631923439e9b67510a34..e0213b1e61dc848ba371e397ad131522a4af679e 100644
--- a/app/src/main/res/layout/setup_core_backend_configure.xml
+++ b/app/src/main/res/layout/setup_core_backend_configure.xml
@@ -23,15 +23,15 @@
   android:orientation="vertical"
   android:padding="32dp">
 
-  <LinearLayout
-    android:id="@+id/frame"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" />
-
   <TextView
     android:id="@+id/no_options_info"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:text="@string/setup_core_backend_no_options" />
+
+  <LinearLayout
+    android:id="@+id/frame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/setup_network_network.xml b/app/src/main/res/layout/setup_network_network.xml
index e0367c46ab882462a54c2a88ca220026a6dfa424..1065b24ddee69af5dc9b7aeeba49697d2465d404 100644
--- a/app/src/main/res/layout/setup_network_network.xml
+++ b/app/src/main/res/layout/setup_network_network.xml
@@ -39,15 +39,15 @@
       android:text="@string/settings_networkserver_ssl_enabled" />
 
     <com.google.android.material.textfield.TextInputLayout
-      android:id="@+id/hostWrapper"
+      android:id="@+id/nameWrapper"
       style="@style/Widget.CustomTextInput"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:hint="@string/settings_networkserver_host"
+      android:hint="@string/settings_network_network_name"
       tools:ignore="LabelFor">
 
       <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/host"
+        android:id="@+id/name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inputType="textUri|textNoSuggestions"
@@ -55,38 +55,38 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-      android:id="@+id/portWrapper"
+      android:id="@+id/hostWrapper"
       style="@style/Widget.CustomTextInput"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:hint="@string/settings_networkserver_port"
-      app:passwordToggleEnabled="true"
+      android:hint="@string/settings_networkserver_host"
       tools:ignore="LabelFor">
 
       <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/port"
+        android:id="@+id/host"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="number"
-        android:text="6667"
-        app:errorEnabled="true"
-        tools:ignore="HardcodedText" />
+        android:inputType="textUri|textNoSuggestions"
+        app:errorEnabled="true" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-      android:id="@+id/nameWrapper"
+      android:id="@+id/portWrapper"
       style="@style/Widget.CustomTextInput"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:hint="@string/settings_network_network_name"
+      android:hint="@string/settings_networkserver_port"
+      app:passwordToggleEnabled="true"
       tools:ignore="LabelFor">
 
       <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/name"
+        android:id="@+id/port"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="textUri|textNoSuggestions"
-        app:errorEnabled="true" />
+        android:inputType="number"
+        android:text="6667"
+        app:errorEnabled="true"
+        tools:ignore="HardcodedText" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <de.kuschku.ui.spinner.MaterialSpinnerLayout
diff --git a/app/src/main/res/layout/setup_slide.xml b/app/src/main/res/layout/setup_slide.xml
index 3388f659ae9b01449f15b836b326111c10726137..0d48cd01eac39dd8dccecd789892ab0825238ea3 100644
--- a/app/src/main/res/layout/setup_slide.xml
+++ b/app/src/main/res/layout/setup_slide.xml
@@ -24,17 +24,6 @@
   android:layout_height="match_parent"
   tools:ignore="InconsistentLayout">
 
-  <androidx.core.widget.NestedScrollView
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-    <FrameLayout
-      android:id="@+id/content_host"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content" />
-  </androidx.core.widget.NestedScrollView>
-
   <com.google.android.material.appbar.AppBarLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -87,4 +76,15 @@
         app:titleMarginStart="16dp" />
     </com.google.android.material.appbar.CollapsingToolbarLayout>
   </com.google.android.material.appbar.AppBarLayout>
+
+  <androidx.core.widget.NestedScrollView
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+    <FrameLayout
+      android:id="@+id/content_host"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content" />
+  </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/widget_buffer.xml b/app/src/main/res/layout/widget_buffer.xml
index b5aaa515fc3bc01517294fd8cd87c5e1a3c96d39..63d68f73a943ac26ef3178f04d67d6b0d18202a4 100644
--- a/app/src/main/res/layout/widget_buffer.xml
+++ b/app/src/main/res/layout/widget_buffer.xml
@@ -31,6 +31,15 @@
   android:paddingBottom="4dp"
   android:textAppearance="?android:attr/textAppearanceListItemSmall">
 
+  <androidx.appcompat.widget.AppCompatImageView
+    android:id="@+id/status"
+    android:layout_width="@dimen/avatar_size_buffer"
+    android:layout_height="@dimen/avatar_size_buffer"
+    android:layout_gravity="center_vertical"
+    android:layout_marginEnd="16dp"
+    android:contentDescription="@string/label_avatar"
+    tools:src="@tools:sample/avatars" />
+
   <LinearLayout
     android:layout_width="0dip"
     android:layout_height="wrap_content"
@@ -64,15 +73,6 @@
       tools:visibility="visible" />
   </LinearLayout>
 
-  <androidx.appcompat.widget.AppCompatImageView
-    android:id="@+id/status"
-    android:layout_width="@dimen/avatar_size_buffer"
-    android:layout_height="@dimen/avatar_size_buffer"
-    android:layout_gravity="center_vertical"
-    android:layout_marginEnd="16dp"
-    android:contentDescription="@string/label_avatar"
-    tools:src="@tools:sample/avatars" />
-
   <androidx.appcompat.widget.AppCompatImageView
     android:id="@+id/handle"
     android:layout_width="24dp"
diff --git a/app/src/main/res/layout/widget_buffer_away.xml b/app/src/main/res/layout/widget_buffer_away.xml
index 5e274fae8667a369ef9e93e958d1ea54386d1b59..876d72f5f954c791a7b63a94ac54c38960f4fb3f 100644
--- a/app/src/main/res/layout/widget_buffer_away.xml
+++ b/app/src/main/res/layout/widget_buffer_away.xml
@@ -31,6 +31,15 @@
   android:paddingBottom="4dp"
   android:textAppearance="?android:attr/textAppearanceListItemSmall">
 
+  <androidx.appcompat.widget.AppCompatImageView
+    android:id="@+id/status"
+    android:layout_width="@dimen/avatar_size_buffer"
+    android:layout_height="@dimen/avatar_size_buffer"
+    android:layout_gravity="center_vertical"
+    android:layout_marginEnd="16dp"
+    android:contentDescription="@string/label_avatar"
+    tools:src="@tools:sample/avatars" />
+
   <LinearLayout
     android:layout_width="0dip"
     android:layout_height="wrap_content"
@@ -66,15 +75,6 @@
       tools:visibility="visible" />
   </LinearLayout>
 
-  <androidx.appcompat.widget.AppCompatImageView
-    android:id="@+id/status"
-    android:layout_width="@dimen/avatar_size_buffer"
-    android:layout_height="@dimen/avatar_size_buffer"
-    android:layout_gravity="center_vertical"
-    android:layout_marginEnd="16dp"
-    android:contentDescription="@string/label_avatar"
-    tools:src="@tools:sample/avatars" />
-
   <androidx.appcompat.widget.AppCompatImageView
     android:layout_width="24dp"
     android:layout_height="24dp"
diff --git a/app/src/main/res/layout/widget_chatmessage_action.xml b/app/src/main/res/layout/widget_chatmessage_action.xml
index ea1c9d0b6eef5754f3b9921b3d336951d00743a7..3289e4c6063bdd9833c19b315963bd1f390654f1 100644
--- a/app/src/main/res/layout/widget_chatmessage_action.xml
+++ b/app/src/main/res/layout/widget_chatmessage_action.xml
@@ -37,6 +37,17 @@
     android:paddingBottom="@dimen/message_vertical"
     android:textAppearance="?android:attr/textAppearanceListItemSmall">
 
+    <TextView
+      android:id="@+id/time_left"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="top"
+      android:layout_marginEnd="@dimen/message_horizontal"
+      android:textColor="?attr/colorForegroundSecondary"
+      android:typeface="monospace"
+      tools:text="@sample/messages.json/data/time"
+      tools:visibility="gone" />
+
     <FrameLayout
       android:id="@+id/avatar_container"
       android:layout_width="@dimen/avatar_size"
@@ -92,17 +103,6 @@
         tools:textSize="11.9sp"
         tools:visibility="visible" />
     </LinearLayout>
-
-    <TextView
-      android:id="@+id/time_left"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="top"
-      android:layout_marginEnd="@dimen/message_horizontal"
-      android:textColor="?attr/colorForegroundSecondary"
-      android:typeface="monospace"
-      tools:text="@sample/messages.json/data/time"
-      tools:visibility="gone" />
   </LinearLayout>
 
   <include layout="@layout/widget_chatmessage_daychange" />
diff --git a/app/src/main/res/layout/widget_chatmessage_daychange.xml b/app/src/main/res/layout/widget_chatmessage_daychange.xml
index ed644e4bbe7c3503b95ea2ae6256acb6134f3395..4f40272969f0ef0e7333686bd4c42853108518f3 100644
--- a/app/src/main/res/layout/widget_chatmessage_daychange.xml
+++ b/app/src/main/res/layout/widget_chatmessage_daychange.xml
@@ -37,13 +37,6 @@
     android:paddingRight="@dimen/message_horizontal"
     android:paddingBottom="@dimen/message_vertical_daychange">
 
-    <View
-      android:layout_width="0dip"
-      android:layout_height="1dp"
-      android:layout_gravity="center_vertical"
-      android:layout_weight="1"
-      android:background="?colorDivider" />
-
     <View
       android:layout_width="0dip"
       android:layout_height="1dp"
@@ -65,5 +58,12 @@
       android:textColor="?attr/colorForeground"
       android:textStyle="bold"
       tools:text="27.03.2018" />
+
+    <View
+      android:layout_width="0dip"
+      android:layout_height="1dp"
+      android:layout_gravity="center_vertical"
+      android:layout_weight="1"
+      android:background="?colorDivider" />
   </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_chatmessage_error.xml b/app/src/main/res/layout/widget_chatmessage_error.xml
index 9a66e6e85fd3f71fa766ce1fe4b9237637446706..83f2b33ff9160e7f0f4518883c2b33c33b216c2b 100644
--- a/app/src/main/res/layout/widget_chatmessage_error.xml
+++ b/app/src/main/res/layout/widget_chatmessage_error.xml
@@ -38,13 +38,6 @@
     android:paddingBottom="@dimen/message_vertical"
     android:textAppearance="?android:attr/textAppearanceListItemSmall">
 
-    <Space
-      android:id="@+id/avatar_placeholder"
-      android:layout_width="@dimen/avatar_size"
-      android:layout_height="match_parent"
-      android:layout_marginEnd="@dimen/message_horizontal"
-      android:visibility="gone" />
-
     <TextView
       android:id="@+id/time_left"
       android:layout_width="wrap_content"
@@ -55,6 +48,22 @@
       android:typeface="monospace"
       tools:text="@sample/messages.json/data/time" />
 
+    <Space
+      android:id="@+id/avatar_placeholder"
+      android:layout_width="@dimen/avatar_size"
+      android:layout_height="match_parent"
+      android:layout_marginEnd="@dimen/message_horizontal"
+      android:visibility="gone" />
+
+    <de.kuschku.quasseldroid.util.ui.view.RipplePassthroughTextView
+      android:id="@+id/combined"
+      style="@style/Widget.RtlConformTextView"
+      android:layout_width="0dip"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:textColor="?attr/colorForegroundError"
+      tools:text="@sample/messages.json/data/message" />
+
     <TextView
       android:id="@+id/time_right"
       android:layout_width="wrap_content"
@@ -68,15 +77,6 @@
       tools:text="@sample/messages.json/data/time"
       tools:textSize="11.9sp"
       tools:visibility="visible" />
-
-    <de.kuschku.quasseldroid.util.ui.view.RipplePassthroughTextView
-      android:id="@+id/combined"
-      style="@style/Widget.RtlConformTextView"
-      android:layout_width="0dip"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:textColor="?attr/colorForegroundError"
-      tools:text="@sample/messages.json/data/message" />
   </LinearLayout>
 
   <include layout="@layout/widget_chatmessage_daychange" />
diff --git a/app/src/main/res/layout/widget_chatmessage_info.xml b/app/src/main/res/layout/widget_chatmessage_info.xml
index c10ab801e3c934be077767257408adf9e6e5321a..29cb8dfe2d7fc6366467b790b387535b9ab10559 100644
--- a/app/src/main/res/layout/widget_chatmessage_info.xml
+++ b/app/src/main/res/layout/widget_chatmessage_info.xml
@@ -38,13 +38,6 @@
     android:paddingBottom="@dimen/message_vertical"
     android:textAppearance="?android:attr/textAppearanceListItemSmall">
 
-    <Space
-      android:id="@+id/avatar_placeholder"
-      android:layout_width="@dimen/avatar_size"
-      android:layout_height="match_parent"
-      android:layout_marginEnd="@dimen/message_horizontal"
-      android:visibility="gone" />
-
     <TextView
       android:id="@+id/time_left"
       android:layout_width="wrap_content"
@@ -55,6 +48,23 @@
       android:typeface="monospace"
       tools:text="@sample/messages.json/data/time" />
 
+    <Space
+      android:id="@+id/avatar_placeholder"
+      android:layout_width="@dimen/avatar_size"
+      android:layout_height="match_parent"
+      android:layout_marginEnd="@dimen/message_horizontal"
+      android:visibility="gone" />
+
+    <de.kuschku.quasseldroid.util.ui.view.RipplePassthroughTextView
+      android:id="@+id/combined"
+      style="@style/Widget.RtlConformTextView"
+      android:layout_width="0dip"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:textColor="?attr/colorForegroundSecondary"
+      android:textStyle="italic"
+      tools:text="@sample/messages.json/data/message" />
+
     <TextView
       android:id="@+id/time_right"
       android:layout_width="wrap_content"
@@ -68,16 +78,6 @@
       tools:text="@sample/messages.json/data/time"
       tools:textSize="11.9sp"
       tools:visibility="visible" />
-
-    <de.kuschku.quasseldroid.util.ui.view.RipplePassthroughTextView
-      android:id="@+id/combined"
-      style="@style/Widget.RtlConformTextView"
-      android:layout_width="0dip"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:textColor="?attr/colorForegroundSecondary"
-      android:textStyle="italic"
-      tools:text="@sample/messages.json/data/message" />
   </LinearLayout>
 
   <include layout="@layout/widget_chatmessage_daychange" />
diff --git a/app/src/main/res/layout/widget_chatmessage_notice.xml b/app/src/main/res/layout/widget_chatmessage_notice.xml
index c1a3043fabf1bd59e03e0ab73a07583a43df5d6e..ccabeed9c3d912df2c16633f151d58c9200d9f62 100644
--- a/app/src/main/res/layout/widget_chatmessage_notice.xml
+++ b/app/src/main/res/layout/widget_chatmessage_notice.xml
@@ -38,13 +38,6 @@
     android:paddingBottom="@dimen/message_vertical"
     android:textAppearance="?android:attr/textAppearanceListItemSmall">
 
-    <Space
-      android:id="@+id/avatar_placeholder"
-      android:layout_width="@dimen/avatar_size"
-      android:layout_height="match_parent"
-      android:layout_marginEnd="@dimen/message_horizontal"
-      android:visibility="gone" />
-
     <TextView
       android:id="@+id/time_left"
       android:layout_width="wrap_content"
@@ -55,6 +48,22 @@
       android:typeface="monospace"
       tools:text="@sample/messages.json/data/time" />
 
+    <Space
+      android:id="@+id/avatar_placeholder"
+      android:layout_width="@dimen/avatar_size"
+      android:layout_height="match_parent"
+      android:layout_marginEnd="@dimen/message_horizontal"
+      android:visibility="gone" />
+
+    <de.kuschku.quasseldroid.util.ui.view.RipplePassthroughTextView
+      android:id="@+id/combined"
+      style="@style/Widget.RtlConformTextView"
+      android:layout_width="0dip"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:textColor="?attr/colorForegroundNotice"
+      tools:text="@sample/messages.json/data/message" />
+
     <TextView
       android:id="@+id/time_right"
       android:layout_width="wrap_content"
@@ -68,15 +77,6 @@
       tools:text="@sample/messages.json/data/time"
       tools:textSize="11.9sp"
       tools:visibility="visible" />
-
-    <de.kuschku.quasseldroid.util.ui.view.RipplePassthroughTextView
-      android:id="@+id/combined"
-      style="@style/Widget.RtlConformTextView"
-      android:layout_width="0dip"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:textColor="?attr/colorForegroundNotice"
-      tools:text="@sample/messages.json/data/message" />
   </LinearLayout>
 
   <include layout="@layout/widget_chatmessage_daychange" />
diff --git a/app/src/main/res/layout/widget_chatmessage_plain.xml b/app/src/main/res/layout/widget_chatmessage_plain.xml
index 7ae5ca5b4bd6e652164bcecdbe7040135e0b519c..63c58edf3ef8bb87b3f2428770e060b16aa1bfe9 100644
--- a/app/src/main/res/layout/widget_chatmessage_plain.xml
+++ b/app/src/main/res/layout/widget_chatmessage_plain.xml
@@ -36,22 +36,6 @@
     android:paddingBottom="@dimen/message_vertical"
     android:textAppearance="?android:attr/textAppearanceListItemSmall">
 
-    <FrameLayout
-      android:id="@+id/avatar_container"
-      android:layout_width="@dimen/avatar_size"
-      android:layout_height="@dimen/avatar_size"
-      android:layout_marginEnd="@dimen/message_horizontal"
-      android:visibility="gone"
-      tools:visibility="visible">
-
-      <ImageView
-        android:id="@+id/avatar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:contentDescription="@string/label_avatar"
-        tools:src="@tools:sample/avatars" />
-    </FrameLayout>
-
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -62,10 +46,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <Space
-          android:layout_width="4dp"
-          android:layout_height="0dip" />
-
         <TextView
           android:id="@+id/name"
           style="@style/Widget.RtlConformTextView"
@@ -79,6 +59,10 @@
           tools:text="@sample/messages.json/data/sender"
           tools:visibility="visible" />
 
+        <Space
+          android:layout_width="4dp"
+          android:layout_height="0dip" />
+
         <TextView
           android:id="@+id/realname"
           style="@style/Widget.RtlConformTextView"
@@ -142,6 +126,22 @@
       </LinearLayout>
     </LinearLayout>
 
+    <FrameLayout
+      android:id="@+id/avatar_container"
+      android:layout_width="@dimen/avatar_size"
+      android:layout_height="@dimen/avatar_size"
+      android:layout_marginEnd="@dimen/message_horizontal"
+      android:visibility="gone"
+      tools:visibility="visible">
+
+      <ImageView
+        android:id="@+id/avatar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:contentDescription="@string/label_avatar"
+        tools:src="@tools:sample/avatars" />
+    </FrameLayout>
+
     <TextView
       android:id="@+id/time_left"
       android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/widget_chatmessage_server.xml b/app/src/main/res/layout/widget_chatmessage_server.xml
index 3c9bc0630af1d656841fa1d4846c57d9a2ff1727..4f370038952cf626eff75ea23de30db1c6da8f95 100644
--- a/app/src/main/res/layout/widget_chatmessage_server.xml
+++ b/app/src/main/res/layout/widget_chatmessage_server.xml
@@ -38,13 +38,6 @@
     android:paddingBottom="@dimen/message_vertical"
     android:textAppearance="?android:attr/textAppearanceListItemSmall">
 
-    <Space
-      android:id="@+id/avatar_placeholder"
-      android:layout_width="@dimen/avatar_size"
-      android:layout_height="match_parent"
-      android:layout_marginEnd="@dimen/message_horizontal"
-      android:visibility="gone" />
-
     <TextView
       android:id="@+id/time_left"
       android:layout_width="wrap_content"
@@ -55,6 +48,22 @@
       android:typeface="monospace"
       tools:text="@sample/messages.json/data/time" />
 
+    <Space
+      android:id="@+id/avatar_placeholder"
+      android:layout_width="@dimen/avatar_size"
+      android:layout_height="match_parent"
+      android:layout_marginEnd="@dimen/message_horizontal"
+      android:visibility="gone" />
+
+    <de.kuschku.quasseldroid.util.ui.view.RipplePassthroughTextView
+      android:id="@+id/combined"
+      style="@style/Widget.RtlConformTextView"
+      android:layout_width="0dip"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:textColor="?attr/colorForegroundSecondary"
+      tools:text="@sample/messages.json/data/message" />
+
     <TextView
       android:id="@+id/time_right"
       android:layout_width="wrap_content"
@@ -68,15 +77,6 @@
       tools:text="@sample/messages.json/data/time"
       tools:textSize="11.9sp"
       tools:visibility="visible" />
-
-    <de.kuschku.quasseldroid.util.ui.view.RipplePassthroughTextView
-      android:id="@+id/combined"
-      style="@style/Widget.RtlConformTextView"
-      android:layout_width="0dip"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:textColor="?attr/colorForegroundSecondary"
-      tools:text="@sample/messages.json/data/message" />
   </LinearLayout>
 
   <include layout="@layout/widget_chatmessage_daychange" />
diff --git a/app/src/main/res/layout/widget_formatting.xml b/app/src/main/res/layout/widget_formatting.xml
index bc5fdb3d3e98ac2109768aa60142abaecdce8d13..8022a18dd10077f2f98bd27657386940cdc99855 100644
--- a/app/src/main/res/layout/widget_formatting.xml
+++ b/app/src/main/res/layout/widget_formatting.xml
@@ -32,14 +32,6 @@
       android:layout_height="48dp"
       android:layout_gravity="center">
 
-      <View
-        android:id="@+id/action_format_foreground_preview"
-        android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:layout_gravity="center_horizontal|bottom"
-        android:layout_margin="8dp"
-        android:background="?colorForeground" />
-
       <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/action_format_foreground"
         style="@style/Widget.Button.Format"
@@ -49,20 +41,20 @@
         android:paddingBottom="4dp"
         app:srcCompat="@drawable/ic_format_foreground"
         app:tint="?colorControlNormal" />
-    </FrameLayout>
-
-    <FrameLayout
-      android:layout_width="48dp"
-      android:layout_height="48dp"
-      android:layout_gravity="center">
 
       <View
-        android:id="@+id/action_format_background_preview"
+        android:id="@+id/action_format_foreground_preview"
         android:layout_width="match_parent"
         android:layout_height="4dp"
         android:layout_gravity="center_horizontal|bottom"
         android:layout_margin="8dp"
-        android:background="?colorBackground" />
+        android:background="?colorForeground" />
+    </FrameLayout>
+
+    <FrameLayout
+      android:layout_width="48dp"
+      android:layout_height="48dp"
+      android:layout_gravity="center">
 
       <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/action_format_background"
@@ -73,11 +65,15 @@
         android:paddingBottom="4dp"
         app:srcCompat="@drawable/ic_format_background"
         app:tint="?colorControlNormal" />
-    </FrameLayout>
 
-    <Space
-      android:layout_width="2dp"
-      android:layout_height="match_parent" />
+      <View
+        android:id="@+id/action_format_background_preview"
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:layout_gravity="center_horizontal|bottom"
+        android:layout_margin="8dp"
+        android:background="?colorBackground" />
+    </FrameLayout>
 
     <Space
       android:layout_width="2dp"
@@ -138,6 +134,10 @@
       app:srcCompat="@drawable/ic_format_monospace"
       app:tint="?colorControlNormal" />
 
+    <Space
+      android:layout_width="2dp"
+      android:layout_height="match_parent" />
+
     <androidx.appcompat.widget.AppCompatImageButton
       android:id="@+id/action_format_clear"
       style="@style/Widget.Button.Format"
diff --git a/app/src/main/res/layout/widget_header.xml b/app/src/main/res/layout/widget_header.xml
index b8530f9919ed4d13e3100bb3329eb34181a44cb7..278389b036e7f88654bc7a20a4930747fac2f501 100644
--- a/app/src/main/res/layout/widget_header.xml
+++ b/app/src/main/res/layout/widget_header.xml
@@ -26,14 +26,14 @@
 
   <LinearLayout style="@style/Widget.CoreSettings.PrimaryItemGroupHeader">
 
+    <androidx.appcompat.widget.AppCompatImageView
+      style="@style/Widget.CoreSettings.PrimaryItemIcon"
+      app:srcCompat="@drawable/ic_clock" />
+
     <TextView
       android:id="@+id/title"
       style="@style/Widget.CoreSettings.PrimaryItemSwitch"
       tools:text="@string/label_temporarily_archived" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-      style="@style/Widget.CoreSettings.PrimaryItemIcon"
-      app:srcCompat="@drawable/ic_clock" />
   </LinearLayout>
 
   <TextView
diff --git a/app/src/main/res/layout/widget_network.xml b/app/src/main/res/layout/widget_network.xml
index 291703b6fdbc99fff88cc76d98373a8b41fcdc14..7179f858c1c004b9885ebe248b8982b81d541ffd 100644
--- a/app/src/main/res/layout/widget_network.xml
+++ b/app/src/main/res/layout/widget_network.xml
@@ -25,6 +25,11 @@
   android:background="?attr/backgroundMenuItem"
   android:orientation="vertical">
 
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="1dp"
+    android:background="?attr/colorDivider" />
+
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -63,9 +68,4 @@
       app:srcCompat="@drawable/ic_chevron_down"
       app:tint="?attr/colorTextSecondary" />
   </LinearLayout>
-
-  <View
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="?attr/colorDivider" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_warning_bar.xml b/app/src/main/res/layout/widget_warning_bar.xml
index b0df357ab79a6446c01090620899154c198b8ce8..d06303b337b44dca0b23aa2201175c9b99d70bd8 100644
--- a/app/src/main/res/layout/widget_warning_bar.xml
+++ b/app/src/main/res/layout/widget_warning_bar.xml
@@ -29,13 +29,6 @@
   android:paddingBottom="6dp"
   android:theme="?attr/actionBarTheme">
 
-  <TextView
-    android:id="@+id/text"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="16dp"
-    android:textColor="?android:textColorPrimary" />
-
   <androidx.appcompat.widget.AppCompatImageView
     android:id="@+id/icon"
     android:layout_width="20dp"
@@ -53,4 +46,11 @@
     android:visibility="gone"
     app:mpb_indeterminateTint="?android:textColorPrimary" />
 
+  <TextView
+    android:id="@+id/text"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="16dp"
+    android:textColor="?android:textColorPrimary" />
+
 </LinearLayout>