diff --git a/src/WorkFlow.Application/Mapping/TfFileIconUriBuilderResolver.cs b/src/WorkFlow.Application/Mapping/TfFileIconUriBuilderResolver.cs
index afb5f5b..f5bcd67 100644
--- a/src/WorkFlow.Application/Mapping/TfFileIconUriBuilderResolver.cs
+++ b/src/WorkFlow.Application/Mapping/TfFileIconUriBuilderResolver.cs
@@ -14,8 +14,11 @@ public class TfFileIconUriBuilderResolver : IValueResolver<TfFile, TfFileDto, Ur
 
     public UriBuilder? Resolve(TfFile source, TfFileDto destination, UriBuilder? destMember, ResolutionContext context)
     {
+       if(string.IsNullOrEmpty(source.Icon))
+            return null;
+        
         var builder = _uriBuilderFactory();
-        builder.Path = HttpUtility.UrlEncode(source.Icon);
+        builder.AppendPath(source.Icon);
         return builder;
     }
 }
\ No newline at end of file
diff --git a/src/WorkFlow.Application/Mapping/TfFileUriBuilderResolver.cs b/src/WorkFlow.Application/Mapping/TfFileUriBuilderResolver.cs
index c6440ad..1943a90 100644
--- a/src/WorkFlow.Application/Mapping/TfFileUriBuilderResolver.cs
+++ b/src/WorkFlow.Application/Mapping/TfFileUriBuilderResolver.cs
@@ -1,6 +1,5 @@
 using AutoMapper;
 using Microsoft.Extensions.Options;
-using System.Web;
 using WorkFlow.Application.Dto;
 using WorkFlow.Domain.Entities;
 
@@ -14,8 +13,11 @@ public class TfFileUriBuilderResolver : IValueResolver<TfFile, TfFileDto, UriBui
 
     public UriBuilder? Resolve(TfFile source, TfFileDto destination, UriBuilder? destMember, ResolutionContext context)
     {
+        if (string.IsNullOrEmpty(source.Path))
+            return null;
+
         var builder = _uriBuilderFactory();
-        builder.Path = HttpUtility.UrlEncode(source.Path);
+        builder.AppendPath(source.Path);
         return builder;
     }
 }
\ No newline at end of file
diff --git a/src/WorkFlow.Application/Mapping/UriBuilderExtensions.cs b/src/WorkFlow.Application/Mapping/UriBuilderExtensions.cs
new file mode 100644
index 0000000..4c133e6
--- /dev/null
+++ b/src/WorkFlow.Application/Mapping/UriBuilderExtensions.cs
@@ -0,0 +1,14 @@
+using System.Web;
+
+namespace WorkFlow.Application.Mapping;
+
+internal static class UriBuilderExtensions
+{
+    public static void AppendPath(this UriBuilder uriBuilder, string path, bool encode = true)
+    {
+        if(encode)
+            path = HttpUtility.UrlEncode(path);
+
+        uriBuilder.Path = $"{uriBuilder.Path.TrimEnd('/', '\\')}/{path.Trim('/', '\\')}";
+    }
+}
\ No newline at end of file