change icon in status bar; cleanup codes