Tab bar: use tab-close icon again
(cherry picked from commit c5b8abf0e3a5625ade0c20304be062ccce759c16)