Switch composer select/move icon to more appropriate icon