Revert "buttons: Some of fixes"

This reverts commit 1e17c19b7189612c384f3d7fe1feb17de5b61ba3.