Ensure all related padding is reduced together when screen is too small

Also ensure top menu button doesn't have a bottom border

Change-Id: I791f78d8d16d8cadeb94814a677dc13167e80d56
Merge "Ensure all related padding is reduced together when screen is too small"