diff --git a/source/renderer/app/i18n/locales/defaultMessages.json b/source/renderer/app/i18n/locales/defaultMessages.json
index e7558414dc..ced9b9aa5d 100644
--- a/source/renderer/app/i18n/locales/defaultMessages.json
+++ b/source/renderer/app/i18n/locales/defaultMessages.json
@@ -2,87 +2,78 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!This API method is not yet implemented.",
-        "description": "\"This API method is not yet implemented.\" error message.",
-        "end": {
-          "column": 3,
-          "line": 9
-        },
-        "file": "source/renderer/app/api/ada/errors.js",
-        "id": "api.errors.ApiMethodNotYetImplementedError",
-        "start": {
-          "column": 35,
-          "line": 5
-        }
-      },
-      {
-        "defaultMessage": "!!!Wallet you are trying to import already exists.",
-        "description": "\"Wallet you are trying to import already exists.\" error message.",
+        "defaultMessage": "!!!An error occurred, please try again later.",
+        "description": "Generic error message.",
         "end": {
           "column": 3,
-          "line": 14
+          "line": 10
         },
-        "file": "source/renderer/app/api/ada/errors.js",
-        "id": "api.errors.WalletAlreadyImportedError",
+        "file": "source/renderer/app/api/common/errors.js",
+        "id": "api.errors.GenericApiError",
         "start": {
-          "column": 30,
-          "line": 10
+          "column": 19,
+          "line": 6
         }
       },
       {
-        "defaultMessage": "!!!Your ADA could not be redeemed correctly.",
-        "description": "\"Your ADA could not be redeemed correctly.\" error message.",
+        "defaultMessage": "!!!Incorrect wallet password.",
+        "description": "\"Incorrect wallet password.\" error message.",
         "end": {
           "column": 3,
-          "line": 19
+          "line": 15
         },
-        "file": "source/renderer/app/api/ada/errors.js",
-        "id": "api.errors.RedeemAdaError",
+        "file": "source/renderer/app/api/common/errors.js",
+        "id": "api.errors.IncorrectPasswordError",
         "start": {
-          "column": 18,
-          "line": 15
+          "column": 32,
+          "line": 11
         }
       },
       {
-        "defaultMessage": "!!!Wallet could not be imported, please make sure you are providing a correct file.",
-        "description": "\"Wallet could not be imported, please make sure you are providing a correct file.\" error message.",
+        "defaultMessage": "!!!There was a problem sending the support request.",
+        "description": "\"There was a problem sending the support request.\" error message",
         "end": {
           "column": 3,
-          "line": 24
+          "line": 20
         },
-        "file": "source/renderer/app/api/ada/errors.js",
-        "id": "api.errors.WalletFileImportError",
+        "file": "source/renderer/app/api/common/errors.js",
+        "id": "api.errors.ReportRequestError",
         "start": {
-          "column": 25,
-          "line": 20
+          "column": 22,
+          "line": 16
         }
       },
       {
-        "defaultMessage": "!!!Not enough money to make this transaction.",
-        "description": "\"Not enough money to make this transaction.\" error message.",
+        "defaultMessage": "!!!This API method is not yet implemented.",
+        "description": "\"This API method is not yet implemented.\" error message.",
         "end": {
           "column": 3,
-          "line": 29
+          "line": 25
         },
-        "file": "source/renderer/app/api/ada/errors.js",
-        "id": "api.errors.NotEnoughMoneyToSendError",
+        "file": "source/renderer/app/api/common/errors.js",
+        "id": "api.errors.ApiMethodNotYetImplementedError",
         "start": {
-          "column": 29,
-          "line": 25
+          "column": 35,
+          "line": 21
         }
-      },
+      }
+    ],
+    "path": "source/renderer/app/api/common/errors.json"
+  },
+  {
+    "descriptors": [
       {
         "defaultMessage": "!!!It's not allowed to send money to the same address you are sending from. Make sure you have enough addresses with money in this account or send to a different address.",
         "description": "\"It's not allowed to send money to the same address you are sending from.\" error message.",
         "end": {
           "column": 3,
-          "line": 34
+          "line": 9
         },
-        "file": "source/renderer/app/api/ada/errors.js",
+        "file": "source/renderer/app/api/transactions/errors.js",
         "id": "api.errors.NotAllowedToSendMoneyToSameAddressError",
         "start": {
           "column": 43,
-          "line": 30
+          "line": 5
         }
       },
       {
@@ -90,13 +81,41 @@
         "description": "\"It is not allowed to send money to Ada redemption address.\" error message.",
         "end": {
           "column": 3,
-          "line": 39
+          "line": 14
         },
-        "file": "source/renderer/app/api/ada/errors.js",
+        "file": "source/renderer/app/api/transactions/errors.js",
         "id": "api.errors.NotAllowedToSendMoneyToRedeemAddressError",
         "start": {
           "column": 45,
-          "line": 35
+          "line": 10
+        }
+      },
+      {
+        "defaultMessage": "!!!Not enough money to make this transaction.",
+        "description": "\"Not enough money to make this transaction.\" error message.",
+        "end": {
+          "column": 3,
+          "line": 19
+        },
+        "file": "source/renderer/app/api/transactions/errors.js",
+        "id": "api.errors.NotEnoughMoneyToSendError",
+        "start": {
+          "column": 29,
+          "line": 15
+        }
+      },
+      {
+        "defaultMessage": "!!!Your ADA could not be redeemed correctly.",
+        "description": "\"Your ADA could not be redeemed correctly.\" error message.",
+        "end": {
+          "column": 3,
+          "line": 24
+        },
+        "file": "source/renderer/app/api/transactions/errors.js",
+        "id": "api.errors.RedeemAdaError",
+        "start": {
+          "column": 18,
+          "line": 20
         }
       },
       {
@@ -104,13 +123,13 @@
         "description": "\"All your funds are already at the address you are trying send money to.\" error message.",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 29
         },
-        "file": "source/renderer/app/api/ada/errors.js",
+        "file": "source/renderer/app/api/transactions/errors.js",
         "id": "api.errors.AllFundsAlreadyAtReceiverAddressError",
         "start": {
           "column": 41,
-          "line": 40
+          "line": 25
         }
       },
       {
@@ -118,78 +137,64 @@
         "description": "\"Not enough Ada for fees. Try sending a smaller amount.\" error message",
         "end": {
           "column": 3,
-          "line": 49
+          "line": 34
         },
-        "file": "source/renderer/app/api/ada/errors.js",
+        "file": "source/renderer/app/api/transactions/errors.js",
         "id": "api.errors.NotEnoughFundsForTransactionFeesError",
         "start": {
           "column": 41,
-          "line": 45
+          "line": 30
         }
       }
     ],
