Even better input handling; new icon