From ba54080177cf1797f60e93f2012983423dfe99a9 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Thu, 13 Feb 2020 16:17:28 +0100
Subject: [PATCH] Issue #8277: Reuse app icon in widget layout.

This patch refactors the widget layouts so that we can reuse the app icon and do not have to have
another logo resource with different constraints. This will also make it easier to update the
branding in #8277 and #8278.
---
 .../gecko/search/SearchWidgetProvider.kt      |  8 ++--
 app/src/main/res/drawable/ic_logo_widget.xml  | 26 -----------
 .../layout/search_widget_extra_small_v1.xml   | 24 +++++-----
 .../layout/search_widget_extra_small_v2.xml   |  9 ++--
 .../main/res/layout/search_widget_large.xml   |  7 ++-
 .../main/res/layout/search_widget_medium.xml  |  7 ++-
 .../main/res/layout/search_widget_small.xml   | 44 +++++++------------
 7 files changed, 47 insertions(+), 78 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_logo_widget.xml

diff --git a/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt b/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt
index c76edc2cb..f933b7c4f 100644
--- a/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt
+++ b/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt
@@ -17,7 +17,7 @@ import android.view.View
 import android.widget.RemoteViews
 import androidx.annotation.Dimension
 import androidx.annotation.Dimension.DP
-import androidx.appcompat.widget.AppCompatDrawableManager
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.graphics.drawable.toBitmap
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.IntentReceiverActivity
@@ -168,13 +168,13 @@ class SearchWidgetProvider : AppWidgetProvider() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             setImageViewResource(
                 R.id.button_search_widget_new_tab_icon,
-                R.drawable.ic_logo_widget)
+                R.drawable.ic_launcher_foreground)
         } else {
             setImageViewBitmap(
                 R.id.button_search_widget_new_tab_icon,
-                AppCompatDrawableManager.get().getDrawable(
+                AppCompatResources.getDrawable(
                     context,
-                    R.drawable.ic_logo_widget
+                    R.drawable.ic_launcher_foreground
                 )?.toBitmap())
         }
     }
