Match invoice tabs with the fees table

Fixes #1420