Update views and controllers, added icon set