Bug 38295 - Avoid overlapping text in Tools box by using display:inline-block

Change-Id: I344a1f07f0b5441c81dff8cc9b2e7297c35d1db6
Merge "Bug 38295 - Avoid overlapping text in Tools box by using display:inline-block"