diff --git a/web/documentserver-example/csharp/App_Themes/images/file_docxf.svg b/web/documentserver-example/csharp/App_Themes/images/file_docxf.svg
new file mode 100644
index 00000000..984761e6
--- /dev/null
+++ b/web/documentserver-example/csharp/App_Themes/images/file_docxf.svg
@@ -0,0 +1,6 @@
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>
diff --git a/web/documentserver-example/csharp/App_Themes/stylesheet.css b/web/documentserver-example/csharp/App_Themes/stylesheet.css
index 518c8a36..35d63865 100644
--- a/web/documentserver-example/csharp/App_Themes/stylesheet.css
+++ b/web/documentserver-example/csharp/App_Themes/stylesheet.css
@@ -157,6 +157,10 @@ label .checkbox {
     background-image: url("images/file_pptx.svg");
 }
 
+.try-editor.form {
+    background-image: url("images/file_docxf.svg");
+}
+
 .create-sample {
     color: #666666;
     line-height: 24px;
diff --git a/web/documentserver-example/csharp/Default.aspx b/web/documentserver-example/csharp/Default.aspx
index 7962dec8..2a6368d9 100644
--- a/web/documentserver-example/csharp/Default.aspx
+++ b/web/documentserver-example/csharp/Default.aspx
@@ -67,6 +67,9 @@
                                             <li>
                                                 <a class="try-editor slide" data-type="slide">Presentation</a>
                                             </li>
+                                            <li>
+                                                <a class="try-editor form" data-type="docxf">Master form</a>
+                                            </li>
                                         </ul>
                                         <label class="create-sample">
                                             <input id="createSample" class="checkbox" type="checkbox" />With sample content
diff --git a/web/documentserver-example/csharp/Default.aspx.cs b/web/documentserver-example/csharp/Default.aspx.cs
index 08662b69..85e5812c 100644
--- a/web/documentserver-example/csharp/Default.aspx.cs
+++ b/web/documentserver-example/csharp/Default.aspx.cs
@@ -375,7 +375,7 @@ namespace OnlineEditorsExample
             var fileName = GetCorrectName(title);
             var extension = "." + (Path.GetExtension(fileName).ToLower() ?? "").Trim('.');
 
-            var allExt = ConvertExts.Concat(EditedExts).Concat(ViewedExts).ToArray();
+            var allExt = ConvertExts.Concat(EditedExts).Concat(ViewedExts).Concat(FillFormsExts).ToArray();
 
             if (!allExt.Contains(extension))
             {
diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs
index 596a7d10..6e3f98a2 100644
--- a/web/documentserver-example/csharp/DocEditor.aspx.cs
+++ b/web/documentserver-example/csharp/DocEditor.aspx.cs
@@ -148,7 +148,6 @@ namespace OnlineEditorsExample
             var editorsMode = Request.GetOrDefault("editorsMode", "edit");
 
             var canEdit = _Default.EditedExts.Contains(ext);  // check if this file can be edited
-            var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // get the editor opening mode (edit or view)
             var editorsType = Request.GetOrDefault("editorsType", "desktop");
 
             var id = Request.Cookies.GetOrDefault("uid", null);
@@ -159,6 +158,7 @@ namespace OnlineEditorsExample
                 canEdit = true;
             }            
             var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false;  // check if the Submit form button is displayed or hidden
+            var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // get the editor opening mode (edit or view)
 
             var jss = new JavaScriptSerializer();
 
@@ -522,6 +522,9 @@ namespace OnlineEditorsExample
                 case "slide":
                     ext = ".pptx";  // .pptx for slide document type
                     break;
+                case "docxf":
+                    ext = ".docxf";
+                    break;
                 default:
                     return;
             }
diff --git a/web/documentserver-example/csharp/OnlineEditorsExample.csproj b/web/documentserver-example/csharp/OnlineEditorsExample.csproj
index 0b9d55af..da373506 100644
--- a/web/documentserver-example/csharp/OnlineEditorsExample.csproj
+++ b/web/documentserver-example/csharp/OnlineEditorsExample.csproj
@@ -80,6 +80,7 @@
     <Content Include="App_Themes\images\embeded.svg" />
     <Content Include="App_Themes\images\error.svg" />
     <Content Include="App_Themes\images\file_docx.svg" />
+    <Content Include="App_Themes\images\file_docxf.svg" />
     <Content Include="App_Themes\images\file_pptx.svg" />
     <Content Include="App_Themes\images\file_upload.svg" />
     <Content Include="App_Themes\images\file_xlsx.svg" />
diff --git a/web/documentserver-example/csharp/assets b/web/documentserver-example/csharp/assets
index f9fc118e..346236dd 160000
--- a/web/documentserver-example/csharp/assets
+++ b/web/documentserver-example/csharp/assets
@@ -1 +1 @@
-Subproject commit f9fc118e433ac604f1bc62fc4aa71fa334e97756
+Subproject commit 346236dd127c29febc9119aeb6d55aad5ad190b4
diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config
index e25595ff..f98711f6 100644
--- a/web/documentserver-example/csharp/settings.config
+++ b/web/documentserver-example/csharp/settings.config
@@ -8,7 +8,7 @@
 
   <add key="files.docservice.fillform-docs" value=".oform|.docx"/>
   <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps|.oxps"/>
-  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt"/>
+  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt|.docxf"/>
   <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"/>
   <add key="files.docservice.timeout" value="120000" />
   <add key="files.docservice.secret" value="" />