Fixes according to pull request comments
Covert icons to buttons in line actions