diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php
index d8c8a872f9..2f0b407cc9 100644
--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@@ -107,7 +107,8 @@ class SplitController extends Controller
         // account array to display currency info:
         /** @var Account $account */
         foreach ($accountList as $account) {
-            $accountArray[$account->id] = $account;
+            $accountArray[$account->id]                = $account;
+            $accountArray[$account->id]['currency_id'] = intval($account->getMeta('currency_id'));
         }
 
 
@@ -125,7 +126,7 @@ class SplitController extends Controller
             compact(
                 'subTitleIcon', 'currencies', 'optionalFields',
                 'preFilled', 'subTitle', 'uploadSize', 'assetAccounts',
-                'budgets', 'journal','accountArray'
+                'budgets', 'journal', 'accountArray'
             )
         );
     }
diff --git a/public/js/ff/transactions/split/edit.js b/public/js/ff/transactions/split/edit.js
index dbe9cfba98..197e9f6fb6 100644
--- a/public/js/ff/transactions/split/edit.js
+++ b/public/js/ff/transactions/split/edit.js
@@ -7,7 +7,7 @@
  */
 
 
-/** global: originalSum, accounting, what, Modernizr */
+/** global: originalSum, accounting, what, Modernizr, currencySymbol */
 
 var destAccounts = {};
 var srcAccounts = {};
@@ -231,13 +231,14 @@ function calculateSum() {
     sum = Math.round(sum * 100) / 100;
     left = Math.round(left * 100) / 100;
 
+
     $('.amount-warning').remove();
     if (sum !== originalSum) {
         var holder = $('#journal_amount_holder');
         var par = holder.find('p.form-control-static');
-        $('<span>').text(' (' + accounting.formatMoney(sum) + ')').addClass('text-danger amount-warning').appendTo(par);
+        $('<span>').text(' (' + accounting.formatMoney(sum, currencySymbol) + ')').addClass('text-danger amount-warning').appendTo(par);
         // also add what's left to divide (or vice versa)
-        $('<span>').text(' (' + accounting.formatMoney(left) + ')').addClass('text-danger amount-warning').appendTo(par);
+        $('<span>').text(' (' + accounting.formatMoney(left, currencySymbol) + ')').addClass('text-danger amount-warning').appendTo(par);
     }
 
 }
\ No newline at end of file
diff --git a/resources/views/transactions/split/edit.twig b/resources/views/transactions/split/edit.twig
index 5266ee0be0..fcce6ddc94 100644
--- a/resources/views/transactions/split/edit.twig
+++ b/resources/views/transactions/split/edit.twig
@@ -250,7 +250,11 @@
                                     {% endif %}
 
                                     {# amount#}
+                                    {% if transaction.foreign_amount != null %}
                                     <div class="col-lg-1 col-md-5 col-sm-12 col-xs-12">
+                                    {% else %}
+                                    <div class="col-lg-2 col-md-5 col-sm-12 col-xs-12">
+                                    {% endif %}
                                         <div class="input-group">
                                             <div class="input-group-addon">{{ transaction.transaction_currency_symbol }}</div>
                                             <input type="number" name="transactions[{{ loop.index0 }}][amount]" value="{{ transaction.amount }}"
@@ -261,21 +265,20 @@
                                     </div>
 
                                     {# foreign amount #}
+                                    {% if transaction.foreign_amount != null %}
                                     <div class="col-lg-1 col-md-7 col-sm-12 col-xs-12">
-                                        {% if transaction.foreign_amount != null %}
+                                        <div class="input-group">
+                                            <div class="input-group-addon">{{ transaction.foreign_currency_symbol }}</div>
+                                            <input type="number" name="transactions[{{ loop.index0 }}][foreign_amount]"
+                                                   value="{{ transaction.foreign_amount }}"
+                                                   class="form-control" autocomplete="off" step="any">
+                                        </div>
+                                        <input type="hidden"
+                                               name="transactions[{{ loop.index0 }}][foreign_currency_id]"
+                                               value="{{ transaction.foreign_currency_id }}">
 
-                                            <div class="input-group">
-                                                <div class="input-group-addon">{{ transaction.foreign_currency_symbol }}</div>
-                                                <input type="number" name="transactions[{{ loop.index0 }}][foreign_amount]"
-                                                       value="{{ transaction.foreign_amount }}"
-                                                       class="form-control" autocomplete="off" step="any">
-                                            </div>
-                                            <input type="hidden"
-                                                   name="transactions[{{ loop.index0 }}][foreign_currency_id]"
-                                                   value="{{ transaction.foreign_currency_id }}">
-
-                                        {% endif %}
                                     </div>
+                                    {% endif %}
 
                                     {# budget #}
                                     {% if preFilled.what == 'withdrawal' %}
@@ -330,7 +333,15 @@
     <link href="css/jquery-ui/jquery-ui.theme.min.css" type="text/css" rel="stylesheet" media="all">
 {% endblock %}
 {% block scripts %}
+    <script type="text/javascript" src="{{ route('javascript.currencies') }}?ext=.js"></script>
     <script type="text/javascript">
+        var currencySymbol = 'x';
+        {% if preFilled.what == 'withdrawal' or preFilled.what == 'transfer' %}
+            currencySymbol = currencyInfo[{{ accountArray[preFilled.journal_source_account_id].currency_id }}].symbol;
+        {% endif %}
+        {% if preFilled.what == 'deposit' %}
+            currencySymbol = currencyInfo[{{ accountArray[preFilled.journal_destination_account_id].currency_id }}].symbol;
+        {% endif %}
         var originalSum = {{ preFilled.journal_amount }};
         var what = "{{ preFilled.what }}";
     </script>