-    "path": "source/renderer/app/api/ada/errors.json"
+    "path": "source/renderer/app/api/transactions/errors.json"
   },
   {
     "descriptors": [
       {
-        "defaultMessage": "!!!An error occurred, please try again later.",
-        "description": "Generic error message.",
-        "end": {
-          "column": 3,
-          "line": 12
-        },
-        "file": "source/renderer/app/api/common.js",
-        "id": "api.errors.GenericApiError",
-        "start": {
-          "column": 19,
-          "line": 8
-        }
-      },
-      {
-        "defaultMessage": "!!!Incorrect wallet password.",
-        "description": "\"Incorrect wallet password.\" error message.",
+        "defaultMessage": "!!!Wallet you are trying to restore already exists.",
+        "description": "\"Wallet you are trying to restore already exists.\" error message.",
         "end": {
           "column": 3,
-          "line": 17
+          "line": 9
         },
-        "file": "source/renderer/app/api/common.js",
-        "id": "api.errors.IncorrectPasswordError",
+        "file": "source/renderer/app/api/wallets/errors.js",
+        "id": "api.errors.WalletAlreadyRestoredError",
         "start": {
-          "column": 32,
-          "line": 13
+          "column": 30,
+          "line": 5
         }
       },
       {
-        "defaultMessage": "!!!Wallet you are trying to restore already exists.",
-        "description": "\"Wallet you are trying to restore already exists.\" error message.",
+        "defaultMessage": "!!!Wallet you are trying to import already exists.",
+        "description": "\"Wallet you are trying to import already exists.\" error message.",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 14
         },
-        "file": "source/renderer/app/api/common.js",
-        "id": "api.errors.WalletAlreadyRestoredError",
+        "file": "source/renderer/app/api/wallets/errors.js",
+        "id": "api.errors.WalletAlreadyImportedError",
         "start": {
           "column": 30,
-          "line": 18
+          "line": 10
         }
       },
       {
-        "defaultMessage": "!!!There was a problem sending the support request.",
-        "description": "\"There was a problem sending the support request.\" error message",
+        "defaultMessage": "!!!Wallet could not be imported, please make sure you are providing a correct file.",
+        "description": "\"Wallet could not be imported, please make sure you are providing a correct file.\" error message.",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 19
         },
-        "file": "source/renderer/app/api/common.js",
-        "id": "api.errors.ReportRequestError",
+        "file": "source/renderer/app/api/wallets/errors.js",
+        "id": "api.errors.WalletFileImportError",
         "start": {
-          "column": 22,
-          "line": 23
+          "column": 25,
+          "line": 15
         }
       }
     ],
