1687 : Only display applicable fees
1686 : Show currency symbols
Merge commit '8188056' into test-stage
Merge commit 'ffd7d43' into test-stage