Fixed some style problems.
fixed "trash-icon"
little tweaks to go with latest changes done by larz