diff --git a/app/src/main/res/layout-land/activity_set_security.xml b/app/src/main/res/layout-land/activity_set_security.xml
index cdc23da78..6f4b4e0bb 100644
--- a/app/src/main/res/layout-land/activity_set_security.xml
+++ b/app/src/main/res/layout-land/activity_set_security.xml
@@ -40,7 +40,7 @@
             android:layout_height="0dp"
             android:layout_weight="1"/>
 
-        <android.support.v7.widget.ButtonBarLayout
+        <LinearLayout
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/buttonPanel"
             android:layout_width="match_parent"
@@ -69,7 +69,7 @@
                 android:layout_weight="1"
                 android:text="@string/set"/>
 
-        </android.support.v7.widget.ButtonBarLayout>
+        </LinearLayout>
     </LinearLayout>
 
     <FrameLayout
diff --git a/app/src/main/res/layout/activity_set_security.xml b/app/src/main/res/layout/activity_set_security.xml
index 9f6fabf39..38c2eca54 100644
--- a/app/src/main/res/layout/activity_set_security.xml
+++ b/app/src/main/res/layout/activity_set_security.xml
@@ -51,7 +51,7 @@
         </com.hippo.widget.MaxSizeContainer>
     </FrameLayout>
 
-    <android.support.v7.widget.ButtonBarLayout
+    <LinearLayout
         android:id="@+id/buttonPanel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -79,5 +79,5 @@
             android:layout_weight="1"
             android:text="@string/set"/>
 
-    </android.support.v7.widget.ButtonBarLayout>
+    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/scene_analytics.xml b/app/src/main/res/layout/scene_analytics.xml
index b97d8f928..927ad956b 100644
--- a/app/src/main/res/layout/scene_analytics.xml
+++ b/app/src/main/res/layout/scene_analytics.xml
@@ -57,7 +57,7 @@
 
     </com.hippo.widget.MaxSizeContainer>
 
-    <android.support.v7.widget.ButtonBarLayout
+    <LinearLayout
         android:id="@+id/buttonPanel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -88,5 +88,5 @@
             android:textStyle="bold"
             android:text="@string/accept"/>
 
-    </android.support.v7.widget.ButtonBarLayout>
+    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/scene_cookie_sign_in.xml b/app/src/main/res/layout/scene_cookie_sign_in.xml
index fd68b1f7a..c8f32ca6d 100644
--- a/app/src/main/res/layout/scene_cookie_sign_in.xml
+++ b/app/src/main/res/layout/scene_cookie_sign_in.xml
@@ -103,7 +103,7 @@
         </ScrollView>
     </com.hippo.widget.MaxSizeContainer>
 
-    <android.support.v7.widget.ButtonBarLayout
+    <LinearLayout
         android:id="@+id/buttonPanel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -130,5 +130,5 @@
             android:textStyle="bold"
             android:text="@android:string/ok"/>
 
-    </android.support.v7.widget.ButtonBarLayout>
+    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/scene_crash.xml b/app/src/main/res/layout/scene_crash.xml
index 4a2f36c16..e7874fb76 100644
--- a/app/src/main/res/layout/scene_crash.xml
+++ b/app/src/main/res/layout/scene_crash.xml
@@ -57,7 +57,7 @@
         </ScrollView>
     </com.hippo.widget.MaxSizeContainer>
 
-    <android.support.v7.widget.ButtonBarLayout
+    <LinearLayout
         android:id="@+id/buttonPanel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -88,5 +88,5 @@
             android:textStyle="bold"
             android:text="@string/send"/>
 
-    </android.support.v7.widget.ButtonBarLayout>
+    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/scene_login.xml b/app/src/main/res/layout/scene_login.xml
index 25a405356..2fc9cddd0 100644
--- a/app/src/main/res/layout/scene_login.xml
+++ b/app/src/main/res/layout/scene_login.xml
@@ -83,7 +83,7 @@
                 android:layout_height="0dp"
                 android:layout_weight="1"/>
 
-            <android.support.v7.widget.ButtonBarLayout
+            <LinearLayout
                 android:id="@+id/buttonPanel"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -114,7 +114,7 @@
                     android:textStyle="bold"
                     android:text="@string/sign_in"/>
 
-            </android.support.v7.widget.ButtonBarLayout>
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/sign_in_via_webview"
diff --git a/app/src/main/res/layout/scene_select_site.xml b/app/src/main/res/layout/scene_select_site.xml
index b841c4285..741691e82 100644
--- a/app/src/main/res/layout/scene_select_site.xml
+++ b/app/src/main/res/layout/scene_select_site.xml
@@ -92,7 +92,7 @@
         </ScrollView>
     </com.hippo.widget.MaxSizeContainer>
 
-    <android.support.v7.widget.ButtonBarLayout
+    <LinearLayout
         android:id="@+id/buttonPanel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -119,5 +119,5 @@
             android:textStyle="bold"
             android:text="@android:string/ok"/>
 
-    </android.support.v7.widget.ButtonBarLayout>
+    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/scene_warning.xml b/app/src/main/res/layout/scene_warning.xml
index 42b0ea396..efb2cd17d 100644
--- a/app/src/main/res/layout/scene_warning.xml
+++ b/app/src/main/res/layout/scene_warning.xml
@@ -56,7 +56,7 @@
 
     </com.hippo.widget.MaxSizeContainer>
 
-    <android.support.v7.widget.ButtonBarLayout
+    <LinearLayout
         android:id="@+id/buttonPanel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -87,5 +87,5 @@
             android:textStyle="bold"
             android:text="@string/accept"/>
 
-    </android.support.v7.widget.ButtonBarLayout>
+    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/search_action.xml b/app/src/main/res/layout/search_action.xml
index b87a64d1e..ae75a85ce 100644
--- a/app/src/main/res/layout/search_action.xml
+++ b/app/src/main/res/layout/search_action.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<android.support.v7.widget.ButtonBarLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -35,4 +35,4 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"/>
 
-</android.support.v7.widget.ButtonBarLayout>
+</LinearLayout>