remove hacks and introduce RightAligned toolbar actions
(cherry picked from commit 9c7c637)