Pulls out Shealy's changes to icons in preparation for "speed" branch merge.