diff --git a/fonts/DAOpenSansSemiboldAsBold.ttf b/fonts/DAOpenSansSemiboldAsBold.ttf
new file mode 100644
index 0000000..ef2eadd
Binary files /dev/null and b/fonts/DAOpenSansSemiboldAsBold.ttf differ
diff --git a/fonts/DAOpenSansSemiboldItalicAsBold.ttf b/fonts/DAOpenSansSemiboldItalicAsBold.ttf
new file mode 100644
index 0000000..1507d53
Binary files /dev/null and b/fonts/DAOpenSansSemiboldItalicAsBold.ttf differ
diff --git a/fonts/DAVazirMediumAsBold.ttf b/fonts/DAVazirMediumAsBold.ttf
new file mode 100644
index 0000000..5e476f9
Binary files /dev/null and b/fonts/DAVazirMediumAsBold.ttf differ
diff --git a/fonts/fonts.qrc b/fonts/fonts.qrc
index 1b94b69..64c7085 100644
--- a/fonts/fonts.qrc
+++ b/fonts/fonts.qrc
@@ -2,12 +2,12 @@
   <qresource prefix="/gui/fonts">
     <file>DAOpenSansRegular.ttf</file>
     <file>DAOpenSansRegularItalic.ttf</file>
-    <file>DAOpenSansBold.ttf</file>
-    <file>DAOpenSansBoldItalic.ttf</file>
+    <file>DAOpenSansSemiboldAsBold.ttf</file>
+    <file>DAOpenSansSemiboldItalicAsBold.ttf</file>
     <file>DAOpenSansSemibold.ttf</file>
     <file>DAOpenSansSemiboldItalic.ttf</file>
     <file>DAVazirRegular.ttf</file>
-    <file>DAVazirBold.ttf</file>
+    <file>DAVazirMediumAsBold.ttf</file>
     <file>DAVazirMedium.ttf</file>
   </qresource>
   <qresource prefix="/fc">
diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp
index b77049c..21d1080 100644
--- a/ui/style/style_core_font.cpp
+++ b/ui/style/style_core_font.cpp
@@ -137,19 +137,27 @@ enum {
 	FontTypesCount,
 };
 #ifndef DESKTOP_APP_USE_PACKAGED_FONTS
+QString FontTypeFiles[FontTypesCount] = {
+	"DAOpenSansRegular",
+	"DAOpenSansRegularItalic",
+	"DAOpenSansSemiboldAsBold",
+	"DAOpenSansSemiboldItalicAsBold",
+	"DAOpenSansSemiboldAsBold",
+	"DAOpenSansSemiboldItalicAsBold",
+};
 QString FontTypeNames[FontTypesCount] = {
 	"DAOpenSansRegular",
 	"DAOpenSansRegularItalic",
-	"DAOpenSansBold",
-	"DAOpenSansBoldItalic",
+	"DAOpenSansSemibold",
+	"DAOpenSansSemiboldItalic",
 	"DAOpenSansSemibold",
 	"DAOpenSansSemiboldItalic",
 };
 QString FontTypePersianFallback[FontTypesCount] = {
 	"DAVazirRegular",
 	"DAVazirRegular",
-	"DAVazirBold",
-	"DAVazirBold",
+	"DAVazirMedium",
+	"DAVazirMedium",
 	"DAVazirMedium",
 	"DAVazirMedium",
 };
@@ -193,14 +201,15 @@ void StartFonts() {
 
 #ifndef DESKTOP_APP_USE_PACKAGED_FONTS
 	LoadCustomFont(":/gui/fonts/DAVazirRegular.ttf", "DAVazirRegular");
-	LoadCustomFont(":/gui/fonts/DAVazirBold.ttf", "DAVazirBold", style::internal::FontBold);
-	LoadCustomFont(":/gui/fonts/DAVazirMedium.ttf", "DAVazirMedium", style::internal::FontSemibold);
+	LoadCustomFont(":/gui/fonts/DAVazirMediumAsBold.ttf", "DAVazirMedium", style::internal::FontBold);
+	LoadCustomFont(":/gui/fonts/DAVazirMediumAsBold.ttf", "DAVazirMedium", style::internal::FontSemibold);
 
 	bool areGood[FontTypesCount] = { false };
 	for (auto i = 0; i != FontTypesCount; ++i) {
+		const auto file = FontTypeFiles[i];
 		const auto name = FontTypeNames[i];
 		const auto flags = FontTypeFlags[i];
-		areGood[i] = LoadCustomFont(":/gui/fonts/" + name + ".ttf", name, flags);
+		areGood[i] = LoadCustomFont(":/gui/fonts/" + file + ".ttf", name, flags);
 		Overrides[i] = name;
 
 #ifdef Q_OS_WIN
@@ -309,12 +318,12 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
 	}
 
 	f.setPixelSize(size);
-	f.setBold(_flags & FontBold);
+	f.setBold((_flags & FontBold) || (_flags & FontSemibold));
 	f.setItalic(_flags & FontItalic);
 	f.setUnderline(_flags & FontUnderline);
 	f.setStrikeOut(_flags & FontStrikeOut);
 
-	if (_flags & FontSemibold) {
+	if ((_flags & FontBold) || (_flags & FontSemibold)) {
 		f.setStyleName("Semibold");
 	}