Adjust controlbar icon alignment
am: a15882f816

Change-Id: I3661f71953d697ca7c91f28fcb9d90211cee657c