Fix title block labels
Update icons