Revert "Refactoring"

This reverts commit f96ae6db73.

app/src/main/res/layout/include_message_navigation.xml

@@ -240,51 +240,51 @@
             tools:ignore="MissingConstraints" />
 
         <ImageButton
-            android:id="@+id/ibTranslate"
+            android:id="@+id/ibSearch"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/title_translate"
+            android:contentDescription="@string/title_search"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            android:tooltipText="@string/title_translate"
-            app:srcCompat="@drawable/twotone_translate_24"
+            android:tooltipText="@string/title_search"
+            app:srcCompat="@drawable/twotone_search_24"
             tools:ignore="MissingConstraints" />
 
         <ImageButton
-            android:id="@+id/ibForceLight"
+            android:id="@+id/ibSearchText"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/title_force_light"
+            android:contentDescription="@string/title_search_in_text"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            android:tooltipText="@string/title_force_light"
-            app:srcCompat="@drawable/lightdark"
+            android:tooltipText="@string/title_search_in_text"
+            app:srcCompat="@drawable/twotone_manage_search_24"
             tools:ignore="MissingConstraints" />
 
         <ImageButton
-            android:id="@+id/ibSearch"
+            android:id="@+id/ibTranslate"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/title_search"
+            android:contentDescription="@string/title_translate"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            android:tooltipText="@string/title_search"
-            app:srcCompat="@drawable/twotone_search_24"
+            android:tooltipText="@string/title_translate"
+            app:srcCompat="@drawable/twotone_translate_24"
             tools:ignore="MissingConstraints" />
 
         <ImageButton
-            android:id="@+id/ibSearchText"
+            android:id="@+id/ibForceLight"
             android:layout_width="36dp"
             android:layout_height="36dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/title_search_in_text"
+            android:contentDescription="@string/title_force_light"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            android:tooltipText="@string/title_search_in_text"
-            app:srcCompat="@drawable/twotone_manage_search_24"
+            android:tooltipText="@string/title_force_light"
+            app:srcCompat="@drawable/lightdark"
             tools:ignore="MissingConstraints" />
 
         <ImageButton