diff --git a/client/render/CBitmapFont.cpp b/client/render/CBitmapFont.cpp
new file mode 100644
index 000000000..9eb024aaf
--- /dev/null
+++ b/client/render/CBitmapFont.cpp
@@ -0,0 +1,392 @@
+/*
+ * Fonts.cpp, part of VCMI engine
+ *
+ * Authors: listed in file AUTHORS in main folder
+ *
+ * License: GNU General Public License v2.0 or later
+ * Full text of license available in license.txt file, in main folder
+ *
+ */
+#include "StdInc.h"
+#include "Fonts.h"
+
+#include <SDL_ttf.h>
+
+#include "SDL_Extensions.h"
+#include "../../lib/JsonNode.h"
+#include "../../lib/vcmi_endian.h"
+#include "../../lib/filesystem/Filesystem.h"
+#include "../../lib/CGeneralTextHandler.h"
+
+size_t IFont::getStringWidth(const std::string & data) const
+{
+	size_t width = 0;
+
+	for(size_t i=0; i<data.size(); i += Unicode::getCharacterSize(data[i]))
+	{
+		width += getGlyphWidth(data.data() + i);
+	}
+	return width;
+}
+
+void IFont::renderTextLeft(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const
+{
+	renderText(surface, data, color, pos);
+}
+
+void IFont::renderTextRight(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const
+{
+	Point size((int)getStringWidth(data), (int)getLineHeight());
+	renderText(surface, data, color, pos - size);
+}
+
+void IFont::renderTextCenter(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const
+{
+	Point size((int)getStringWidth(data), (int)getLineHeight());
+	renderText(surface, data, color, pos - size / 2);
+}
+
+void IFont::renderTextLinesLeft(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const
+{
+	Point currPos = pos;
+
+	for(const std::string & line : data)
+	{
+		renderTextLeft(surface, line, color, currPos);
+		currPos.y += (int)getLineHeight();
+	}
+}
+
+void IFont::renderTextLinesRight(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const
+{
+	Point currPos = pos;
+	currPos.y -= (int)data.size() * (int)getLineHeight();
+
+	for(const std::string & line : data)
+	{
+		renderTextRight(surface, line, color, currPos);
+		currPos.y += (int)getLineHeight();
+	}
+}
+
+void IFont::renderTextLinesCenter(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const
+{
+	Point currPos = pos;
+	currPos.y -= (int)data.size() * (int)getLineHeight() / 2;
+
+	for(const std::string & line : data)
+	{
+		renderTextCenter(surface, line, color, currPos);
+		currPos.y += (int)getLineHeight();
+	}
+}
+
+std::array<CBitmapFont::BitmapChar, CBitmapFont::totalChars> CBitmapFont::loadChars() const
+{
+	std::array<BitmapChar, totalChars> ret;
+
+	size_t offset = 32;
+
+	for (auto & elem : ret)
+	{
+		elem.leftOffset =  read_le_u32(data.first.get() + offset); offset+=4;
+		elem.width =       read_le_u32(data.first.get() + offset); offset+=4;
+		elem.rightOffset = read_le_u32(data.first.get() + offset); offset+=4;
+	}
+
+	for (auto & elem : ret)
+	{
+		int pixelOffset =  read_le_u32(data.first.get() + offset); offset+=4;
+		elem.pixels = data.first.get() + 4128 + pixelOffset;
+
+		assert(pixelOffset + 4128 < data.second);
+	}
+	return ret;
+}
+
+CBitmapFont::CBitmapFont(const std::string & filename):
+	data(CResourceHandler::get()->load(ResourceID("data/" + filename, EResType::BMP_FONT))->readAll()),
+	chars(loadChars()),
+	height(data.first.get()[5])
+{}
+
+size_t CBitmapFont::getLineHeight() const
+{
+	return height;
+}
+
+size_t CBitmapFont::getGlyphWidth(const char * data) const
+{
+	std::string localChar = Unicode::fromUnicode(std::string(data, Unicode::getCharacterSize(data[0])));
+
+	if (localChar.size() == 1)
+	{
+		const BitmapChar & ch = chars[ui8(localChar[0])];
+		return ch.leftOffset + ch.width + ch.rightOffset;
+	}
+	return 0;
+}
+
+void CBitmapFont::renderCharacter(SDL_Surface * surface, const BitmapChar & character, const SDL_Color & color, int &posX, int &posY) const
+{
+	Rect clipRect;
+	CSDL_Ext::getClipRect(surface, clipRect);
+
+	posX += character.leftOffset;
+
+	CSDL_Ext::TColorPutter colorPutter = CSDL_Ext::getPutterFor(surface, 0);
+
+	uint8_t bpp = surface->format->BytesPerPixel;
+
+	// start of line, may differ from 0 due to end of surface or clipped surface
+	int lineBegin = std::max<int>(0, clipRect.y - posY);
+	int lineEnd   = std::min<int>(height, clipRect.y + clipRect.h - posY - 1);
+
+	// start end end of each row, may differ from 0
+	int rowBegin = std::max<int>(0, clipRect.x - posX);
+	int rowEnd   = std::min<int>(character.width, clipRect.x + clipRect.w - posX - 1);
+
+	//for each line in symbol
+	for(int dy = lineBegin; dy <lineEnd; dy++)
+	{
+		uint8_t *dstLine = (uint8_t*)surface->pixels;
+		uint8_t *srcLine = character.pixels;
+
+		// shift source\destination pixels to current position
+		dstLine += (posY+dy) * surface->pitch + posX * bpp;
+		srcLine += dy * character.width;
+
+		//for each column in line
+		for(int dx = rowBegin; dx < rowEnd; dx++)
+		{
+			uint8_t* dstPixel = dstLine + dx*bpp;
+			switch(srcLine[dx])
+			{
+			case 1: //black "shadow"
+				colorPutter(dstPixel, 0, 0, 0);
+				break;
+			case 255: //text colour
+				colorPutter(dstPixel, color.r, color.g, color.b);
+				break;
+			default :
+				break; //transparency
+			}
+		}
+	}
+	posX += character.width;
+	posX += character.rightOffset;
+}
+
+void CBitmapFont::renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const
+{
+	if (data.empty())
+		return;
+
+	assert(surface);
+
+	int posX = pos.x;
+	int posY = pos.y;
+
+	// Should be used to detect incorrect text parsing. Disabled right now due to some old UI code (mostly pregame and battles)
+	//assert(data[0] != '{');
+	//assert(data[data.size()-1] != '}');
+
+	SDL_LockSurface(surface);
+
+	for(size_t i=0; i<data.size(); i += Unicode::getCharacterSize(data[i]))
+	{
+		std::string localChar = Unicode::fromUnicode(data.substr(i, Unicode::getCharacterSize(data[i])));
+
+		if (localChar.size() == 1)
+			renderCharacter(surface, chars[ui8(localChar[0])], color, posX, posY);
+	}
+	SDL_UnlockSurface(surface);
+}
+
+std::pair<std::unique_ptr<ui8[]>, ui64> CTrueTypeFont::loadData(const JsonNode & config)
+{
+	std::string filename = "Data/" + config["file"].String();
+	return CResourceHandler::get()->load(ResourceID(filename, EResType::TTF_FONT))->readAll();
+}
+
+TTF_Font * CTrueTypeFont::loadFont(const JsonNode &config)
+{
+	int pointSize = static_cast<int>(config["size"].Float());
+
+	if(!TTF_WasInit() && TTF_Init()==-1)
+		throw std::runtime_error(std::string("Failed to initialize true type support: ") + TTF_GetError() + "\n");
+
+	return TTF_OpenFontRW(SDL_RWFromConstMem(data.first.get(), (int)data.second), 1, pointSize);
+}
+
+int CTrueTypeFont::getFontStyle(const JsonNode &config)
+{
+	const JsonVector & names = config["style"].Vector();
+	int ret = 0;
+	for(const JsonNode & node : names)
+	{
+		if (node.String() == "bold")
+			ret |= TTF_STYLE_BOLD;
+		else if (node.String() == "italic")
+			ret |= TTF_STYLE_ITALIC;
+	}
+	return ret;
+}
+
+CTrueTypeFont::CTrueTypeFont(const JsonNode & fontConfig):
+	data(loadData(fontConfig)),
+	font(loadFont(fontConfig), TTF_CloseFont),
+	blended(fontConfig["blend"].Bool())
+{
+	assert(font);
+
+	TTF_SetFontStyle(font.get(), getFontStyle(fontConfig));
+}
+
+size_t CTrueTypeFont::getLineHeight() const
+{
+	return TTF_FontHeight(font.get());
+}
+
+size_t CTrueTypeFont::getGlyphWidth(const char *data) const
+{
+	return getStringWidth(std::string(data, Unicode::getCharacterSize(*data)));
+	/*
+	int advance;
+	TTF_GlyphMetrics(font.get(), *data, nullptr, nullptr, nullptr, nullptr, &advance);
+	return advance;
+	*/
+}
+
+size_t CTrueTypeFont::getStringWidth(const std::string & data) const
+{
+	int width;
+	TTF_SizeUTF8(font.get(), data.c_str(), &width, nullptr);
+	return width;
+}
+
+void CTrueTypeFont::renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const
+{
+	if (color.r != 0 && color.g != 0 && color.b != 0) // not black - add shadow
+		renderText(surface, data, Colors::BLACK, pos + Point(1,1));
+
+	if (!data.empty())
+	{
+		SDL_Surface * rendered;
+		if (blended)
+			rendered = TTF_RenderUTF8_Blended(font.get(), data.c_str(), color);
+		else
+			rendered = TTF_RenderUTF8_Solid(font.get(), data.c_str(), color);
+
+		assert(rendered);
+
+		CSDL_Ext::blitSurface(rendered, surface, pos);
+		SDL_FreeSurface(rendered);
+	}
+}
+
+size_t CBitmapHanFont::getCharacterDataOffset(size_t index) const
+{
+	size_t rowSize  = (size + 7) / 8; // 1 bit per pixel, rounded up
+	size_t charSize = rowSize * size; // glyph contains "size" rows
+	return index * charSize;
+}
+
+size_t CBitmapHanFont::getCharacterIndex(ui8 first, ui8 second) const
+{
+	if (second > 0x7f )
+		second--;
+
+	return (first - 0x81) * (12*16 - 2) + (second - 0x40);
+}
+
+void CBitmapHanFont::renderCharacter(SDL_Surface * surface, int characterIndex, const SDL_Color & color, int &posX, int &posY) const
+{
+	//TODO: somewhat duplicated with CBitmapFont::renderCharacter();
+	Rect clipRect;
+	CSDL_Ext::getClipRect(surface, clipRect);
+
+	CSDL_Ext::TColorPutter colorPutter = CSDL_Ext::getPutterFor(surface, 0);
+	uint8_t bpp = surface->format->BytesPerPixel;
+
+	// start of line, may differ from 0 due to end of surface or clipped surface
+	int lineBegin = std::max<int>(0, clipRect.y - posY);
+	int lineEnd   = std::min((int)size, clipRect.y + clipRect.h - posY);
+
+	// start end end of each row, may differ from 0
+	int rowBegin = std::max<int>(0, clipRect.x - posX);
+	int rowEnd   = std::min<int>((int)size, clipRect.x + clipRect.w - posX);
+
+	//for each line in symbol
+	for(int dy = lineBegin; dy <lineEnd; dy++)
+	{
+		uint8_t *dstLine = (uint8_t*)surface->pixels;
+		uint8_t *source = data.first.get() + getCharacterDataOffset(characterIndex);
+
+		// shift source\destination pixels to current position
+		dstLine += (posY+dy) * surface->pitch + posX * bpp;
+		source += ((size + 7) / 8) * dy;
+
+		//for each column in line
+		for(int dx = rowBegin; dx < rowEnd; dx++)
+		{
+			// select current bit in bitmap
+			int bit = (source[dx / 8] << (dx % 8)) & 0x80;
+
+			uint8_t* dstPixel = dstLine + dx*bpp;
+			if (bit != 0)
+				colorPutter(dstPixel, color.r, color.g, color.b);
+		}
+	}
+	posX += (int)size + 1;
+}
+
+void CBitmapHanFont::renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const
+{
+	int posX = pos.x;
+	int posY = pos.y;
+
+	SDL_LockSurface(surface);
+
+	for(size_t i=0; i<data.size(); i += Unicode::getCharacterSize(data[i]))
+	{
+		std::string localChar = Unicode::fromUnicode(data.substr(i, Unicode::getCharacterSize(data[i])));
+
+		if (localChar.size() == 1)
+			fallback->renderCharacter(surface, fallback->chars[ui8(localChar[0])], color, posX, posY);
+
+		if (localChar.size() == 2)
+			renderCharacter(surface, (int)getCharacterIndex(localChar[0], localChar[1]), color, posX, posY);
+	}
+	SDL_UnlockSurface(surface);
+}
+
+CBitmapHanFont::CBitmapHanFont(const JsonNode &config):
+	fallback(new CBitmapFont(config["fallback"].String())),
+	data(CResourceHandler::get()->load(ResourceID("data/" + config["name"].String(), EResType::OTHER))->readAll()),
+	size((size_t)config["size"].Float())
+{
+	// basic tests to make sure that fonts are OK
+	// 1) fonts must contain 190 "sections", 126 symbols each.
+	assert(getCharacterIndex(0xfe, 0xff) == 190*126);
+	// 2) ensure that font size is correct - enough to fit all possible symbols
+	assert(getCharacterDataOffset(getCharacterIndex(0xfe, 0xff)) == data.second);
+}
+
+size_t CBitmapHanFont::getLineHeight() const
+{
+	return std::max(size + 1, fallback->getLineHeight());
+}
+
+size_t CBitmapHanFont::getGlyphWidth(const char * data) const
+{
+	std::string localChar = Unicode::fromUnicode(std::string(data, Unicode::getCharacterSize(data[0])));
+
+	if (localChar.size() == 1)
+		return fallback->getGlyphWidth(data);
+
+	if (localChar.size() == 2)
+		return size + 1;
+
+	return 0;
+}
diff --git a/client/render/CBitmapFont.h b/client/render/CBitmapFont.h
new file mode 100644
index 000000000..2811a79a3
--- /dev/null
+++ b/client/render/CBitmapFont.h
@@ -0,0 +1,136 @@
+/*
+ * Fonts.h, part of VCMI engine
+ *
+ * Authors: listed in file AUTHORS in main folder
+ *
+ * License: GNU General Public License v2.0 or later
+ * Full text of license available in license.txt file, in main folder
+ *
+ */
+#pragma once
+
+VCMI_LIB_NAMESPACE_BEGIN
+
+class JsonNode;
+class Point;
+
+VCMI_LIB_NAMESPACE_END
+
+struct SDL_Surface;
+struct SDL_Color;
+
+typedef struct _TTF_Font TTF_Font;
+
+class CBitmapFont;
+class CBitmapHanFont;
+
+class IFont
+{
+protected:
+	/// Internal function to render font, see renderTextLeft
+	virtual void renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const = 0;
+
+public:
+	virtual ~IFont()
+	{}
+
+	/// Returns height of font
+	virtual size_t getLineHeight() const = 0;
+	/// Returns width, in pixels of a character glyph. Pointer must contain at least characterSize valid bytes
+	virtual size_t getGlyphWidth(const char * data) const = 0;
+	/// Return width of the string
+	virtual size_t getStringWidth(const std::string & data) const;
+
+	/**
+	 * @param surface - destination to print text on
+	 * @param data - string to print
+	 * @param color - font color
+	 * @param pos - position of rendered font
+	 */
+	/// pos = topleft corner of the text
+	void renderTextLeft(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const;
+	/// pos = center of the text
+	void renderTextRight(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const;
+	/// pos = bottomright corner of the text
+	void renderTextCenter(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const;
+
+	/// pos = topleft corner of the text
+	void renderTextLinesLeft(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const;
+	/// pos = center of the text
+	void renderTextLinesRight(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const;
+	/// pos = bottomright corner of the text
+	void renderTextLinesCenter(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const;
+};
+
+class CBitmapFont : public IFont
+{
+	static const size_t totalChars = 256;
+
+	struct BitmapChar
+	{
+		si32 leftOffset;
+		ui32 width;
+		si32 rightOffset;
+		ui8 *pixels; // pixels of this character, part of BitmapFont::data
+	};
+
+	const std::pair<std::unique_ptr<ui8[]>, ui64> data;
+
+	const std::array<BitmapChar, totalChars> chars;
+	const ui8 height;
+
+	std::array<BitmapChar, totalChars> loadChars() const;
+
+	void renderCharacter(SDL_Surface * surface, const BitmapChar & character, const SDL_Color & color, int &posX, int &posY) const;
+
+	void renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const override;
+public:
+	CBitmapFont(const std::string & filename);
+
+	size_t getLineHeight() const override;
+	size_t getGlyphWidth(const char * data) const override;
+
+	friend class CBitmapHanFont;
+};
+
+/// supports multi-byte characters for such languages like Chinese
+class CBitmapHanFont : public IFont
+{
+	std::unique_ptr<CBitmapFont> fallback;
+	// data, directly copied from file
+	const std::pair<std::unique_ptr<ui8[]>, ui64> data;
+
+	// size of the font. Not available in file but needed for proper rendering
+	const size_t size;
+
+	size_t getCharacterDataOffset(size_t index) const;
+	size_t getCharacterIndex(ui8 first, ui8 second) const;
+
+	void renderCharacter(SDL_Surface * surface, int characterIndex, const SDL_Color & color, int &posX, int &posY) const;
+	void renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const override;
+public:
+	CBitmapHanFont(const JsonNode & config);
+
+	size_t getLineHeight() const override;
+	size_t getGlyphWidth(const char * data) const override;
+};
+
+class CTrueTypeFont : public IFont
+{
+	const std::pair<std::unique_ptr<ui8[]>, ui64> data;
+
+	const std::unique_ptr<TTF_Font, void (*)(TTF_Font*)> font;
+	const bool blended;
+
+	std::pair<std::unique_ptr<ui8[]>, ui64> loadData(const JsonNode & config);
+	TTF_Font * loadFont(const JsonNode & config);
+	int getFontStyle(const JsonNode & config);
+
+	void renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const override;
+public:
+	CTrueTypeFont(const JsonNode & fontConfig);
+
+	size_t getLineHeight() const override;
+	size_t getGlyphWidth(const char * data) const override;
+	size_t getStringWidth(const std::string & data) const override;
+};
diff --git a/client/render/CTrueTypeFont.cpp b/client/render/CTrueTypeFont.cpp
new file mode 100644
index 000000000..9eb024aaf
--- /dev/null
+++ b/client/render/CTrueTypeFont.cpp
@@ -0,0 +1,392 @@
+/*
+ * Fonts.cpp, part of VCMI engine
+ *
+ * Authors: listed in file AUTHORS in main folder
+ *
+ * License: GNU General Public License v2.0 or later
+ * Full text of license available in license.txt file, in main folder
+ *
+ */
+#include "StdInc.h"
+#include "Fonts.h"
+
+#include <SDL_ttf.h>
+
+#include "SDL_Extensions.h"
+#include "../../lib/JsonNode.h"
+#include "../../lib/vcmi_endian.h"
+#include "../../lib/filesystem/Filesystem.h"
+#include "../../lib/CGeneralTextHandler.h"
+
+size_t IFont::getStringWidth(const std::string & data) const
+{
+	size_t width = 0;
+
+	for(size_t i=0; i<data.size(); i += Unicode::getCharacterSize(data[i]))
+	{
+		width += getGlyphWidth(data.data() + i);
+	}
+	return width;
+}
+
+void IFont::renderTextLeft(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const
+{
+	renderText(surface, data, color, pos);
+}
+
+void IFont::renderTextRight(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const
+{
+	Point size((int)getStringWidth(data), (int)getLineHeight());
+	renderText(surface, data, color, pos - size);
+}
+
+void IFont::renderTextCenter(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const
+{
+	Point size((int)getStringWidth(data), (int)getLineHeight());
+	renderText(surface, data, color, pos - size / 2);
+}
+
+void IFont::renderTextLinesLeft(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const
+{
+	Point currPos = pos;
+
+	for(const std::string & line : data)
+	{
+		renderTextLeft(surface, line, color, currPos);
+		currPos.y += (int)getLineHeight();
+	}
+}
+
+void IFont::renderTextLinesRight(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const
+{
+	Point currPos = pos;
+	currPos.y -= (int)data.size() * (int)getLineHeight();
+
+	for(const std::string & line : data)
+	{
+		renderTextRight(surface, line, color, currPos);
+		currPos.y += (int)getLineHeight();
+	}
+}
+
+void IFont::renderTextLinesCenter(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const
+{
+	Point currPos = pos;
+	currPos.y -= (int)data.size() * (int)getLineHeight() / 2;
+
+	for(const std::string & line : data)
+	{
+		renderTextCenter(surface, line, color, currPos);
+		currPos.y += (int)getLineHeight();
+	}
+}
+
+std::array<CBitmapFont::BitmapChar, CBitmapFont::totalChars> CBitmapFont::loadChars() const
+{
+	std::array<BitmapChar, totalChars> ret;
+
+	size_t offset = 32;
+
+	for (auto & elem : ret)
+	{
+		elem.leftOffset =  read_le_u32(data.first.get() + offset); offset+=4;
+		elem.width =       read_le_u32(data.first.get() + offset); offset+=4;
+		elem.rightOffset = read_le_u32(data.first.get() + offset); offset+=4;
+	}
+
+	for (auto & elem : ret)
+	{
+		int pixelOffset =  read_le_u32(data.first.get() + offset); offset+=4;
+		elem.pixels = data.first.get() + 4128 + pixelOffset;
+
+		assert(pixelOffset + 4128 < data.second);
+	}
+	return ret;
+}
+
+CBitmapFont::CBitmapFont(const std::string & filename):
+	data(CResourceHandler::get()->load(ResourceID("data/" + filename, EResType::BMP_FONT))->readAll()),
+	chars(loadChars()),
+	height(data.first.get()[5])
+{}
+
+size_t CBitmapFont::getLineHeight() const
+{
+	return height;
+}
+
+size_t CBitmapFont::getGlyphWidth(const char * data) const
+{
+	std::string localChar = Unicode::fromUnicode(std::string(data, Unicode::getCharacterSize(data[0])));
+
+	if (localChar.size() == 1)
+	{
+		const BitmapChar & ch = chars[ui8(localChar[0])];
+		return ch.leftOffset + ch.width + ch.rightOffset;
+	}
+	return 0;
+}
+
+void CBitmapFont::renderCharacter(SDL_Surface * surface, const BitmapChar & character, const SDL_Color & color, int &posX, int &posY) const
+{
+	Rect clipRect;
+	CSDL_Ext::getClipRect(surface, clipRect);
+
+	posX += character.leftOffset;
+
+	CSDL_Ext::TColorPutter colorPutter = CSDL_Ext::getPutterFor(surface, 0);
+
+	uint8_t bpp = surface->format->BytesPerPixel;
+
+	// start of line, may differ from 0 due to end of surface or clipped surface
+	int lineBegin = std::max<int>(0, clipRect.y - posY);
+	int lineEnd   = std::min<int>(height, clipRect.y + clipRect.h - posY - 1);
+
+	// start end end of each row, may differ from 0
+	int rowBegin = std::max<int>(0, clipRect.x - posX);
+	int rowEnd   = std::min<int>(character.width, clipRect.x + clipRect.w - posX - 1);
+
+	//for each line in symbol
+	for(int dy = lineBegin; dy <lineEnd; dy++)
+	{
+		uint8_t *dstLine = (uint8_t*)surface->pixels;
+		uint8_t *srcLine = character.pixels;
+
+		// shift source\destination pixels to current position
+		dstLine += (posY+dy) * surface->pitch + posX * bpp;
+		srcLine += dy * character.width;
+
+		//for each column in line
+		for(int dx = rowBegin; dx < rowEnd; dx++)
+		{
+			uint8_t* dstPixel = dstLine + dx*bpp;
+			switch(srcLine[dx])
+			{
+			case 1: //black "shadow"
+				colorPutter(dstPixel, 0, 0, 0);
+				break;
+			case 255: //text colour
+				colorPutter(dstPixel, color.r, color.g, color.b);
+				break;
+			default :
+				break; //transparency
+			}
+		}
+	}
+	posX += character.width;
+	posX += character.rightOffset;
+}
+
+void CBitmapFont::renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const
+{
+	if (data.empty())
+		return;
+
+	assert(surface);
+
+	int posX = pos.x;
+	int posY = pos.y;
+
+	// Should be used to detect incorrect text parsing. Disabled right now due to some old UI code (mostly pregame and battles)
+	//assert(data[0] != '{');
+	//assert(data[data.size()-1] != '}');
+
+	SDL_LockSurface(surface);
+
+	for(size_t i=0; i<data.size(); i += Unicode::getCharacterSize(data[i]))
+	{
+		std::string localChar = Unicode::fromUnicode(data.substr(i, Unicode::getCharacterSize(data[i])));
+
+		if (localChar.size() == 1)
+			renderCharacter(surface, chars[ui8(localChar[0])], color, posX, posY);
+	}
+	SDL_UnlockSurface(surface);
+}
+
+std::pair<std::unique_ptr<ui8[]>, ui64> CTrueTypeFont::loadData(const JsonNode & config)
+{
+	std::string filename = "Data/" + config["file"].String();
+	return CResourceHandler::get()->load(ResourceID(filename, EResType::TTF_FONT))->readAll();
+}
+
+TTF_Font * CTrueTypeFont::loadFont(const JsonNode &config)
+{
+	int pointSize = static_cast<int>(config["size"].Float());
+
+	if(!TTF_WasInit() && TTF_Init()==-1)
+		throw std::runtime_error(std::string("Failed to initialize true type support: ") + TTF_GetError() + "\n");
+
+	return TTF_OpenFontRW(SDL_RWFromConstMem(data.first.get(), (int)data.second), 1, pointSize);
+}
+
+int CTrueTypeFont::getFontStyle(const JsonNode &config)
+{
+	const JsonVector & names = config["style"].Vector();
+	int ret = 0;
+	for(const JsonNode & node : names)
+	{
+		if (node.String() == "bold")
+			ret |= TTF_STYLE_BOLD;
+		else if (node.String() == "italic")
+			ret |= TTF_STYLE_ITALIC;
+	}
+	return ret;
+}
+
+CTrueTypeFont::CTrueTypeFont(const JsonNode & fontConfig):
+	data(loadData(fontConfig)),
+	font(loadFont(fontConfig), TTF_CloseFont),
+	blended(fontConfig["blend"].Bool())
+{
+	assert(font);
+
+	TTF_SetFontStyle(font.get(), getFontStyle(fontConfig));
+}
+
+size_t CTrueTypeFont::getLineHeight() const
+{
+	return TTF_FontHeight(font.get());
+}
+
+size_t CTrueTypeFont::getGlyphWidth(const char *data) const
+{
+	return getStringWidth(std::string(data, Unicode::getCharacterSize(*data)));
+	/*
+	int advance;
+	TTF_GlyphMetrics(font.get(), *data, nullptr, nullptr, nullptr, nullptr, &advance);
+	return advance;
+	*/
+}
+
+size_t CTrueTypeFont::getStringWidth(const std::string & data) const
+{
+	int width;
+	TTF_SizeUTF8(font.get(), data.c_str(), &width, nullptr);
+	return width;
+}
+
+void CTrueTypeFont::renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const
+{
+	if (color.r != 0 && color.g != 0 && color.b != 0) // not black - add shadow
+		renderText(surface, data, Colors::BLACK, pos + Point(1,1));
+
+	if (!data.empty())
+	{
+		SDL_Surface * rendered;
+		if (blended)
+			rendered = TTF_RenderUTF8_Blended(font.get(), data.c_str(), color);
+		else
+			rendered = TTF_RenderUTF8_Solid(font.get(), data.c_str(), color);
+
+		assert(rendered);
+
+		CSDL_Ext::blitSurface(rendered, surface, pos);
+		SDL_FreeSurface(rendered);
+	}
+}
+
+size_t CBitmapHanFont::getCharacterDataOffset(size_t index) const
+{
+	size_t rowSize  = (size + 7) / 8; // 1 bit per pixel, rounded up
+	size_t charSize = rowSize * size; // glyph contains "size" rows
+	return index * charSize;
+}
+
+size_t CBitmapHanFont::getCharacterIndex(ui8 first, ui8 second) const
+{
+	if (second > 0x7f )
+		second--;
+
+	return (first - 0x81) * (12*16 - 2) + (second - 0x40);
+}
+
+void CBitmapHanFont::renderCharacter(SDL_Surface * surface, int characterIndex, const SDL_Color & color, int &posX, int &posY) const
+{
+	//TODO: somewhat duplicated with CBitmapFont::renderCharacter();
+	Rect clipRect;
+	CSDL_Ext::getClipRect(surface, clipRect);
+
+	CSDL_Ext::TColorPutter colorPutter = CSDL_Ext::getPutterFor(surface, 0);
+	uint8_t bpp = surface->format->BytesPerPixel;
+
+	// start of line, may differ from 0 due to end of surface or clipped surface
+	int lineBegin = std::max<int>(0, clipRect.y - posY);
+	int lineEnd   = std::min((int)size, clipRect.y + clipRect.h - posY);
+
+	// start end end of each row, may differ from 0
+	int rowBegin = std::max<int>(0, clipRect.x - posX);
+	int rowEnd   = std::min<int>((int)size, clipRect.x + clipRect.w - posX);
+
+	//for each line in symbol
+	for(int dy = lineBegin; dy <lineEnd; dy++)
+	{
+		uint8_t *dstLine = (uint8_t*)surface->pixels;
+		uint8_t *source = data.first.get() + getCharacterDataOffset(characterIndex);
+
+		// shift source\destination pixels to current position
+		dstLine += (posY+dy) * surface->pitch + posX * bpp;
+		source += ((size + 7) / 8) * dy;
+
+		//for each column in line
+		for(int dx = rowBegin; dx < rowEnd; dx++)
+		{
+			// select current bit in bitmap
+			int bit = (source[dx / 8] << (dx % 8)) & 0x80;
+
+			uint8_t* dstPixel = dstLine + dx*bpp;
+			if (bit != 0)
+				colorPutter(dstPixel, color.r, color.g, color.b);
+		}
+	}
+	posX += (int)size + 1;
+}
+
+void CBitmapHanFont::renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const
+{
+	int posX = pos.x;
+	int posY = pos.y;
+
+	SDL_LockSurface(surface);
+
+	for(size_t i=0; i<data.size(); i += Unicode::getCharacterSize(data[i]))
+	{
+		std::string localChar = Unicode::fromUnicode(data.substr(i, Unicode::getCharacterSize(data[i])));
+
+		if (localChar.size() == 1)
+			fallback->renderCharacter(surface, fallback->chars[ui8(localChar[0])], color, posX, posY);
+
+		if (localChar.size() == 2)
+			renderCharacter(surface, (int)getCharacterIndex(localChar[0], localChar[1]), color, posX, posY);
+	}
+	SDL_UnlockSurface(surface);
+}
+
+CBitmapHanFont::CBitmapHanFont(const JsonNode &config):
+	fallback(new CBitmapFont(config["fallback"].String())),
+	data(CResourceHandler::get()->load(ResourceID("data/" + config["name"].String(), EResType::OTHER))->readAll()),
+	size((size_t)config["size"].Float())
+{
+	// basic tests to make sure that fonts are OK
+	// 1) fonts must contain 190 "sections", 126 symbols each.
+	assert(getCharacterIndex(0xfe, 0xff) == 190*126);
+	// 2) ensure that font size is correct - enough to fit all possible symbols
+	assert(getCharacterDataOffset(getCharacterIndex(0xfe, 0xff)) == data.second);
+}
+
+size_t CBitmapHanFont::getLineHeight() const
+{
+	return std::max(size + 1, fallback->getLineHeight());
+}
+
+size_t CBitmapHanFont::getGlyphWidth(const char * data) const
+{
+	std::string localChar = Unicode::fromUnicode(std::string(data, Unicode::getCharacterSize(data[0])));
+
+	if (localChar.size() == 1)
+		return fallback->getGlyphWidth(data);
+
+	if (localChar.size() == 2)
+		return size + 1;
+
+	return 0;
+}
diff --git a/client/render/CTrueTypeFont.h b/client/render/CTrueTypeFont.h
new file mode 100644
index 000000000..2811a79a3
--- /dev/null
+++ b/client/render/CTrueTypeFont.h
@@ -0,0 +1,136 @@
+/*
+ * Fonts.h, part of VCMI engine
+ *
+ * Authors: listed in file AUTHORS in main folder
+ *
+ * License: GNU General Public License v2.0 or later
+ * Full text of license available in license.txt file, in main folder
+ *
+ */
+#pragma once
+
+VCMI_LIB_NAMESPACE_BEGIN
+
+class JsonNode;
+class Point;
+
+VCMI_LIB_NAMESPACE_END
+
+struct SDL_Surface;
+struct SDL_Color;
+
+typedef struct _TTF_Font TTF_Font;
+
+class CBitmapFont;
+class CBitmapHanFont;
+
+class IFont
+{
+protected:
+	/// Internal function to render font, see renderTextLeft
+	virtual void renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const = 0;
+
+public:
+	virtual ~IFont()
+	{}
+
+	/// Returns height of font
+	virtual size_t getLineHeight() const = 0;
+	/// Returns width, in pixels of a character glyph. Pointer must contain at least characterSize valid bytes
+	virtual size_t getGlyphWidth(const char * data) const = 0;
+	/// Return width of the string
+	virtual size_t getStringWidth(const std::string & data) const;
+
+	/**
+	 * @param surface - destination to print text on
+	 * @param data - string to print
+	 * @param color - font color
+	 * @param pos - position of rendered font
+	 */
+	/// pos = topleft corner of the text
+	void renderTextLeft(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const;
+	/// pos = center of the text
+	void renderTextRight(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const;
+	/// pos = bottomright corner of the text
+	void renderTextCenter(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const;
+
+	/// pos = topleft corner of the text
+	void renderTextLinesLeft(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const;
+	/// pos = center of the text
+	void renderTextLinesRight(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const;
+	/// pos = bottomright corner of the text
+	void renderTextLinesCenter(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const;
+};
+
+class CBitmapFont : public IFont
+{
+	static const size_t totalChars = 256;
+
+	struct BitmapChar
+	{
+		si32 leftOffset;
+		ui32 width;
+		si32 rightOffset;
+		ui8 *pixels; // pixels of this character, part of BitmapFont::data
+	};
+
+	const std::pair<std::unique_ptr<ui8[]>, ui64> data;
+
+	const std::array<BitmapChar, totalChars> chars;
+	const ui8 height;
+
+	std::array<BitmapChar, totalChars> loadChars() const;
+
+	void renderCharacter(SDL_Surface * surface, const BitmapChar & character, const SDL_Color & color, int &posX, int &posY) const;
+
+	void renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const override;
+public:
+	CBitmapFont(const std::string & filename);
+
+	size_t getLineHeight() const override;
+	size_t getGlyphWidth(const char * data) const override;
+
+	friend class CBitmapHanFont;
+};
+
+/// supports multi-byte characters for such languages like Chinese
+class CBitmapHanFont : public IFont
+{
+	std::unique_ptr<CBitmapFont> fallback;
+	// data, directly copied from file
+	const std::pair<std::unique_ptr<ui8[]>, ui64> data;
+
+	// size of the font. Not available in file but needed for proper rendering
+	const size_t size;
+
+	size_t getCharacterDataOffset(size_t index) const;
+	size_t getCharacterIndex(ui8 first, ui8 second) const;
+
+	void renderCharacter(SDL_Surface * surface, int characterIndex, const SDL_Color & color, int &posX, int &posY) const;
+	void renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const override;
+public:
+	CBitmapHanFont(const JsonNode & config);
+
+	size_t getLineHeight() const override;
+	size_t getGlyphWidth(const char * data) const override;
+};
+
+class CTrueTypeFont : public IFont
+{
+	const std::pair<std::unique_ptr<ui8[]>, ui64> data;
+
+	const std::unique_ptr<TTF_Font, void (*)(TTF_Font*)> font;
+	const bool blended;
+
+	std::pair<std::unique_ptr<ui8[]>, ui64> loadData(const JsonNode & config);
+	TTF_Font * loadFont(const JsonNode & config);
+	int getFontStyle(const JsonNode & config);
+
+	void renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const override;
+public:
+	CTrueTypeFont(const JsonNode & fontConfig);
+
+	size_t getLineHeight() const override;
+	size_t getGlyphWidth(const char * data) const override;
+	size_t getStringWidth(const std::string & data) const override;
+};
diff --git a/client/render/IFont.h b/client/render/IFont.h
new file mode 100644
index 000000000..2811a79a3
--- /dev/null
+++ b/client/render/IFont.h
@@ -0,0 +1,136 @@
+/*
+ * Fonts.h, part of VCMI engine
+ *
+ * Authors: listed in file AUTHORS in main folder
+ *
+ * License: GNU General Public License v2.0 or later
+ * Full text of license available in license.txt file, in main folder
+ *
+ */
+#pragma once
+
+VCMI_LIB_NAMESPACE_BEGIN
+
+class JsonNode;
+class Point;
+
+VCMI_LIB_NAMESPACE_END
+
+struct SDL_Surface;
+struct SDL_Color;
+
+typedef struct _TTF_Font TTF_Font;
+
+class CBitmapFont;
+class CBitmapHanFont;
+
+class IFont
+{
+protected:
+	/// Internal function to render font, see renderTextLeft
+	virtual void renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const = 0;
+
+public:
+	virtual ~IFont()
+	{}
+
+	/// Returns height of font
+	virtual size_t getLineHeight() const = 0;
+	/// Returns width, in pixels of a character glyph. Pointer must contain at least characterSize valid bytes
+	virtual size_t getGlyphWidth(const char * data) const = 0;
+	/// Return width of the string
+	virtual size_t getStringWidth(const std::string & data) const;
+
+	/**
+	 * @param surface - destination to print text on
+	 * @param data - string to print
+	 * @param color - font color
+	 * @param pos - position of rendered font
+	 */
+	/// pos = topleft corner of the text
+	void renderTextLeft(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const;
+	/// pos = center of the text
+	void renderTextRight(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const;
+	/// pos = bottomright corner of the text
+	void renderTextCenter(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const;
+
+	/// pos = topleft corner of the text
+	void renderTextLinesLeft(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const;
+	/// pos = center of the text
+	void renderTextLinesRight(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const;
+	/// pos = bottomright corner of the text
+	void renderTextLinesCenter(SDL_Surface * surface, const std::vector<std::string> & data, const SDL_Color & color, const Point & pos) const;
+};
+
+class CBitmapFont : public IFont
+{
+	static const size_t totalChars = 256;
+
+	struct BitmapChar
+	{
+		si32 leftOffset;
+		ui32 width;
+		si32 rightOffset;
+		ui8 *pixels; // pixels of this character, part of BitmapFont::data
+	};
+
+	const std::pair<std::unique_ptr<ui8[]>, ui64> data;
+
+	const std::array<BitmapChar, totalChars> chars;
+	const ui8 height;
+
+	std::array<BitmapChar, totalChars> loadChars() const;
+
+	void renderCharacter(SDL_Surface * surface, const BitmapChar & character, const SDL_Color & color, int &posX, int &posY) const;
+
+	void renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const override;
+public:
+	CBitmapFont(const std::string & filename);
+
+	size_t getLineHeight() const override;
+	size_t getGlyphWidth(const char * data) const override;
+
+	friend class CBitmapHanFont;
+};
+
+/// supports multi-byte characters for such languages like Chinese
+class CBitmapHanFont : public IFont
+{
+	std::unique_ptr<CBitmapFont> fallback;
+	// data, directly copied from file
+	const std::pair<std::unique_ptr<ui8[]>, ui64> data;
+
+	// size of the font. Not available in file but needed for proper rendering
+	const size_t size;
+
+	size_t getCharacterDataOffset(size_t index) const;
+	size_t getCharacterIndex(ui8 first, ui8 second) const;
+
+	void renderCharacter(SDL_Surface * surface, int characterIndex, const SDL_Color & color, int &posX, int &posY) const;
+	void renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const override;
+public:
+	CBitmapHanFont(const JsonNode & config);
+
+	size_t getLineHeight() const override;
+	size_t getGlyphWidth(const char * data) const override;
+};
+
+class CTrueTypeFont : public IFont
+{
+	const std::pair<std::unique_ptr<ui8[]>, ui64> data;
+
+	const std::unique_ptr<TTF_Font, void (*)(TTF_Font*)> font;
+	const bool blended;
+
+	std::pair<std::unique_ptr<ui8[]>, ui64> loadData(const JsonNode & config);
+	TTF_Font * loadFont(const JsonNode & config);
+	int getFontStyle(const JsonNode & config);
+
+	void renderText(SDL_Surface * surface, const std::string & data, const SDL_Color & color, const Point & pos) const override;
+public:
+	CTrueTypeFont(const JsonNode & fontConfig);
+
+	size_t getLineHeight() const override;
+	size_t getGlyphWidth(const char * data) const override;
+	size_t getStringWidth(const std::string & data) const override;
+};