Further restructure, removed GUI toolbar icon size slider (always 22x22 now)