Fixed VM icons; re-factoring assets window