diff --git a/basicswap/static/js/active.js b/basicswap/static/js/active.js
index 5c4b82f..2189979 100644
--- a/basicswap/static/js/active.js
+++ b/basicswap/static/js/active.js
@@ -575,14 +575,13 @@ const createSwapTableRow = async (swap) => {
              </div>
             </div>
            </td>
-            <!-- You Send Column -->
+
+            <!-- You Receive Column -->
             <td class="py-0">
                 <div class="py-3 px-4 text-left">
                     <div class="items-center monospace">
-                        <div class="pr-2">
-                            <div class="text-sm font-semibold">${fromAmount.toFixed(8)}</div>
-                            <div class="text-sm text-gray-500 dark:text-gray-400">${fromSymbol}</div>
-                        </div>
+                        <div class="text-sm font-semibold">${toAmount.toFixed(8)}</div>
+                        <div class="text-sm text-gray-500 dark:text-gray-400">${toSymbol}</div>
                     </div>
                 </div>
             </td>
@@ -593,8 +592,8 @@ const createSwapTableRow = async (swap) => {
                     <div class="flex items-center justify-center">
                         <span class="inline-flex mr-3 align-middle items-center justify-center w-18 h-20 rounded">
                             <img class="h-12" 
-                                 src="/static/images/coins/${swap.coin_from.replace(' ', '-')}.png" 
-                                 alt="${swap.coin_from}"
+                                 src="/static/images/coins/${swap.coin_to.replace(' ', '-')}.png" 
+                                 alt="${swap.coin_to}"
                                  onerror="this.src='/static/images/coins/default.png'">
                         </span>
                         <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
@@ -602,20 +601,22 @@ const createSwapTableRow = async (swap) => {
                         </svg>
                         <span class="inline-flex ml-3 align-middle items-center justify-center w-18 h-20 rounded">
                             <img class="h-12" 
-                                 src="/static/images/coins/${swap.coin_to.replace(' ', '-')}.png" 
-                                 alt="${swap.coin_to}"
+                                 src="/static/images/coins/${swap.coin_from.replace(' ', '-')}.png" 
+                                 alt="${swap.coin_from}"
                                  onerror="this.src='/static/images/coins/default.png'">
                         </span>
                     </div>
                 </div>
             </td>
 
-            <!-- You Receive Column -->
+            <!-- You Send Column -->
             <td class="py-0">
                 <div class="py-3 px-4 text-right">
                     <div class="items-center monospace">
-                        <div class="text-sm font-semibold">${toAmount.toFixed(8)}</div>
-                        <div class="text-sm text-gray-500 dark:text-gray-400">${toSymbol}</div>
+                        <div>
+                            <div class="text-sm font-semibold">${fromAmount.toFixed(8)}</div>
+                            <div class="text-sm text-gray-500 dark:text-gray-400">${fromSymbol}</div>
+                        </div>
                     </div>
                 </div>
             </td>
diff --git a/basicswap/templates/active.html b/basicswap/templates/active.html
index 2c07ab8..8630183 100644
--- a/basicswap/templates/active.html
+++ b/basicswap/templates/active.html
@@ -43,7 +43,7 @@
          </div>
         </th>
        <th class="p-0">
-         <div class="py-3 px-4 bg-coolGray-200 dark:bg-gray-600 text-right">
+         <div class="py-3 px-4 bg-coolGray-200 dark:bg-gray-600 text-left">
           <span class="text-sm text-gray-600 dark:text-gray-300 font-semibold">You Receive</span>
          </div>
          </th>
@@ -53,7 +53,7 @@
         </div>
        </th>
         <th class="p-0">
-        <div class="py-3 px-4 bg-coolGray-200 dark:bg-gray-600 text-left">
+        <div class="py-3 px-4 bg-coolGray-200 dark:bg-gray-600 text-right">
          <span class="text-sm text-gray-600 dark:text-gray-300 font-semibold">You Send</span>
        </div>
        </th>