Icon position anomaly

[Joreh-T]

Hello everyone, I encountered two issues while using neo-tree. Please help me out. Thank you all.

1. The Git status icon conflicts with the diagnostic icon's position, so only one of them can be displayed. (neo-tree.lua is already open in a buffer, but lualine.lua is not.)

2. When I open a modified file, the Git status icon shifts, causing it to be displayed incompletely.
   

[pynappo]

looks like neo-tree thinks it has more width than it actually does? does this still happen without edgy.nvim?