Some cleanup and some fixes for the home icon.