Match invoice tabs with the fees table

Fixes #1420 and #1421 and #1418