Dual token in on contract

I have a system with two tokens, and I want them to be SIP-010 compatible. I have three smart contracts: two define each token, and the third contains the logic. How should I proceed because the wallet is not recognizing the tokens properly — for example, they appear without an image or name.

Each one of the SIP010 compatible token contracts should also have its metadata SIP016 compliant:

And if doesn’t happen to be the case, you could always invoke a helper contract to update the token metadata:

Sorry, I explained it poorly. I have two tokens. Each file representing a token is SIP-10 compatible, with the only exception being that define-fungible-token is declared in the contract that contains the logic, not in the individual token contracts. This is due to many interactions and is intended to save gas. Do you have any suggestions?