Merge "Unify action buttons to a common widget (part 1)"