Few more icon/clickable tweaks