diff --git a/client/widgets/markets/TradePanels.cpp b/client/widgets/markets/TradePanels.cpp
index 4a7637afb..eeb87b80d 100644
--- a/client/widgets/markets/TradePanels.cpp
+++ b/client/widgets/markets/TradePanels.cpp
@@ -267,16 +267,7 @@ ResourcesPanel::ResourcesPanel(const CTradeableItem::ClickPressedFunctor & click
 {
 	OBJECT_CONSTRUCTION;
 
-	// TODO: replace with LIBRARY->resourceTypeHandler->getAllObjects() -> also check order after doing this
-	resourcesForTrade =
-	{
-		GameResID::WOOD, GameResID::MERCURY, GameResID::ORE,
-		GameResID::SULFUR, GameResID::CRYSTAL, GameResID::GEMS,
-		GameResID::GOLD,
-		GameResID::GOLD, // TODO: remove
-		GameResID::GOLD, // TODO: remove
-		GameResID::GOLD // TODO: remove
-	};
+	resourcesForTrade = LIBRARY->resourceTypeHandler->getAllObjects();
 
 	int lines = vstd::divideAndCeil(resourcesForTrade.size(), 3);
 	if(lines > 3)
diff --git a/client/windows/CMarketWindow.cpp b/client/windows/CMarketWindow.cpp
index 65aa26b62..cf4b7264d 100644
--- a/client/windows/CMarketWindow.cpp
+++ b/client/windows/CMarketWindow.cpp
@@ -30,6 +30,7 @@
 #include "../../lib/GameLibrary.h"
 #include "../../lib/callback/CCallback.h"
 #include "../../lib/entities/building/CBuilding.h"
+#include "../../lib/entities/ResourceTypeHandler.h"
 #include "../../lib/mapObjects/CGHeroInstance.h"
 #include "../../lib/mapObjects/CGMarket.h"
 #include "../../lib/mapObjects/CGTownInstance.h"
@@ -202,7 +203,7 @@ std::string CMarketWindow::getMarketTitle(const ObjectInstanceID marketId, const
 
 ImagePath CMarketWindow::getImagePathBasedOnResources(std::string name)
 {
-	int res = 9; //TODO: replace with LIBRARY->resourceTypeHandler->getAllObjects();
+	int res = LIBRARY->resourceTypeHandler->getAllObjects().size();
 	if(res == 8)
 		name += "-R8";
 	else if(res > 8)