Fixed the command filter problem and added the icons.