WIP: Fix machine token icon rendering issues