diff --git a/core/src/main/resources/lib/form/advanced.jelly b/core/src/main/resources/lib/form/advanced.jelly
index 09afb53f8889..e64a67d482ba 100644
--- a/core/src/main/resources/lib/form/advanced.jelly
+++ b/core/src/main/resources/lib/form/advanced.jelly
@@ -40,28 +40,27 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
 
-  <j:new var="customizedFields" className="java.util.TreeSet"/>
-  <j:mute>
-    <d:invokeBody/>
-  </j:mute>
-  <j:choose>
-    <j:when test="${!customizedFields.isEmpty()}">
-      <d:invokeBody/>
-    </j:when>
-    <j:otherwise>
 	<tr><td/><td/>
 	  <td>
       <st:adjunct includes="lib.form.advanced.advanced"/>
 
 	    <div class="advancedLink" style="${attrs.align!=null?('text-align:'+attrs.align):''}">
 	      <input type="button" value="${attrs.title?:'%Advanced'}..." class="advanced-button advancedButton" /><!-- advancedButton is legacy -->
+              <j:set var="id" value="${h.generateId()}"/>
+              <span style="display: none" id="${id}">
+                <img src="${imagesURL}/16x16/document_edit.png" style="vertical-align: super" alt="${%customizedFields}" tooltip="${%customizedFields}"/>
+              </span>
 	    </div>
+            <j:new var="customizedFields" className="java.util.TreeSet"/>
 	    <table class="advancedBody"><tbody>
 	    <!-- this is the hidden portion that hosts the "advanced" part. Contents will be moved to the master table when "advanced..." is clicked -->
 	      <d:invokeBody/>
 	    </tbody></table>
+            <j:if test="${!customizedFields.isEmpty()}">
+              <script>
+                $$('${id}').style.display = null;
+              </script>
+            </j:if>
 	  </td>
 	</tr>
-    </j:otherwise>
-  </j:choose>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/form/advanced.properties b/core/src/main/resources/lib/form/advanced.properties
new file mode 100644
index 000000000000..6032066d7ad2
--- /dev/null
+++ b/core/src/main/resources/lib/form/advanced.properties
@@ -0,0 +1,23 @@
+# The MIT License
+#
+# Copyright 2013 Jesse Glick.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+customizedFields=One or more fields in this block have been edited.