Check the condition of your battery or battery connectors. I've just recently resolved a problem with my automatic 1.6 trying to idle at 2,000rpm. At first I thought it was my ICV as well although it only seemed to happen on a cold engine, i.e when battery load is higher than normal. This also only seems to occur during the cold winter seasons. Its not funny trying to brake in an automatic and it decides it wants to keep going! The only way to stop it was pulling over, switching the engine off and resetting the ignition/restarting the engine. 
Replacing my shoddy negative battery lead and having it securely fitted, my idling issues seem to have vanished. Possibly something to consider, hope this helps.
[/align]
Replacing my shoddy negative battery lead and having it securely fitted, my idling issues seem to have vanished. Possibly something to consider, hope this helps.