WIP

Added Icons
Made Platform Independent