Polish off list partial

Move icons to the end and use better icons.