Removed unuseful cases in performremove()
Fixed icon bug