CPT icons

and tab fixes