remove setroubleshoot_icon cause its an app
Merge remote-tracking branch 'origin/master'
all kinds of stuff