Reverted button icons to just buttons.
Cleaned some log messages