diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 25cecc79a..cc0397815 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -413,11 +413,15 @@ static SoProduct      *commonProduct      = nil;
 
 - (NSString *) relativePathToUserFolderSubPath: (NSString *) _sub
 {
-  NSString *dst, *rel;
+  NSString *dst, *rel, *theme;
 
   dst = [[self userFolderPath] stringByAppendingPathComponent: _sub];
   rel = [dst urlPathRelativeToPath:[self ownPath]];
 
+  theme = [[context request] formValueForKey: @"theme"];
+  if ([theme length])
+    rel = [NSString stringWithFormat: @"%@?theme=%@", rel, theme];
+
   return rel;
 }