diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index 7249618ff8..a176f0fcd6 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -88,14 +88,14 @@
                     {% include 'list.journals' with {sorting:true, hideBills:true, hideBudgets: true, hideCategories: true} %}
                     {% if periods.count > 0 %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('accounts.show', [account.id, 'all']) }}">
                                 {{ 'show_all_no_filter'|_ }}
                             </a>
                         </p>
                     {% else %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('accounts.show', [account.id]) }}">
                                 {{ 'show_the_current_period_and_overview'|_ }}
                             </a>
diff --git a/resources/views/auth/login.twig b/resources/views/auth/login.twig
index 88353375a6..8e925d16ba 100644
--- a/resources/views/auth/login.twig
+++ b/resources/views/auth/login.twig
@@ -17,7 +17,7 @@
         <div class="row">
             <div class="col-lg-12">
                 <div class="alert alert-danger alert-dismissible" role="alert">
-                    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+                    <button type="button" class="close" data-dismiss="alert"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
                     </button>
                     <strong>Error!</strong> {{ errors.get('email')[0] }}
                 </div>
@@ -29,7 +29,7 @@
         <div class="row">
             <div class="col-lg-12">
                 <div class="alert alert-info alert-dismissible" role="alert">
-                    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+                    <button type="button" class="close" data-dismiss="alert"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
                     </button>
                     {{ session('logoutMessage') }}
                 </div>
diff --git a/resources/views/auth/two-factor.twig b/resources/views/auth/two-factor.twig
index ea4275aae2..a02c30bf56 100644
--- a/resources/views/auth/two-factor.twig
+++ b/resources/views/auth/two-factor.twig
@@ -6,7 +6,7 @@
         <div class="row">
             <div class="col-lg-12">
                 <div class="alert alert-danger alert-dismissible" role="alert">
-                    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+                    <button type="button" class="close" data-dismiss="alert"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
                     </button>
                     <strong>{{ 'flash_error'|_ }}</strong> {{ errors.get('code')[0] }}
                 </div>
diff --git a/resources/views/budgets/income.twig b/resources/views/budgets/income.twig
index 28904dc66d..89e28bd710 100644
--- a/resources/views/budgets/income.twig
+++ b/resources/views/budgets/income.twig
@@ -1,9 +1,9 @@
 <div class="modal-dialog">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+            <button type="button" class="close" data-dismiss="modal"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
             </button>
-            <h4 class="modal-title" id="myModalLabel">
+            <h4 class="modal-title">
                 {{ trans('firefly.update_budget_amount_range',
                 {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}
             </h4>
diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig
index e400c32a98..8e10cda80d 100644
--- a/resources/views/budgets/no-budget.twig
+++ b/resources/views/budgets/no-budget.twig
@@ -25,12 +25,12 @@
                     {% include 'list.journals' with {'journals': journals,'hideBudgets': true} %}
                     {% if periods.count > 0 %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('budgets.no-budget', ['all']) }}">{{ 'show_all_no_filter'|_ }}</a>
                         </p>
                     {% else %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('budgets.no-budget') }}">{{ 'show_the_current_period_and_overview'|_ }}</a>
                         </p>
                     {% endif %}
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index 39dfd3b936..5e8e953794 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -91,7 +91,7 @@
                     {% include 'list.journals' with {hideBudgets:true, hideBills:true} %}
                     {% if budgetLimit %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('budgets.show', [budget.id]) }}">
                                 {{ 'show_all_no_filter'|_ }}
                             </a>
diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twig
index 64a8dfc793..60f3cc79eb 100644
--- a/resources/views/categories/no-category.twig
+++ b/resources/views/categories/no-category.twig
@@ -25,12 +25,12 @@
                     {% include 'list.journals' with {'journals': journals, 'hideCategories':true} %}
                     {% if periods.count > 0 %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.no-category', ['all']) }}">{{ 'show_all_no_filter'|_ }}</a>
                         </p>
                     {% else %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.no-category') }}">{{ 'show_the_current_period_and_overview'|_ }}</a>
                         </p>
                     {% endif %}
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig
index 2bb556734e..72be5d3faf 100644
--- a/resources/views/categories/show.twig
+++ b/resources/views/categories/show.twig
@@ -68,14 +68,14 @@
                     {% include 'list.journals' with {hideCategories: true, hideBills: true} %}
                     {% if periods.count > 0 %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.show', [category.id,'all']) }}">
                                 {{ 'show_all_no_filter'|_ }}
                             </a>
                         </p>
                     {% else %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('categories.show', [category.id]) }}">
                                 {{ 'show_the_current_period_and_overview'|_ }}
                             </a>
diff --git a/resources/views/list/journals.twig b/resources/views/list/journals.twig
index 62f16a4962..c8921545a9 100644
--- a/resources/views/list/journals.twig
+++ b/resources/views/list/journals.twig
@@ -114,7 +114,7 @@
         <div class="mass_buttons btn-group btn-group pull-right">
             <a href="#" class="btn btn-default mass_select"><i class="fa fa-fw fa-check-square-o"></i> {{ 'select_transactions'|_ }}</a>
             <a href="#" class="btn btn-default mass_stop_select" style="display:none;"><i class="fa faw-fw fa-square-o"
-                                                                                          aria-hidden="true"></i> {{ 'stop_selection'|_ }}</a>
+                                                                                         ></i> {{ 'stop_selection'|_ }}</a>
         </div>
     </div>
 </div>
diff --git a/resources/views/partials/flashes.twig b/resources/views/partials/flashes.twig
index c4808c0ee5..15198f87b6 100644
--- a/resources/views/partials/flashes.twig
+++ b/resources/views/partials/flashes.twig
@@ -2,7 +2,7 @@
 {% if Session.has('success') %}
     <div class="alert alert-success alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert">
-            <span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+            <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
         </button>
         <strong>{{ 'flash_success'|_ }}</strong> {{ session('success') }}
     </div>
@@ -12,7 +12,7 @@
 {% if Session.has('info') %}
     <div class="alert alert-info alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert">
-            <span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+            <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
         </button>
 
         {# MULTIPLE INFO MESSAGE #}
@@ -42,7 +42,7 @@
 {% if Session.has('warning') %}
     <div class="alert alert-warning alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert">
-            <span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+            <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
         </button>
         <strong>{{ 'flash_warning'|_ }}</strong> {{ session('warning') }}
     </div>
@@ -52,7 +52,7 @@
 {% if Session.has('error') %}
     <div class="alert alert-danger alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert">
-            <span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+            <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
         </button>
 
         {# MULTIPLE ERRORS (BAD) #}
diff --git a/resources/views/partials/password-modal.twig b/resources/views/partials/password-modal.twig
index 3fbfac9e56..9aa7be78d8 100644
--- a/resources/views/partials/password-modal.twig
+++ b/resources/views/partials/password-modal.twig
@@ -3,7 +3,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span>&times;</span></button>
                 <h4 class="modal-title">
                     {{ 'secure_pw_title'|_ }}
                 </h4>
diff --git a/resources/views/piggy-banks/add.twig b/resources/views/piggy-banks/add.twig
index e8e4c32ab6..ccc37f9d00 100644
--- a/resources/views/piggy-banks/add.twig
+++ b/resources/views/piggy-banks/add.twig
@@ -1,9 +1,9 @@
 <div class="modal-dialog">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+            <button type="button" class="close" data-dismiss="modal"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
             </button>
-            <h4 class="modal-title" id="myModalLabel">{{ trans('firefly.add_money_to_piggy_title', {name: piggyBank.name}) }}</h4>
+            <h4 class="modal-title">{{ trans('firefly.add_money_to_piggy_title', {name: piggyBank.name}) }}</h4>
         </div>
         <form style="display: inline;" id="add" action="{{ route('piggy-banks.add', piggyBank.id) }}" method="POST">
             <div class="modal-body">
diff --git a/resources/views/piggy-banks/remove.twig b/resources/views/piggy-banks/remove.twig
index 34f1055181..190616cc24 100644
--- a/resources/views/piggy-banks/remove.twig
+++ b/resources/views/piggy-banks/remove.twig
@@ -4,9 +4,9 @@
             <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
 
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+                <button type="button" class="close" data-dismiss="modal"><span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
                 </button>
-                <h4 class="modal-title" id="myModalLabel">{{ trans('firefly.remove_money_from_piggy_title', {name: piggyBank.name}) }}</h4>
+                <h4 class="modal-title">{{ trans('firefly.remove_money_from_piggy_title', {name: piggyBank.name}) }}</h4>
             </div>
 
             <div class="modal-body">
diff --git a/resources/views/popup/report/balance-amount.twig b/resources/views/popup/report/balance-amount.twig
index 426aab6d07..d6fce9f97b 100644
--- a/resources/views/popup/report/balance-amount.twig
+++ b/resources/views/popup/report/balance-amount.twig
@@ -2,7 +2,7 @@
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
+            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
             <h4 class="modal-title" id="balanceAmountTitle">{{ trans('firefly.balance_amount',
                 {budget: budget.name, account: account.name,  start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}
                 ) }}</h4>
diff --git a/resources/views/popup/report/budget-spent-amount.twig b/resources/views/popup/report/budget-spent-amount.twig
index 8f4f106b7e..0817e533d7 100644
--- a/resources/views/popup/report/budget-spent-amount.twig
+++ b/resources/views/popup/report/budget-spent-amount.twig
@@ -2,7 +2,7 @@
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
+            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
             <h4 class="modal-title" id="budgetSpentAmountLabel">
                 {{ trans('firefly.budget_spent_amount', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat), budget: budget.name}) }}
             </h4>
diff --git a/resources/views/popup/report/category-entry.twig b/resources/views/popup/report/category-entry.twig
index f5cd63d1c6..e3371f439f 100644
--- a/resources/views/popup/report/category-entry.twig
+++ b/resources/views/popup/report/category-entry.twig
@@ -2,7 +2,7 @@
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
+            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
             <h4 class="modal-title"
                 id="expenseEntryTitle">{{ trans('firefly.category_entry', {name: category.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
         </div>
diff --git a/resources/views/popup/report/expense-entry.twig b/resources/views/popup/report/expense-entry.twig
index 46193a0eb2..0cbc7cfe90 100644
--- a/resources/views/popup/report/expense-entry.twig
+++ b/resources/views/popup/report/expense-entry.twig
@@ -2,7 +2,7 @@
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
+            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
             <h4 class="modal-title"
                 id="expenseEntryTitle">{{ trans('firefly.expense_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
         </div>
diff --git a/resources/views/popup/report/income-entry.twig b/resources/views/popup/report/income-entry.twig
index 31a22e8f95..c5c2b12475 100644
--- a/resources/views/popup/report/income-entry.twig
+++ b/resources/views/popup/report/income-entry.twig
@@ -2,7 +2,7 @@
 <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
         <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
+            <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span>&times;</span></button>
             <h4 class="modal-title"
                 id="incomeEntryTitle">{{ trans('firefly.income_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
         </div>
diff --git a/resources/views/reports/partials/budget-period.twig b/resources/views/reports/partials/budget-period.twig
index f70e5c9c71..33fb487ff8 100644
--- a/resources/views/reports/partials/budget-period.twig
+++ b/resources/views/reports/partials/budget-period.twig
@@ -13,9 +13,9 @@
         <tr>
             <td>
                 {% if id != 0 %}
-                    <a class="btn btn-default btn-xs" href="{{ route('budgets.show', [id]) }}"><i class="fa fa-external-link" aria-hidden="true"></i></a>
+                    <a class="btn btn-default btn-xs" href="{{ route('budgets.show', [id]) }}"><i class="fa fa-external-link"></i></a>
                 {% else %}
-                    <a class="btn btn-default btn-xs" href="{{ route('budgets.no-budget') }}"><i class="fa fa-external-link" aria-hidden="true"></i></a>
+                    <a class="btn btn-default btn-xs" href="{{ route('budgets.no-budget') }}"><i class="fa fa-external-link"></i></a>
                 {% endif %}
             </td>
             <td data-value="{{ info.name }}">
diff --git a/resources/views/reports/partials/category-period.twig b/resources/views/reports/partials/category-period.twig
index db35d7ea4d..05d49b3a2f 100644
--- a/resources/views/reports/partials/category-period.twig
+++ b/resources/views/reports/partials/category-period.twig
@@ -13,9 +13,9 @@
         <tr>
             <td>
                 {% if id != 0 %}
-                    <a class="btn btn-default btn-xs" href="{{ route('categories.show', [id]) }}"><i class="fa fa-external-link" aria-hidden="true"></i></a>
+                    <a class="btn btn-default btn-xs" href="{{ route('categories.show', [id]) }}"><i class="fa fa-external-link"></i></a>
                 {% else %}
-                    <a class="btn btn-default btn-xs" href="{{ route('categories.no-category') }}"><i class="fa fa-external-link" aria-hidden="true"></i></a>
+                    <a class="btn btn-default btn-xs" href="{{ route('categories.no-category') }}"><i class="fa fa-external-link"></i></a>
                 {% endif %}
             </td>
             <td data-value="{{ info.name }}">
diff --git a/resources/views/rules/partials/test-trigger-modal.twig b/resources/views/rules/partials/test-trigger-modal.twig
index fc6bcd7f7a..ef2e5e15c9 100644
--- a/resources/views/rules/partials/test-trigger-modal.twig
+++ b/resources/views/rules/partials/test-trigger-modal.twig
@@ -3,7 +3,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span>&times;</span></button>
                 <h4 class="modal-title" id="testTriggerLabel">{{ 'test_rule_triggers'|_ }}</h4>
             </div>
             <div class="modal-body">
diff --git a/resources/views/transactions/index.twig b/resources/views/transactions/index.twig
index 65bfbf64e7..e7de57948f 100644
--- a/resources/views/transactions/index.twig
+++ b/resources/views/transactions/index.twig
@@ -25,12 +25,12 @@
                     {% include 'list.journals' with {'journals': journals} %}
                     {% if periods.count > 0 %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('transactions.index', [what, 'all']) }}">{{ 'show_all_no_filter'|_ }}</a>
                         </p>
                     {% else %}
                         <p>
-                            <i class="fa fa-calendar" aria-hidden="true"></i>
+                            <i class="fa fa-calendar"></i>
                             <a href="{{ route('transactions.index', [what]) }}">{{ 'show_the_current_period_and_overview'|_ }}</a>
                         </p>
                     {% endif %}
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index b390b7002d..92c9108472 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -10,6 +10,56 @@
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'transaction_journal_information'|_ }}</h3>
+
+                    <div class="box-tools pull-right">
+                        <div class="btn-group">
+                            <button id="transaction_menu" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i>
+                            </button>
+                            <ul class="dropdown-menu" role="menu">
+                                <li><a href="{{ route('transactions.edit',journal.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a></li>
+                                <li><a href="{{ route('transactions.delete',journal.id) }}"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a></li>
+                                {# convert to withdrawal #}
+                                {% if journal.transactionType.type != "Withdrawal" %}
+                                    <li>
+                                        <a href="{{ route('transactions.convert.index', ['withdrawal', journal.id]) }}">
+                                            <i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_withdrawal')|_ }}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                                {# convert to deposit #}
+                                {% if journal.transactionType.type != "Deposit" %}
+                                    <li>
+                                        <a href="{{ route('transactions.convert.index', ['deposit', journal.id]) }}">
+                                            <i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_deposit')|_ }}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                                {# convert to transfer#}
+                                {% if journal.transactionType.type != "Transfer" %}
+                                    <li>
+                                        <a href="{{ route('transactions.convert.index', ['transfer', journal.id]) }}">
+                                            <i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_transfer')|_ }}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                                {# other options #}
+                                <li>
+                                    <a href="{{ route('transactions.clone', [journal.id]) }}">
+                                        <i class="fa fa-copy fa-fw"></i> {{ ('clone_'~journal.transactionType.type|lower)|_ }}
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="{{ route('transactions.split.edit', journal.id) }}">
+                                        <i class="fa fa-unsorted fa-fw"></i> {{ ('split_this_'~what)|_ }}
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="#" data-toggle="modal" data-target="#linkJournalModal"><i class="fa fa-fw fa-link"></i> {{ 'link_transaction'|_ }}</a>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+
                 </div>
                 <div class="box-body table-responsive no-padding">
                     <table class="table table-hover">
@@ -49,8 +99,54 @@
                 </div>
                 <div class="box-footer">
                     <div class="pull-right">
-                        <a class="btn btn-default" href="{{ route('transactions.edit',journal.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a>
-                        <a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-danger"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}</a>
+                        <div class="btn-group">
+                            <a class="btn btn-default" href="{{ route('transactions.edit',journal.id) }}"><i class="fa fa-pencil fa-fw"></i> {{ 'edit'|_ }}</a>
+                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <i class="fa fa-cog fa-fw"></i> {{ 'options'|_ }} <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu">
+                                {# convert to withdrawal #}
+                                {% if journal.transactionType.type != "Withdrawal" %}
+                                    <li>
+                                        <a href="{{ route('transactions.convert.index', ['withdrawal', journal.id]) }}">
+                                            <i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_withdrawal')|_ }}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                                {# convert to deposit #}
+                                {% if journal.transactionType.type != "Deposit" %}
+                                    <li>
+                                        <a href="{{ route('transactions.convert.index', ['deposit', journal.id]) }}">
+                                            <i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_deposit')|_ }}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                                {# convert to transfer#}
+                                {% if journal.transactionType.type != "Transfer" %}
+                                    <li>
+                                        <a href="{{ route('transactions.convert.index', ['transfer', journal.id]) }}">
+                                            <i class="fa fa-exchange fa-fw"></i> {{ ('convert_'~journal.transactionType.type~'_to_transfer')|_ }}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                                {# other options #}
+                                <li>
+                                    <a href="{{ route('transactions.clone', [journal.id]) }}">
+                                        <i class="fa fa-copy fa-fw"></i> {{ ('clone_'~journal.transactionType.type|lower)|_ }}
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="{{ route('transactions.split.edit', journal.id) }}">
+                                        <i class="fa fa-unsorted fa-fw"></i> {{ ('split_this_'~what)|_ }}
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="#" data-toggle="modal" data-target="#linkJournalModal"><i class="fa fa-fw fa-link"></i> {{ 'link_transaction'|_ }}</a>
+                                </li>
+                            </ul>
+                            <a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-danger"><i class="fa fa-trash fa-fw"></i> {{ 'delete'|_ }}
+                            </a>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -213,52 +309,6 @@
                     </div>
                 </div>
             {% endif %}
-            {% if transactions|length == 1 %}
-                <div class="box">
-                    <div class="box-header with-border">
-                        <h3 class="box-title">{{ 'transaction_journal_other_options'|_ }}</h3>
-                    </div>
-                    <div class="box-body">
-                        {% if journal.transactionType.type != "Withdrawal" %}
-                            <p>
-                                <i class="fa fa-exchange fa-fw" aria-hidden="true"></i>
-                                <a href="{{ route('transactions.convert.index', ['withdrawal', journal.id]) }}">
-                                    {{ ('convert_'~journal.transactionType.type~'_to_withdrawal')|_ }}
-                                </a>
-                            </p>
-                        {% endif %}
-                        {% if journal.transactionType.type != "Deposit" %}
-                            <p>
-                                <i class="fa fa-exchange fa-fw" aria-hidden="true"></i>
-                                <a href="{{ route('transactions.convert.index', ['deposit', journal.id]) }}">
-                                    {{ ('convert_'~journal.transactionType.type~'_to_deposit')|_ }}
-                                </a>
-                            </p>
-                        {% endif %}
-
-                        {% if journal.transactionType.type != "Transfer" %}
-                            <p>
-                                <i class="fa fa-exchange fa-fw" aria-hidden="true"></i>
-                                <a href="{{ route('transactions.convert.index', ['transfer', journal.id]) }}">
-                                    {{ ('convert_'~journal.transactionType.type~'_to_transfer')|_ }}
-                                </a>
-                            </p>
-                        {% endif %}
-                        <p>
-                            <i class="fa fa-copy fa-fw" aria-hidden="true"></i>
-                            <a href="{{ route('transactions.clone', [journal.id]) }}">
-                                {{ ('clone_'~journal.transactionType.type|lower)|_ }}
-                            </a>
-                        </p>
-                        <p>
-                            <i class="fa fa-unsorted fa-fw" aria-hidden="true"></i>
-                            <a href="{{ route('transactions.split.edit', journal.id) }}">
-                                {{ ('split_this_'~what)|_ }}
-                            </a>
-                        </p>
-                    </div>
-                </div>
-            {% endif %}
         </div>
     </div>
 
@@ -330,5 +380,45 @@
             </div>
         </div>
     </div>
-    <!-- end -->
+
+    {# link journal modal:#}
+    <div class="modal fade" tabindex="-1" role="dialog" id="linkJournalModal">
+        <form action="#" method="post" class="form-horizontal">
+            <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h4 class="modal-title">Link another transaction</h4>
+                    </div>
+                    <div class="modal-body" id="helpBody">
+                        <p>Select a transaction to link this transaction to</p>
+                        <div class="form-group">
+                            <label for="link_type" class="col-sm-2 control-label">This transaction</label>
+                            <div class="col-sm-10">
+                                <select class="form-control" name="link_type"><option>a</option><option>a</option><option>a</option></select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="link_type" class="col-sm-2 control-label">Transaction</label>
+                            <div class="col-sm-10">
+                                <input type="text" value="" class="form-control">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="comments" class="col-sm-2 control-label">Comments</label>
+                            <div class="col-sm-10">
+                                <textarea class="form-control"></textarea>
+                            </div>
+                        </div>
+
+
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                        <button type="submit" class="btn btn-primary">{{ 'do something'|_ }}</button>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+
 {% endblock %}
diff --git a/resources/views/transactions/single/create.twig b/resources/views/transactions/single/create.twig
index a55254bf04..2129bd70d1 100644
--- a/resources/views/transactions/single/create.twig
+++ b/resources/views/transactions/single/create.twig
@@ -102,7 +102,7 @@
                 not optionalFields.internal_reference or
                 not optionalFields.notes or
                 not optionalFields.attachments %}
-                    <p class="text-center text-success"><i class="fa fa-info-circle" aria-hidden="true"></i>
+                    <p class="text-center text-success"><i class="fa fa-info-circle"></i>
                         <em>{{ trans('firefly.hidden_fields_preferences', {link: route('preferences.index')})|raw }}</em></p>
                 {% endif %}
 
diff --git a/resources/views/transactions/single/edit.twig b/resources/views/transactions/single/edit.twig
index 6e1aafe723..76ea6216c3 100644
--- a/resources/views/transactions/single/edit.twig
+++ b/resources/views/transactions/single/edit.twig
@@ -107,7 +107,7 @@
                 not optionalFields.internal_reference or
                 not optionalFields.notes or
                 not optionalFields.attachments %}
-                    <p class="text-center text-success"><i class="fa fa-info-circle" aria-hidden="true"></i>
+                    <p class="text-center text-success"><i class="fa fa-info-circle"></i>
                         <em>{{ trans('firefly.hidden_fields_preferences', {link: route('preferences.index')})|raw }}</em></p>
                 {% endif %}
 
diff --git a/resources/views/transactions/split/edit.twig b/resources/views/transactions/split/edit.twig
index fcce6ddc94..095202f46c 100644
--- a/resources/views/transactions/split/edit.twig
+++ b/resources/views/transactions/split/edit.twig
@@ -99,7 +99,7 @@
                 not optionalFields.internal_reference or
                 not optionalFields.notes or
                 not optionalFields.attachments %}
-                    <p class="text-center text-success"><i class="fa fa-info-circle" aria-hidden="true"></i>
+                    <p class="text-center text-success"><i class="fa fa-info-circle"></i>
                         <em>{{ trans('firefly.hidden_fields_preferences', {link: route('preferences.index')})|raw }}</em></p>
                 {% endif %}