diff --git a/app/src/main/res/drawable/ic_logo_widget.xml b/app/src/main/res/drawable/ic_logo_widget.xml
deleted file mode 100644
index 4f07b2fdc..000000000
--- a/app/src/main/res/drawable/ic_logo_widget.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- 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"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <path
-      android:pathData="M30.276,10.726a9.031,9.031 0,0 0,-3.322 -4.121,0.874 0.874,0 0,0 -1.018,0.158c-0.009,0.008 -0.012,0.018 -0.02,0.026 -0.347,-0.413 -0.7,-0.813 -1.048,-1.208a27.794,27.794 0,0 1,-2.807 -3.576c-0.11,-0.173 -0.219,-0.346 -0.327,-0.531 -0.051,-0.089 -0.092,-0.169 -0.128,-0.241 -0.109,-0.225 -0.135,-0.322 -0.137,-0.314a0.957,0.957 0,0 0,-0.737 -0.776h-0.052a0.869,0.869 0,0 0,-0.362 0.016h-0.021a0.91,0.91 0,0 0,-0.149 0.06l-0.012,0.011c-0.015,0.008 -0.033,0.01 -0.048,0.019a11.413,11.413 0,0 0,-5.356 8.057,8.114 8.114,0 0,0 -1.442,0.352 0.875,0.875 0,0 0,0.588 1.648,6.573 6.573,0 0,1 1.785,-0.361 6,6 0,0 1,0.967 0.017c0.108,0.01 0.215,0.034 0.323,0.049 0.207,0.031 0.414,0.065 0.617,0.115 0.137,0.034 0.27,0.079 0.4,0.122 0.163,0.052 0.325,0.108 0.483,0.173s0.3,0.132 0.448,0.206c0.131,0.066 0.259,0.137 0.385,0.211 0.081,0.049 0.16,0.1 0.24,0.153h-0.038a4.772,4.772 0,0 0,-0.741 0.063,0.875 0.875,0 0,0 -0.237,1.646 5.139,5.139 0,0 1,-2.988 9.618,5.583 5.583,0 0,1 -1.626,-0.311c-0.125,-0.047 -0.251,-0.1 -0.372,-0.152 -0.068,-0.031 -0.137,-0.062 -0.2,-0.1a5.318,5.318 0,0 1,-2.936 -3.855c0.2,-0.426 1.047,-1.739 3.911,-1.739a3.966,3.966 0,0 0,2.551 -2.162,0.842 0.842,0 0,0 0.053,-0.2c0,-0.02 0.016,-0.043 0.017,-0.063a0.868,0.868 0,0 0,0 -0.1c0,-0.017 -0.008,-0.026 -0.01,-0.042a0.838,0.838 0,0 0,-0.048 -0.212,0.761 0.761,0 0,0 -0.1,-0.2 0.855,0.855 0,0 0,-0.076 -0.1,1.051 1.051,0 0,0 -0.113,-0.106l-0.011,-0.011c-0.009,-0.006 -0.02,-0.009 -0.029,-0.015a5.5,5.5 0,0 0,-0.771 -0.43,12.345 12.345,0 0,1 -2.619,-1.564l-0.105,-0.1 -0.323,-0.318c-0.278,-0.273 -0.456,-0.442 -0.617,-0.579 -0.052,-0.044 -0.111,-0.083 -0.162,-0.123a6.063,6.063 0,0 1,0.016 -2.786,0.875 0.875,0 0,0 -1.2,-1.055 10.5,10.5 0,0 0,-2.724 1.832A12.031,12.031 0,0 1,7.975 5.9a0.877,0.877 0,0 0,-0.551 -0.871c-0.309,-0.123 -0.622,-0.109 -1.31,0.355a11.5,11.5 0,0 0,-1.54 1.319,13.562 13.562,0 0,0 -1.451,1.74 13.112,13.112 0,0 0,-2.087 4.718l-0.02,0.1c-0.031,0.139 -0.138,0.836 -0.151,0.959 -0.053,0.279 -0.1,0.565 -0.137,0.879v0.045c-0.051,0.4 -0.088,0.8 -0.106,1.2v0.113a15.409,15.409 0,0 0,30.6 2.578c0.02,-0.149 0.037,-0.3 0.054,-0.449l0.014,-0.13a15.75,15.75 0,0 0,-1.014 -7.73zM23.556,6.739a18.116,18.116 0,0 1,3.612 5.291,7.057 7.057,0 0,1 0.069,0.906v0.227a7.185,7.185 0,0 1,-0.059 0.787c-0.009,0.069 -0.014,0.139 -0.025,0.208a8.033,8.033 0,0 1,-0.208 0.943c-0.018,0.062 -0.042,0.124 -0.061,0.186q-0.122,0.39 -0.284,0.772c-0.034,0.079 -0.066,0.159 -0.1,0.237a9.148,9.148 0,0 1,-0.469 0.9c-0.023,0.038 -0.05,0.074 -0.073,0.112 -0.107,0.174 -0.232,0.343 -0.353,0.513v-0.345c0,-0.111 0,-0.207 -0.009,-0.313s-0.022,-0.223 -0.033,-0.335 -0.02,-0.222 -0.037,-0.336 -0.044,-0.225 -0.066,-0.338 -0.042,-0.233 -0.072,-0.351 -0.069,-0.227 -0.1,-0.341 -0.068,-0.238 -0.112,-0.358 -0.1,-0.227 -0.147,-0.341 -0.1,-0.24 -0.157,-0.36 -0.132,-0.227 -0.2,-0.341 -0.128,-0.236 -0.206,-0.353 -0.172,-0.229 -0.259,-0.344 -0.16,-0.226 -0.254,-0.336c-0.116,-0.136 -0.254,-0.267 -0.386,-0.4 -0.084,-0.085 -0.155,-0.172 -0.245,-0.255 -0.042,-0.039 -0.088,-0.078 -0.136,-0.117 -0.113,-0.193 -0.252,-0.377 -0.383,-0.563 -0.074,-0.105 -0.136,-0.214 -0.216,-0.317a9.54,9.54 0,0 0,-0.807 -0.918,6.474 6.474,0 0,1 -2.09,-4.849 6.848,6.848 0,0 1,0.072 -0.8c0.013,-0.087 0.031,-0.169 0.047,-0.253 0.03,-0.167 0.063,-0.332 0.1,-0.488 0.023,-0.09 0.048,-0.176 0.074,-0.262 0.042,-0.142 0.086,-0.279 0.133,-0.409 0.027,-0.076 0.054,-0.154 0.083,-0.226 0.054,-0.136 0.11,-0.263 0.166,-0.382l0.05,-0.11 0.164,0.263a29.047,29.047 0,0 0,2.977 3.796zM22.556,20.755c-0.133,0.089 -0.263,0.163 -0.394,0.244 -0.168,0.1 -0.335,0.209 -0.5,0.3 -0.023,0.013 -0.045,0.022 -0.067,0.034 0.021,-0.03 0.036,-0.066 0.057,-0.1a6.55,6.55 0,0 0,0.415 -0.7c0.062,-0.116 0.134,-0.223 0.19,-0.344a7.058,7.058 0,0 0,0.425 -1.175,7.227 7.227,0 0,0 0.022,-3.63c-0.011,-0.041 -0.027,-0.079 -0.038,-0.12 -0.052,-0.186 -0.106,-0.371 -0.173,-0.551 -0.029,-0.08 -0.068,-0.155 -0.1,-0.234 -0.057,-0.137 -0.111,-0.275 -0.177,-0.408 -0.055,-0.113 -0.122,-0.219 -0.184,-0.328 -0.052,-0.092 -0.1,-0.187 -0.155,-0.276 0.03,0.019 0.058,0.039 0.087,0.059l0.007,0.006c0.053,0.041 0.1,0.08 0.146,0.12a5.593,5.593 0,0 1,0.462 0.48c0.046,0.053 0.083,0.107 0.125,0.161 0.089,0.111 0.177,0.223 0.254,0.337 0.042,0.064 0.078,0.128 0.117,0.193 0.064,0.105 0.129,0.211 0.183,0.317 0.035,0.068 0.065,0.135 0.1,0.2 0.048,0.105 0.1,0.211 0.136,0.316 0.025,0.067 0.047,0.133 0.069,0.2 0.037,0.108 0.071,0.216 0.1,0.323 0.017,0.063 0.031,0.125 0.046,0.187 0.025,0.113 0.048,0.226 0.066,0.337l0.025,0.163c0.016,0.122 0.028,0.242 0.037,0.361 0,0.041 0.006,0.083 0.008,0.124 0.007,0.137 0.01,0.272 0.008,0.4v0.06a7.334,7.334 0,0 1,-0.433 2.3c-0.114,0.09 -0.226,0.168 -0.34,0.251 -0.175,0.144 -0.35,0.278 -0.523,0.393zM10.9,14.528c0.069,0.025 0.137,0.046 0.206,0.069q0.251,0.081 0.5,0.144c0.038,0.009 0.078,0.024 0.116,0.033 -0.047,0.016 -0.085,0.036 -0.131,0.052 -0.159,0.055 -0.309,0.114 -0.452,0.177 -0.063,0.028 -0.127,0.055 -0.187,0.084 -0.167,0.082 -0.324,0.168 -0.469,0.258 -0.02,0.012 -0.044,0.023 -0.064,0.036a4.984,4.984 0,0 0,-0.444 0.322c-0.04,0.033 -0.075,0.066 -0.113,0.1 -0.092,0.081 -0.179,0.16 -0.258,0.241l-0.046,0.042c0,-0.048 0,-0.1 0.006,-0.148a0.875,0.875 0,0 0,-0.87 -0.974,2.833 2.833,0 0,1 -2.179,-0.945 4.754,4.754 0,0 1,3.707 0.232c0.225,0.107 0.452,0.196 0.678,0.277zM18.024,4.573v0.031c-0.037,0.26 -0.064,0.536 -0.076,0.824v0.039a8.227,8.227 0,0 0,0.019 0.936l0.006,0.055a7.7,7.7 0,0 0,0.141 0.951l0.023,0.1a7.67,7.67 0,0 0,0.286 0.966c0.008,0.022 0.01,0.042 0.019,0.064 -0.046,-0.015 -0.094,-0.021 -0.14,-0.035 -0.132,-0.038 -0.267,-0.067 -0.4,-0.1 -0.2,-0.048 -0.4,-0.091 -0.6,-0.124 -0.142,-0.022 -0.284,-0.037 -0.428,-0.052 -0.114,-0.011 -0.225,-0.034 -0.34,-0.041a10.356,10.356 0,0 1,1.49 -3.614zM10.018,8.441c0,0.139 0,0.283 0.008,0.432 -0.055,-0.014 -0.11,-0.024 -0.166,-0.037 -0.076,-0.017 -0.152,-0.034 -0.228,-0.049l-0.044,-0.01c0.142,-0.118 0.286,-0.23 0.43,-0.336zM2.743,13.541a11.376,11.376 0,0 1,1.793 -4.064c0.012,-0.016 0.024,-0.032 0.034,-0.048a11.866,11.866 0,0 1,1.248 -1.493q0.222,-0.223 0.422,-0.405a5.442,5.442 0,0 0,0.577 2.319v0.006a1.615,1.615 0,0 0,0.1 0.169c0.008,0.011 0.023,0.015 0.032,0.025a0.879,0.879 0,0 0,0.265 0.2,0.459 0.459,0 0,0 0.06,0.027 0.8,0.8 0,0 0,0.355 0.077,6.12 6.12,0 0,1 2.74,0.507l0.231,0.152 0.056,0.038a3.545,3.545 0,0 1,0.3 0.227c0.195,0.166 0.414,0.383 0.846,0.811l0.105,0.1a5.241,5.241 0,0 0,0.638 0.521c0.089,0.064 0.19,0.123 0.284,0.184 0.156,0.1 0.308,0.2 0.472,0.3l0.031,0.02c-0.192,-0.006 -0.386,-0.016 -0.59,-0.042 -0.047,-0.006 -0.1,-0.017 -0.144,-0.025a5.9,5.9 0,0 1,-0.622 -0.13c-0.072,-0.019 -0.145,-0.039 -0.218,-0.061a5.85,5.85 0,0 1,-0.8 -0.3,6.349 6.349,0 0,0 -6.225,0.293 0.873,0.873 0,0 0,-0.3 1.04,4.607 4.607,0 0,0 3.343,2.634 7.578,7.578 0,0 0,4.543 6.585l0.081,0.04 0.016,0.008 0.07,0.035c0.028,0.018 0.069,0.038 0.1,0.057s0.09,0.054 0.145,0.083 0.115,0.056 0.175,0.085 0.12,0.058 0.188,0.088 0.147,0.059 0.223,0.089 0.147,0.058 0.229,0.087 0.174,0.058 0.264,0.086 0.174,0.057 0.269,0.084 0.2,0.051 0.3,0.076 0.2,0.051 0.309,0.074 0.221,0.041 0.332,0.061 0.227,0.043 0.347,0.06 0.24,0.027 0.36,0.04 0.251,0.03 0.384,0.039 0.254,0.01 0.383,0.014 0.244,0.014 0.373,0.014h0.045c0.127,0 0.26,-0.011 0.39,-0.016 0.153,-0.006 0.3,-0.008 0.46,-0.021 0.133,-0.011 0.272,-0.033 0.409,-0.05 0.162,-0.019 0.322,-0.034 0.489,-0.062 0.139,-0.023 0.284,-0.058 0.426,-0.088 0.169,-0.034 0.337,-0.064 0.51,-0.108 0.15,-0.038 0.3,-0.091 0.457,-0.136 0.171,-0.051 0.34,-0.1 0.514,-0.156s0.326,-0.13 0.489,-0.2 0.34,-0.127 0.513,-0.2 0.349,-0.176 0.524,-0.264 0.332,-0.16 0.5,-0.254c0.2,-0.111 0.4,-0.245 0.6,-0.37 0.148,-0.094 0.3,-0.176 0.446,-0.278 0.35,-0.239 0.7,-0.5 1.054,-0.787a0.817,0.817 0,0 0,0.09 -0.087c0.345,-0.288 0.667,-0.591 0.972,-0.9 0.088,-0.09 0.166,-0.185 0.251,-0.277 0.222,-0.24 0.437,-0.484 0.637,-0.736 0.1,-0.124 0.189,-0.251 0.281,-0.378 0.171,-0.233 0.331,-0.47 0.482,-0.71 0.081,-0.131 0.161,-0.261 0.236,-0.394 0.044,-0.076 0.1,-0.149 0.136,-0.225 -0.016,0.126 -0.03,0.252 -0.049,0.376 -0.023,0.147 -0.044,0.3 -0.071,0.439 -0.041,0.215 -0.089,0.423 -0.139,0.628 -0.032,0.134 -0.062,0.271 -0.1,0.4 -0.059,0.215 -0.126,0.419 -0.194,0.622 -0.035,0.105 -0.066,0.216 -0.1,0.317 -0.109,0.3 -0.224,0.579 -0.345,0.839 -1.752,3.758 -5.922,5.92 -11.232,5.763 -6.695,-0.19 -12.069,-4.451 -13.077,-10.4a4.558,4.558 0,0 1,-0.015 -1.3c0.035,-0.26 0.074,-0.518 0.136,-0.862 0.018,-0.12 0.108,-0.698 0.151,-0.911zM29.543,18.265l-0.06,0.513A13.65,13.65 0,0 1,5.4 25.046c0.054,0.045 0.113,0.084 0.167,0.129 0.176,0.146 0.359,0.284 0.543,0.422 0.158,0.118 0.314,0.237 0.477,0.349 0.192,0.133 0.391,0.257 0.591,0.381 0.167,0.1 0.332,0.21 0.5,0.308 0.207,0.118 0.421,0.226 0.635,0.335 0.175,0.09 0.348,0.182 0.528,0.266 0.222,0.1 0.452,0.194 0.681,0.288 0.181,0.074 0.36,0.153 0.545,0.221 0.24,0.088 0.487,0.162 0.734,0.24 0.183,0.057 0.363,0.121 0.55,0.172 0.263,0.073 0.533,0.13 0.8,0.191 0.178,0.04 0.353,0.087 0.534,0.121 0.3,0.058 0.614,0.1 0.924,0.141 0.154,0.02 0.3,0.05 0.459,0.067 0.469,0.051 0.943,0.084 1.425,0.1 0.189,0.005 0.378,0.008 0.565,0.008 0.11,0 0.216,-0.007 0.325,-0.009 0.136,0 0.272,-0.006 0.406,-0.011q0.363,-0.014 0.719,-0.042c0.1,-0.008 0.2,-0.015 0.3,-0.025 0.269,-0.025 0.534,-0.057 0.8,-0.094 0.066,-0.009 0.133,-0.018 0.2,-0.029 0.292,-0.044 0.578,-0.1 0.862,-0.155l0.11,-0.023q0.462,-0.1 0.908,-0.224l0.04,-0.011a12.457,12.457 0,0 0,5.576 -3.2l0.025,-0.024c0.189,-0.194 0.369,-0.395 0.542,-0.6l0.06,-0.068c0.16,-0.194 0.311,-0.4 0.457,-0.6 0.027,-0.038 0.057,-0.074 0.084,-0.113 0.139,-0.2 0.267,-0.409 0.393,-0.62 0.027,-0.046 0.058,-0.09 0.085,-0.136 0.147,-0.258 0.286,-0.524 0.413,-0.8 0.04,-0.085 0.086,-0.189 0.135,-0.3 0.016,-0.036 0.032,-0.076 0.048,-0.116 0.037,-0.088 0.075,-0.181 0.114,-0.283l0.063,-0.165c0.039,-0.106 0.079,-0.219 0.12,-0.337l0.062,-0.181c0.056,-0.169 0.112,-0.348 0.167,-0.539l0.017,-0.057c0.057,-0.2 0.112,-0.418 0.165,-0.642 0.018,-0.074 0.033,-0.152 0.05,-0.228 0.036,-0.162 0.069,-0.327 0.1,-0.5l0.049,-0.281q0.042,-0.26 0.076,-0.533c0.012,-0.093 0.025,-0.185 0.035,-0.281q0.041,-0.372 0.061,-0.763c0,-0.028 0.005,-0.055 0.007,-0.084a14.79,14.79 0,0 1,-0.09 1.555z">
-    <aapt:attr name="android:fillColor">
-      <gradient 
-          android:startY="2.757"
-          android:startX="24.041"
-          android:endY="31.15"
-          android:endX="7.649"
-          android:type="linear">
-        <item android:offset="0" android:color="#FFFF9640"/>
-        <item android:offset="0.6" android:color="#FFFC4055"/>
-        <item android:offset="1" android:color="#FFE31587"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-</vector>
diff --git a/app/src/main/res/layout/search_widget_extra_small_v1.xml b/app/src/main/res/layout/search_widget_extra_small_v1.xml
index 59aeb64cc..4dd9c31de 100644
--- a/app/src/main/res/layout/search_widget_extra_small_v1.xml
+++ b/app/src/main/res/layout/search_widget_extra_small_v1.xml
@@ -4,15 +4,19 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@id/button_search_widget_new_tab"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:background="@drawable/rounded_white_corners"
-        android:layout_gravity="center">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@id/button_search_widget_new_tab"
+    android:layout_width="match_parent"
+    android:layout_height="50dp"
+    android:background="@drawable/rounded_white_corners"
+    android:layout_gravity="center">
 
     <ImageView
