Merge "Restyling action buttons." into jb-dev