remove unused vars & prevent submit via enter
display icon if available on page render
Merge pull request #2088 from robertmuehsig/1497-preventSubmit

Fix for #1497 and display Package Icon on page render