Make cards refresh more reliable and cleanup some code

thanks to this smart fix by @SpiritCroc
http://gerrit.aicp-rom.com/#/c/49510/
we can now refresh cards with their real time index
and avoid any wrong app icon or thumbnail reference

AICPfy:
Remove some redundancy in the code

Change-Id: Ic2a175f0da252f6b6639c284ac68dfdf3a927d78