diff --git a/app/assets/stylesheets/_misc_legacy.sass b/app/assets/stylesheets/_misc_legacy.sass
index 93c8f7b71b..e9509cb7a0 100644
--- a/app/assets/stylesheets/_misc_legacy.sass
+++ b/app/assets/stylesheets/_misc_legacy.sass
@@ -294,19 +294,6 @@ textarea#custom_field_possible_values
   width: 99%
 
 
-input.attachment_choose_file
-  float: left
-  margin-right: 10px
-
-div.attachment_field
-  height: 30px
-
-#attachments
-  font-size: 1em
-
-#attachments_fields input[type=text]
-  margin-left: 8px
-
 div.attachments
   margin-top: 12px
   p
@@ -658,12 +645,6 @@ label.label-with-input
   margin-left: 0
   float: none
 
-fieldset#attachments
-  input, span.add_another_file
-    zoom: 1
-    margin-left: 10px
-    margin-right: 10px
-
 #query_form_content
   padding-top: 10px
 
diff --git a/app/assets/stylesheets/content/_forms.md b/app/assets/stylesheets/content/_forms.md
index 03b464b7c9..473cf42121 100644
--- a/app/assets/stylesheets/content/_forms.md
+++ b/app/assets/stylesheets/content/_forms.md
@@ -377,6 +377,55 @@
 </form>
 ```
 
+# Forms: Attachment fieldsets
+
+```
+<fieldset id="attachments" class="header_collapsible collapsible">
+  <legend title="Show/Hide attachments" ,="" onclick="toggleFieldset(this);">
+    <a href="javascript:">Files<span class="fieldset-toggle-state-label hidden-for-sighted">expanded</span></a>
+  </legend>
+  <div style="">
+    <div id="attachments_fields">
+      <div class="grid-block" id="attachment_template">
+        <div class="form--field">
+          <div class="attachment_field form--field-container -vertical -shrink">
+            <div class="form--file-container">
+              <input class="attachment_choose_file" name="attachments[1][file]" size="15" type="file">            </div>
+          </div>
+        </div>
+        <div class="form--field">
+          <label class="form-label">
+            Description
+          </label>
+          <div class="form--text-field-container">
+            <input name="attachments[1][description]" size="38" type="text" value="">
+          </div>
+        </div>
+      </div>
+    <div class="grid-block" id="">
+        <div class="form--field">
+          <div class="attachment_field form--field-container -vertical -shrink">
+            <div class="form--file-container">
+              <input class="attachment_choose_file" name="attachments[2][file]" size="15" type="file">            </div>
+          </div>
+        </div>
+        <div class="form--field">
+          <label class="form-label">
+            Description
+          </label>
+          <div class="form--text-field-container">
+            <input name="attachments[2][description]" size="38" type="text" value="">
+          </div>
+        </div>
+      </div></div>
+    <span class="add_another_file">
+      <a href="#" onclick="addFileField(); return false;">Add another file</a>
+      (Maximum size: 5 MB)
+    </span>
+  </div>
+</fieldset>
+```
+
 # Forms: Text fields
 
 ## Default text fields