-    "path": "source/renderer/app/api/common.json"
+    "path": "source/renderer/app/api/wallets/errors.json"
   },
   {
     "descriptors": [
@@ -3290,13 +3295,13 @@
         "description": "Transaction type shown for credit card payments.",
         "end": {
           "column": 3,
-          "line": 22
+          "line": 26
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.type.card",
         "start": {
           "column": 8,
-          "line": 18
+          "line": 22
         }
       },
       {
@@ -3304,13 +3309,13 @@
         "description": "Transaction type shown for {currency} transactions.",
         "end": {
           "column": 3,
-          "line": 27
+          "line": 31
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.type",
         "start": {
           "column": 8,
-          "line": 23
+          "line": 27
         }
       },
       {
@@ -3318,13 +3323,13 @@
         "description": "Transaction type shown for money exchanges between currencies.",
         "end": {
           "column": 3,
-          "line": 32
+          "line": 36
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.type.exchange",
         "start": {
           "column": 12,
-          "line": 28
+          "line": 32
         }
       },
       {
@@ -3332,13 +3337,13 @@
         "description": "Transaction assurance level.",
         "end": {
           "column": 3,
-          "line": 37
+          "line": 41
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.assuranceLevel",
         "start": {
           "column": 18,
-          "line": 33
+          "line": 37
         }
       },
       {
@@ -3346,13 +3351,13 @@
         "description": "Transaction confirmations.",
         "end": {
           "column": 3,
-          "line": 42
+          "line": 46
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.confirmations",
         "start": {
           "column": 17,
-          "line": 38
+          "line": 42
         }
       },
       {
@@ -3360,13 +3365,13 @@
         "description": "Transaction ID.",
         "end": {
           "column": 3,
-          "line": 47
+          "line": 51
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.transactionId",
         "start": {
           "column": 17,
-          "line": 43
+          "line": 47
         }
       },
       {
@@ -3374,13 +3379,13 @@
         "description": "Conversion rate.",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 56
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.conversion.rate",
         "start": {
           "column": 18,
-          "line": 48
+          "line": 52
         }
       },
       {
@@ -3388,13 +3393,13 @@
         "description": "Label \"{currency} sent\" for the transaction.",
         "end": {
           "column": 3,
-          "line": 57
+          "line": 61
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.sent",
         "start": {
           "column": 8,
-          "line": 53
+          "line": 57
         }
       },
       {
@@ -3402,13 +3407,13 @@
         "description": "Label \"{currency} received\" for the transaction.",
         "end": {
           "column": 3,
-          "line": 62
+          "line": 66
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.received",
         "start": {
           "column": 12,
-          "line": 58
+          "line": 62
         }
       },
       {
@@ -3416,13 +3421,13 @@
         "description": "From address",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 71
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.address.from",
         "start": {
           "column": 15,
-          "line": 63
+          "line": 67
         }
       },
       {
@@ -3430,13 +3435,13 @@
         "description": "From addresses",
         "end": {
           "column": 3,
-          "line": 72
+          "line": 76
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.addresses.from",
         "start": {
           "column": 17,
-          "line": 68
+          "line": 72
         }
       },
       {
@@ -3444,13 +3449,13 @@
         "description": "To address",
         "end": {
           "column": 3,
-          "line": 77
+          "line": 81
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.address.to",
         "start": {
           "column": 13,
-          "line": 73
+          "line": 77
         }
       },
       {
@@ -3458,13 +3463,13 @@
         "description": "To addresses",
         "end": {
           "column": 3,
-          "line": 82
+          "line": 86
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.addresses.to",
         "start": {
           "column": 15,
-          "line": 78
+          "line": 82
         }
       },
       {
@@ -3472,13 +3477,13 @@
         "description": "Transaction amount.",
         "end": {
           "column": 3,
-          "line": 87
+          "line": 91
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.transactionAmount",
         "start": {
           "column": 21,
-          "line": 83
+          "line": 87
         }
       },
       {
@@ -3486,13 +3491,13 @@
         "description": "Transaction assurance level \"low\".",
         "end": {
           "column": 3,
-          "line": 95
+          "line": 99
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.assuranceLevel.low",
         "start": {
-          "column": 25,
-          "line": 91
+          "column": 34,
+          "line": 95
         }
       },
       {
@@ -3500,13 +3505,13 @@
         "description": "Transaction assurance level \"medium\".",
         "end": {
           "column": 3,
-          "line": 100
+          "line": 104
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.assuranceLevel.medium",
         "start": {
-          "column": 28,
-          "line": 96
+          "column": 37,
+          "line": 100
         }
       },
       {
@@ -3514,13 +3519,13 @@
         "description": "Transaction assurance level \"high\".",
         "end": {
           "column": 3,
-          "line": 105
+          "line": 109
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.assuranceLevel.high",
         "start": {
-          "column": 26,
-          "line": 101
+          "column": 35,
+          "line": 105
         }
       },
       {
@@ -3528,13 +3533,13 @@
         "description": "Transaction state \"pending\"",
         "end": {
           "column": 3,
-          "line": 113
+          "line": 117
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.state.pending",
         "start": {
           "column": 31,
-          "line": 109
+          "line": 113
         }
       },
       {
@@ -3542,13 +3547,13 @@
         "description": "Transaction state \"pending\"",
         "end": {
           "column": 3,
-          "line": 118
+          "line": 122
         },
         "file": "source/renderer/app/components/wallet/transactions/Transaction.js",
         "id": "wallet.transaction.state.failed",
         "start": {
           "column": 30,
-          "line": 114
+          "line": 118
         }
       }
     ],