Hi Zabel - I have a 20 month old who is now basically weaned, although I ocassionally let him have som if he really wants it!
I actually found the night feed the easiest to give up first (probably because I liked doing what you do - getting a bit more sleep in the morning). I just created a new routine. He got a cup like his big sister has (a plastic cup with a lid and straw from kmart) and had milk in that and I read him a story in the rocking chair at the same time. This was so I didn't dispense with the whole thing at one - he still had warm milk, cuddles and the rocking chair. Then with mornings if he wakes up extra early i'll still put him in bed with me and he go on the boob, but if I get up he is happy to have his cup of milk.