Moved icon in drawer, removed unnecessary view in tab_list_item

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

@@ -76,7 +76,7 @@
         </FrameLayout>
 
         <FrameLayout
-            android:id="@+id/new_tab_button"
+            android:id="@+id/action_home"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -84,16 +84,16 @@
             android:clickable="true">
 
             <ImageView
-                android:id="@+id/icon_plus"
+                android:id="@+id/icon_home"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:contentDescription="@string/action_new_tab"
-                android:src="@drawable/ic_action_plus" />
+                android:contentDescription="@string/action_homepage"
+                android:src="@drawable/ic_action_home"/>
         </FrameLayout>
 
         <FrameLayout
-            android:id="@+id/action_home"
+            android:id="@+id/action_forward"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -101,16 +101,16 @@
             android:clickable="true">
 
             <ImageView
-                android:id="@+id/icon_home"
+                android:id="@+id/icon_forward"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:contentDescription="@string/action_homepage"
-                android:src="@drawable/ic_action_home" />
+                android:contentDescription="@string/action_forward"
+                android:src="@drawable/ic_action_forward"/>
         </FrameLayout>
 
         <FrameLayout
-            android:id="@+id/action_forward"
+            android:id="@+id/new_tab_button"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -118,12 +118,12 @@
             android:clickable="true">
 
             <ImageView
-                android:id="@+id/icon_forward"
+                android:id="@+id/icon_plus"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:contentDescription="@string/action_forward"
-                android:src="@drawable/ic_action_forward" />
+                android:contentDescription="@string/action_new_tab"
+                android:src="@drawable/ic_action_plus"/>
         </FrameLayout>
     </LinearLayout>
 

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

@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tab_item_background"
+<LinearLayout android:id="@+id/tab_item_background"
+              xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="56dp"
-    android:clickable="true"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
               android:background="?attr/listBackground"
+              android:clickable="true"
               android:gravity="center_vertical"
               android:orientation="horizontal"
               android:weightSum="1">
@@ -57,5 +51,3 @@
             android:src="@drawable/ic_action_delete"/>
     </FrameLayout>
 </LinearLayout>
-
-</LinearLayout>