Some reactoring, icon changes, failed tests with VS2012