Updated icon management and added a few more icons.