diff --git a/database/migrations/2015_07_17_190438_changes_for_v3410.php b/database/migrations/2015_07_17_190438_changes_for_v3410.php
index 68330ac890..acb7d6bc2c 100644
--- a/database/migrations/2015_07_17_190438_changes_for_v3410.php
+++ b/database/migrations/2015_07_17_190438_changes_for_v3410.php
@@ -25,6 +25,10 @@ class ChangesForV3410 extends Migration
             $table->integer('user_id')->unsigned();
             $table->string('md5', 32);
             $table->string('filename');
+            $table->string('title')->nullable();
+            $table->text('description')->nullable();
+            $table->text('notes')->nullable();
+
             $table->string('mime');
             $table->integer('size')->unsigned();
             $table->tinyInteger('uploaded', false, true)->default(0);
diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php
index ee92227d21..35b9f7599d 100644
--- a/resources/lang/en/firefly.php
+++ b/resources/lang/en/firefly.php
@@ -18,12 +18,14 @@ return [
     'showEverything'                   => 'Show everything',
     'never'                            => 'Never',
     'search_results_for'               => 'Search results for ":query"',
+    'nr_of_attachments'                => 'One attachment|:count attachments',
+    'attachments'                      => 'Attachments',
 
     // tour:
-    'prev' => 'Prev',
-    'next' => 'Next',
-    'end-tour' => 'End tour',
-    'pause' => 'Pause',
+    'prev'                             => 'Prev',
+    'next'                             => 'Next',
+    'end-tour'                         => 'End tour',
+    'pause'                            => 'Pause',
 
     // transaction index
     'title_expenses'                   => 'Expenses',
diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php
index c8ddd776f1..163d10486f 100644
--- a/resources/lang/nl/firefly.php
+++ b/resources/lang/nl/firefly.php
@@ -18,6 +18,8 @@ return [
     'showEverything'                   => 'Laat alles zien',
     'never'                            => 'Nooit',
     'search_results_for'               => 'Zoekresultaten voor ":query"',
+    'nr_of_attachments'                => 'Eén bijlage|:count bijlagen',
+    'attachments'                      => 'Bijlagen',
 
     // tour:
     'prev'                             => 'Vorige',
diff --git a/resources/twig/list/journals.twig b/resources/twig/list/journals.twig
index e5292f7f2c..51512123c6 100644
--- a/resources/twig/list/journals.twig
+++ b/resources/twig/list/journals.twig
@@ -53,7 +53,7 @@
                 <td>
                     <a href="{{ route('transactions.show',journal.id) }}" title="{{ journal.description }}">{{ journal.description }}</a>
                     {% if journal.attachments|length > 0 %}
-                        <i class="fa fa-paperclip pull-right"></i>
+                        <i class="fa fa-paperclip pull-right" title="{{ Lang.choice('firefly.nr_of_attachments', journal.attachments|length, {count: journal.attachments|length}) }}"></i>
                     {% endif %}
 
                 </td>
diff --git a/resources/twig/transactions/show.twig b/resources/twig/transactions/show.twig
index e6d51bbe82..5953bc43bd 100644
--- a/resources/twig/transactions/show.twig
+++ b/resources/twig/transactions/show.twig
@@ -77,27 +77,30 @@
 
             <!-- attachments -->
             {% if journal.attachments|length > 0 %}
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'attachments'|_ }}</h3>
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'attachments'|_ }}</h3>
+                    </div>
+                    <div class="box-body table-responsive no-padding">
+                        <table class="table table-hover">
+                            {% for att in journal.attachments %}
+                                <tr>
+                                    <td>
+                                        <div class="btn-group btn-group-xs">
+                                            <a href="#" class="btn btn-default"><i class="fa fa-pencil"></i></a>
+                                            <a href="#" class="btn btn-danger"><i class="fa fa-trash"></i></a>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <i class="fa fa-file-pdf-o"></i>
+                                        <a href="{{ route('attachment.download', att.id) }}">{{ att.filename }}</a>
+                                        ({{ att.size|filesize }})
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                        </table>
+                    </div>
                 </div>
-                <div class="box-body table-responsive no-padding">
-                    <table class="table table-hover">
-                        {% for att in journal.attachments %}
-                            <tr>
-                                <td>
-                                    <a href="#" class="btn btn-xs btn-danger"><i class="fa fa-trash"></i></a>
-                                </td>
-                                <td>
-                                    <i class="fa fa-file-pdf-o"></i>
-                                    <a href="{{ route('attachment.download', att.id) }}">{{ att.filename }}</a>
-                                    ({{ att.size|filesize }})
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </table>
-                </div>
-            </div>
             {% endif %}
 
             <!-- events, if present -->