Fix directory and icons