2) Started working for same company which I was working earlier for, but joined in a new role and new team.
3) I did not asked for a Visa as I already had one.

Having stated above.
Now I am looking to get Tier 2 ICT Visa or a Tier 2 General Visa and my company is ready to sponsor me.
1) What are my options ? Should I apply for Tier 2 ICT or Tier 2 General ?
2) Do I need to leave UK and Apply for Tier 2 general as my Dependent Visa is expiring in April 2017 ?
Please advice!!

Thanks,
Rohit