diff --git a/src/client/graphics/fx/TextFx.ts b/src/client/graphics/fx/TextFx.ts
index e853dd0c9..200a2ac1e 100644
--- a/src/client/graphics/fx/TextFx.ts
+++ b/src/client/graphics/fx/TextFx.ts
@@ -1,14 +1,5 @@
 import { Fx } from "./Fx";
 
-// Shorten a number by replacing thousands with "k"
-export function shortenNumber(num: number): string {
-  if (num >= 1_000) {
-    return (num / 1_000).toFixed(1).replace(/\.0$/, "") + "k";
-  } else {
-    return num.toString();
-  }
-}
-
 export class TextFx implements Fx {
   private lifeTime: number = 0;
 
diff --git a/src/client/graphics/layers/FxLayer.ts b/src/client/graphics/layers/FxLayer.ts
index f936dc3ce..9e8057073 100644
--- a/src/client/graphics/layers/FxLayer.ts
+++ b/src/client/graphics/layers/FxLayer.ts
@@ -6,11 +6,12 @@ import {
   RailroadUpdate,
 } from "../../../core/game/GameUpdates";
 import { GameView, UnitView } from "../../../core/game/GameView";
+import { renderNumber } from "../../Utils";
 import { AnimatedSpriteLoader } from "../AnimatedSpriteLoader";
 import { Fx, FxType } from "../fx/Fx";
 import { nukeFxFactory, ShockwaveFx } from "../fx/NukeFx";
 import { SpriteFx } from "../fx/SpriteFx";
-import { shortenNumber, TextFx } from "../fx/TextFx";
+import { TextFx } from "../fx/TextFx";
 import { UnitExplosionFx } from "../fx/UnitExplosionFx";
 import { Layer } from "./Layer";
 export class FxLayer implements Layer {
@@ -69,25 +70,25 @@ export class FxLayer implements Layer {
     const workers = bonus.workers;
 
     if (gold > 0) {
-      const shortened = shortenNumber(gold);
-      this.addTextFx(`+ ${shortened} gold`, x, y);
+      const shortened = renderNumber(gold);
+      this.addTextFx(`+ ${shortened}`, x, y);
       y += 10; // increase y so the next popup starts bellow
     }
 
     if (troops > 0) {
-      const shortened = shortenNumber(troops);
+      const shortened = renderNumber(troops);
       this.addTextFx(`+ ${shortened} troops`, x, y);
       y += 10;
     }
 
     if (workers > 0) {
-      const shortened = shortenNumber(workers);
+      const shortened = renderNumber(workers);
       this.addTextFx(`+ ${shortened} workers`, x, y);
     }
   }
 
   addTextFx(text: string, x: number, y: number) {
-    const textFx = new TextFx(text, x, y, 500, 20);
+    const textFx = new TextFx(text, x, y, 1000, 20);
     this.allFx.push(textFx);
   }
 
diff --git a/src/core/execution/TradeShipExecution.ts b/src/core/execution/TradeShipExecution.ts
index 343063bb0..b885b68d6 100644
--- a/src/core/execution/TradeShipExecution.ts
+++ b/src/core/execution/TradeShipExecution.ts
@@ -129,7 +129,7 @@ export class TradeShipExecution implements Execution {
     const gold = this.mg.config().tradeShipGold(this.tilesTraveled);
 
     if (this.wasCaptured) {
-      this.tradeShip!.owner().addGold(gold);
+      this.tradeShip!.owner().addGold(gold, this._dstPort.tile());
       this.mg.displayMessage(
         `Received ${renderNumber(gold)} gold from ship captured from ${this.origOwner.displayName()}`,
         MessageType.CAPTURED_ENEMY_UNIT,
@@ -138,7 +138,7 @@ export class TradeShipExecution implements Execution {
       );
     } else {
       this.srcPort.owner().addGold(gold);
-      this._dstPort.owner().addGold(gold);
+      this._dstPort.owner().addGold(gold, this._dstPort.tile());
       this.mg.displayMessage(
         `Received ${renderNumber(gold)} gold from trade with ${this.srcPort.owner().displayName()}`,
         MessageType.RECEIVED_GOLD_FROM_TRADE,
diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts
index 41eeed4b0..330179000 100644
--- a/src/core/game/Game.ts
+++ b/src/core/game/Game.ts
@@ -502,7 +502,7 @@ export interface Player {
   workers(): number;
   troops(): number;
   targetTroopRatio(): number;
-  addGold(toAdd: Gold): void;
+  addGold(toAdd: Gold, tile?: TileRef): void;
   removeGold(toRemove: Gold): Gold;
   addWorkers(toAdd: number): void;
   removeWorkers(toRemove: number): void;
diff --git a/src/core/game/PlayerImpl.ts b/src/core/game/PlayerImpl.ts
index 8675f73b6..c9b86e374 100644
--- a/src/core/game/PlayerImpl.ts
+++ b/src/core/game/PlayerImpl.ts
@@ -698,8 +698,17 @@ export class PlayerImpl implements Player {
     return this._gold;
   }
 
-  addGold(toAdd: Gold): void {
+  addGold(toAdd: Gold, tile?: TileRef): void {
     this._gold += toAdd;
+    if (tile) {
+      this.mg.addUpdate({
+        type: GameUpdateType.BonusEvent,
+        tile,
+        gold: Number(toAdd),
+        workers: 0,
+        troops: 0,
+      });
+    }
   }
 
   removeGold(toRemove: Gold): Gold {
diff --git a/src/core/game/TrainStation.ts b/src/core/game/TrainStation.ts
index 248fff0df..a86f819fc 100644
--- a/src/core/game/TrainStation.ts
+++ b/src/core/game/TrainStation.ts
@@ -21,14 +21,7 @@ class CityStopHandler implements TrainStopHandler {
     trainExecution: TrainExecution,
   ): void {
     const goldBonus = mg.config().trainGold();
-    station.unit.owner().addGold(goldBonus);
-    mg.addUpdate({
-      type: GameUpdateType.BonusEvent,
-      tile: station.tile(),
-      gold: Number(goldBonus),
-      workers: 0,
-      troops: 0,
-    });
+    station.unit.owner().addGold(goldBonus, station.tile());
   }
 }
 
diff --git a/tests/core/game/TrainStation.test.ts b/tests/core/game/TrainStation.test.ts
index c5c7ae5c9..316556f1f 100644
--- a/tests/core/game/TrainStation.test.ts
+++ b/tests/core/game/TrainStation.test.ts
@@ -44,13 +44,7 @@ describe("TrainStation", () => {
 
     station.onTrainStop(trainExecution);
 
-    expect(unit.owner().addGold).toHaveBeenCalledWith(10);
-    expect(game.addUpdate).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: expect.any(Number),
-        gold: 10,
-      }),
-    );
+    expect(unit.owner().addGold).toHaveBeenCalledWith(10, unit.tile());
   });
 
   it("handles Port stop", () => {