Bug Fix and Icon Change