Fixed icons, cleaned up some code.