UI improvements and code refactoring

Made changes to some icon buttons and rewrote some of the code that created these, resulting in less code duplication.