Updated so the remove track icons work properly