Issue #131 - add layout elements for icon and delete button