Minor changes + icon pack