-            android:id="@+id/button_search_widget_new_tab_icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center"/>
-</FrameLayout>
\ No newline at end of file
+        android:id="@+id/button_search_widget_new_tab_icon"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:scaleType="centerInside"
+        tools:src="@drawable/ic_launcher_foreground"
+        android:layout_gravity="center"/>
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/search_widget_extra_small_v2.xml b/app/src/main/res/layout/search_widget_extra_small_v2.xml
index eca312a68..e61a0fde2 100644
--- a/app/src/main/res/layout/search_widget_extra_small_v2.xml
+++ b/app/src/main/res/layout/search_widget_extra_small_v2.xml
@@ -4,6 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:id="@id/button_search_widget_new_tab"
         android:layout_width="64dp"
         android:layout_height="50dp"
@@ -12,7 +13,9 @@
 
     <ImageView
             android:id="@+id/button_search_widget_new_tab_icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:scaleType="centerInside"
+            tools:src="@drawable/ic_launcher_foreground"
             android:layout_gravity="center"/>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/search_widget_large.xml b/app/src/main/res/layout/search_widget_large.xml
index 5faa8a0ce..fe596e90b 100644
--- a/app/src/main/res/layout/search_widget_large.xml
+++ b/app/src/main/res/layout/search_widget_large.xml
@@ -12,11 +12,10 @@
 
     <ImageView
             android:id="@+id/button_search_widget_new_tab_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
             android:layout_alignParentStart="true"
