Yesterday
merge from triangle_planter_icon_alignment