Use the icon from the icon theme
Couple of fixes..