v2.2/feature:TitleBar&ControlBar UI little fixup

tower: https://tower.im/projects/d4e0ff64158645f28d99a9ca72d0c27b/todos/9d71a1be84f246d9bace2a090dde7e08/

Change-Id: I4c9b59d8c18b88d03aa809c14b64732533af94ee