diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/src/main/resources/SkinsCode/Translations.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/src/main/resources/SkinsCode/Translations.xml
index 62665c475560..d01ff86d4d9e 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/src/main/resources/SkinsCode/Translations.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/src/main/resources/SkinsCode/Translations.xml
@@ -38,6 +38,7 @@
   <hidden>true</hidden>
   <content>skin.sheet.title=Skin
 skin.sheet.properties=Skin Properties
+skin.sheet.properties.logo.warning=This logo is usually overridden by the one defined in the color theme. If you want to change the wiki logo, consider editing the current color theme instead.
 skin.sheet.deprecatedProperties=Deprecated properties
 skin.sheet.overriddenTemplates=Overridden templates
 skin.sheet.addTemplate=Add a new overriding template
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/src/main/resources/SkinsCode/XWikiSkinsSheet.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/src/main/resources/SkinsCode/XWikiSkinsSheet.xml
index b37222669c8c..d6c85968a01f 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/src/main/resources/SkinsCode/XWikiSkinsSheet.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/src/main/resources/SkinsCode/XWikiSkinsSheet.xml
@@ -81,8 +81,8 @@
   #foreach ($prop in $class.properties)
     #if ($prop.classType != 'TextArea')
     ; {{html}}&lt;label for="${className}_$escapetool.xml($doc.getObject($className).getNumber())_$escapetool.xml($prop.name)"&gt;$escapetool.xml($prop.prettyName)&lt;/label&gt;{{/html}}
-    : #if($prop.name == 'logo')## Avoid line break
-      {{attachmentSelector classname="${className}" property="${services.rendering.escape($prop.name, 'xwiki/2.1')}" filter="png,jpg,gif,svg" displayImage="true"/}}## Avoid line break
+    : #if($prop.name == 'logo'){{warning}}{{translation key="skin.sheet.properties.logo.warning" /}}{{/warning}}\\\\## Avoid line break for the definition list
+    {{attachmentSelector classname="${className}" property="${services.rendering.escape($prop.name, 'xwiki/2.1')}" filter="png,jpg,gif,svg" displayImage="true"/}}
     #else$doc.display($prop.name)#end
     
     #else