Merged in width/height ratio
Added icons for dropper and bucket