new icons; edited layouts