Loads of icons added plus some fixes