Icon cleanup and new callback page