Make popup toolgroup labels a little closer to their icons

Change-Id: I058f3fcb6e7c7af7a89bdc95cccd853c8aa57ea1
Merge "Make popup toolgroup labels a little closer to their icons"