Merge "Use ImageButtons instead of Buttons in handle menu" into tm-qpr-dev