Added move icon, prepared for tests