diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 1e957171f3..47414e4c2b 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -189,7 +189,6 @@ define(['jQuery', 'loading', 'globalize', 'dom', 'libraryMenu'], function ($, lo
             require(['directorybrowser'], function (directoryBrowser) {
                 var picker = new directoryBrowser();
                 picker.show({
-                    includeFiles: true,
                     includeDirectories: true,
                     callback: function (path) {
                         if (path) {
diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js
index 36d35eac7b..a3e973840d 100644
--- a/src/plugins/htmlVideoPlayer/plugin.js
+++ b/src/plugins/htmlVideoPlayer/plugin.js
@@ -1073,7 +1073,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
                 return avaliableFonts.push(i.DeliveryUrl);
             });
             var apiClient = connectionManager.getApiClient(item);
-            var fallbackFont = apiClient.getUrl('/FallbackFont/Font', {
+            var fallbackFontList = apiClient.getUrl('/FallbackFont/FontList', {
                 api_key: apiClient.accessToken()
             });
             var options = {
@@ -1102,10 +1102,19 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
             require(['JavascriptSubtitlesOctopus'], function(SubtitlesOctopus) {
                 apiClient.getNamedConfiguration('encoding').then(function (config) {
                     if (config.EnableFallbackFont) {
-                        avaliableFonts.push(fallbackFont);
+                        apiClient.getJSON(fallbackFontList).then(function (fontFiles) {
+                            (fontFiles || []).map(function (font) {
+                                var fontUrl = apiClient.getUrl('/FallbackFont/Font', {
+                                    name: font.Name,
+                                    api_key: apiClient.accessToken()
+                                });
+                                return avaliableFonts.push(fontUrl);
+                            });
+                            currentSubtitlesOctopus = new SubtitlesOctopus(options);
+                        });
+                    } else {
+                        currentSubtitlesOctopus = new SubtitlesOctopus(options);
                     }
-
-                    currentSubtitlesOctopus = new SubtitlesOctopus(options);
                 });
             });
         }
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 8bd233c011..3e342bea1d 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1566,10 +1566,10 @@
     "ButtonPlayer": "Player",
     "StopPlayback": "Stop playback",
     "ClearQueue": "Clear queue",
-    "HeaderSelectFallbackFontPath" : "Select Fallback Font File Path",
-    "HeaderSelectFallbackFontPathHelp": "Browse or enter the path of the fallback font file to use for rendering ASS/SSA subtitles.",
-    "LabelFallbackFontPath": "Fallback font file path:",
-    "LabelFallbackFontPathHelp": "Specify a custom path of the fallback font file to use for rendering ASS/SSA subtitles. The maximum allowed size is 10 Megabytes. It is recommended to use the lightweight and web-friendly woff2 format font. Leave it blank unless the font is rendered incorrectly.",
+    "HeaderSelectFallbackFontPath" : "Select Fallback Font Folder Path",
+    "HeaderSelectFallbackFontPathHelp": "Browse or enter the path of the fallback font folder to use for rendering ASS/SSA subtitles.",
+    "LabelFallbackFontPath": "Fallback font folder path:",
+    "LabelFallbackFontPathHelp": "Specify a path containing fallback font for rendering ASS/SSA subtitles. The maximum allowed total font size is 20 Megabytes. It is recommended to use the lightweight and web-friendly woff2 format font. Leave it blank unless the font is rendered incorrectly.",
     "EnableFallbackFont" : "Enable fallback fonts",
     "EnableFallbackFontHelp" : "Enable custom alternate fonts. This can avoid the problem of incorrect subtitle rendering."
 }
diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json
index cdd9319389..24c18a0256 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -1580,9 +1580,9 @@
     "Writers": "作者",
     "ViewAlbumArtist": "查看专辑艺术家",
     "HeaderSelectFallbackFontPath" : "选择备用字体路径",
-    "HeaderSelectFallbackFontPathHelp": "浏览或输入一个备用字体文件的路径用于渲染 ASS/SSA 字幕。",
+    "HeaderSelectFallbackFontPathHelp": "浏览或输入一个包含备用字体文件的路径用于渲染 ASS/SSA 字幕。",
     "LabelFallbackFontPath": "备用字体文件路径：",
-    "LabelFallbackFontPathHelp": "指定一个备用字体文件用于渲染 ASS/SSA 字幕。允许的最大字体容量为 10 MB。推荐使用轻量且适合网络传输的 woff2 格式字体。除非字体显示不正确，否则将其留空。",
+    "LabelFallbackFontPathHelp": "指定一个包含备用字体文件的路径用于渲染 ASS/SSA 字幕。允许的最大字体总容量为 20 MB。推荐使用轻量且适合网络传输的 woff2 格式字体。除非字体显示不正确，否则将其留空。",
     "EnableFallbackFont" : "启用备用字体",
     "EnableFallbackFontHelp" : "使用自定义的备用字体。这可以避免一些字幕渲染不正确的问题。"
 }