diff --git a/es-app/src/views/gamelist/BasicGameListView.cpp b/es-app/src/views/gamelist/BasicGameListView.cpp
index a5811b532..3cba7522f 100644
--- a/es-app/src/views/gamelist/BasicGameListView.cpp
+++ b/es-app/src/views/gamelist/BasicGameListView.cpp
@@ -66,9 +66,7 @@ void BasicGameListView::populateList(const std::vector<FileData*>& files)
 					continue;
 				
 				if (showFavoriteIcon)
-//					mList.add(("\uF006 ") + file->getName(), file, file->getType() == FOLDER);
-//					Quick fix for now until I've fixed the issue with Unicode rendering (Leon)
-					mList.add("** " + file->getName(), file, file->getType() == FOLDER);
+					mList.add(("\uF005  ") + file->getName(), file, file->getType() == FOLDER);					
 				else if (file->getType() == FOLDER)
 					mList.add(("\uF07C ") + file->getName(), file, true);
 				else
@@ -85,9 +83,7 @@ void BasicGameListView::populateList(const std::vector<FileData*>& files)
 
 				if (showFavoriteIcon)
 				{
-//					mList.add(("\uF006 ") + file->getName(), file, file->getType() == FOLDER);
-//					Quick fix for now until I've fixed the issue with Unicode rendering (Leon)
-					mList.add(("** ") + file->getName(), file, file->getType() == FOLDER);
+					mList.add(("\uF005  ") + file->getName(), file, file->getType() == FOLDER);
 					continue;
 				}
 			}
diff --git a/es-core/src/resources/Font.cpp b/es-core/src/resources/Font.cpp
index 440540cf2..02a0957ae 100644
--- a/es-core/src/resources/Font.cpp
+++ b/es-core/src/resources/Font.cpp
@@ -248,18 +248,18 @@ std::vector<std::string> getFallbackFontPaths()
 #else
 	// Linux
 
-	const char* paths[] = {
-		"/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
-		"/usr/share/fonts/truetype/freefont/FreeMono.ttf",
-		"/usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf" // japanese, chinese, present on Debian
-	};
-
 	std::vector<std::string> fontPaths;
-	for(unsigned int i = 0; i < sizeof(paths) / sizeof(paths[0]); i++)
-	{
-		if(ResourceManager::getInstance()->fileExists(paths[i]))
-			fontPaths.push_back(paths[i]);
-	}
+
+	// Vera sans Unicode:
+	fontPaths.push_back(ResourceManager::getInstance()->getResourcePath(":/DejaVuSans.ttf"));
+	// Freefont monospaced:
+	fontPaths.push_back(ResourceManager::getInstance()->getResourcePath(":/FreeMono.ttf"));
+	// Various languages, such as Japanese and Chinese:
+	fontPaths.push_back(ResourceManager::getInstance()->getResourcePath(":/DroidSansFallbackFull.ttf"));
+	// Korean:
+	fontPaths.push_back(ResourceManager::getInstance()->getResourcePath(":/NanumMyeongjo.ttf"));
+	// Font Awesome icon glyphs, used for star-flagging favorites in the gamelists:
+	fontPaths.push_back(ResourceManager::getInstance()->getResourcePath(":/fontawesome-webfont.ttf"));
 
 	fontPaths.shrink_to_fit();
 	return fontPaths;
diff --git a/resources/DejaVuSans.ttf b/resources/DejaVuSans.ttf
new file mode 100644
index 000000000..725d11748
Binary files /dev/null and b/resources/DejaVuSans.ttf differ
diff --git a/resources/DroidSansFallbackFull.ttf b/resources/DroidSansFallbackFull.ttf
new file mode 100644
index 000000000..89959f52f
Binary files /dev/null and b/resources/DroidSansFallbackFull.ttf differ
diff --git a/resources/FreeMono.ttf b/resources/FreeMono.ttf
new file mode 100644
index 000000000..3842c7615
Binary files /dev/null and b/resources/FreeMono.ttf differ
diff --git a/resources/NanumMyeongjo.ttf b/resources/NanumMyeongjo.ttf
new file mode 100644
index 000000000..5d753f0aa
Binary files /dev/null and b/resources/NanumMyeongjo.ttf differ
diff --git a/resources/fontawesome-webfont.ttf b/resources/fontawesome-webfont.ttf
new file mode 100644
index 000000000..35acda2fa
Binary files /dev/null and b/resources/fontawesome-webfont.ttf differ