diff --git a/app/src/main/res/drawable/ic_qr.xml b/app/src/main/res/drawable/ic_qr.xml
index 9d22ea8f7..8b774bf72 100644
--- a/app/src/main/res/drawable/ic_qr.xml
+++ b/app/src/main/res/drawable/ic_qr.xml
@@ -1,3 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="18dp"
     android:height="18dp"
diff --git a/app/src/main/res/drawable/ic_shortcuts.xml b/app/src/main/res/drawable/ic_shortcuts.xml
index 2a1a574ec..b3a0a65f9 100644
--- a/app/src/main/res/drawable/ic_shortcuts.xml
+++ b/app/src/main/res/drawable/ic_shortcuts.xml
@@ -1,3 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="18dp"
     android:height="18dp"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 323e68ba1..fb9479208 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -70,43 +70,14 @@
         app:layout_constraintBottom_toBottomOf="parent">
 
         <Button
-            tools:ignore="RtlSymmetry"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/search_pill"
             android:text="@string/search_scan_button"
-            android:textAllCaps="false"
-            android:textSize="14sp"
-            android:textColor="@color/searchPillText"
-            android:layout_gravity="center_vertical"
-            android:gravity="center_vertical"
-            android:singleLine="true"
             android:drawableStart="@drawable/ic_qr"
-            android:padding="8dp"
-            android:paddingEnd="16dp"
-            android:drawablePadding="8dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:layout_marginEnd="8dp"
-            android:background="@drawable/search_pill_background"
-            style="@style/Widget.AppCompat.Button.Borderless" />
+            android:layout_marginEnd="8dp"/>
+
         <Button
-            tools:ignore="RtlSymmetry"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            style="@style/search_pill"
             android:text="@string/search_shortcuts_button"
-            android:textAllCaps="false"
-            android:textSize="14sp"
-            android:textColor="@color/searchPillText"
-            android:layout_gravity="center_vertical"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:drawableStart="@drawable/ic_shortcuts"
-            android:padding="8dp"
-            android:paddingEnd="16dp"
-            android:drawablePadding="8dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:background="@drawable/search_pill_background"
-            style="@style/Widget.AppCompat.Button.Borderless" />
+            android:drawableStart="@drawable/ic_shortcuts" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1ea5185c2..67a2c10bf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,4 +9,21 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
+
+    <style name="search_pill" parent="Widget.AppCompat.Button.Borderless">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/searchPillText</item>
+        <item name="android:layout_gravity">center_vertical</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:padding">8dp</item>
+        <item name="android:paddingEnd">16dp</item>
+        <item name="android:drawablePadding">8dp</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:minHeight">0dp</item>
+        <item name="android:background">@drawable/search_pill_background</item>
+    </style>
 </resources>