-            android:adjustViewBounds="true"
-            android:padding="12dp"/>
+            android:scaleType="centerInside" />
 
     <TextView
             android:id="@+id/button_search_widget_new_tab"
diff --git a/app/src/main/res/layout/search_widget_medium.xml b/app/src/main/res/layout/search_widget_medium.xml
index 3e70b7409..61c4674e2 100644
--- a/app/src/main/res/layout/search_widget_medium.xml
+++ b/app/src/main/res/layout/search_widget_medium.xml
@@ -12,11 +12,10 @@
 
     <ImageView
             android:id="@+id/button_search_widget_new_tab_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
             android:layout_alignParentStart="true"
-            android:adjustViewBounds="true"
-            android:padding="12dp"/>
+            android:scaleType="centerInside" />
 
     <TextView
             android:id="@+id/button_search_widget_new_tab"
diff --git a/app/src/main/res/layout/search_widget_small.xml b/app/src/main/res/layout/search_widget_small.xml
index f0e4e9712..b30041ec4 100644
--- a/app/src/main/res/layout/search_widget_small.xml
+++ b/app/src/main/res/layout/search_widget_small.xml
@@ -2,33 +2,23 @@
 <!-- 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/. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="100dp"
+    android:layout_height="50dp"
+    android:background="@drawable/rounded_white_corners"
+    android:orientation="horizontal">
 
-<RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="100dp"
+    <ImageView
+        android:id="@+id/button_search_widget_new_tab_icon"
+        android:layout_width="50dp"
         android:layout_height="50dp"
-        android:background="@drawable/rounded_white_corners"
-        android:layout_gravity="center">
-
-    <FrameLayout android:id="@+id/button_search_widget_new_tab"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="9dp">
-
-        <ImageView
-                android:id="@+id/button_search_widget_new_tab_icon"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:layout_marginStart="9dp"/>
-    </FrameLayout>
-
-    <ImageButton
-            android:id="@+id/button_search_widget_voice"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:background="@drawable/ic_microphone_widget"
-            android:layout_alignParentEnd="true"
-            android:layout_alignTop="@id/button_search_widget_new_tab"
-            android:layout_marginEnd="9dp"/>
-</RelativeLayout>
+        android:scaleType="centerInside" />
 
+    <ImageView
+        android:id="@+id/button_search_widget_voice"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:padding="10dp"
+        android:src="@drawable/ic_microphone_widget"
+        android:scaleType="centerInside" />
+</LinearLayout>