diff --git a/doc/tapyrus/colored_coin_gui.md b/doc/tapyrus/colored_coin_gui.md
new file mode 100644
index 0000000000..e9b8a2461d
--- /dev/null
+++ b/doc/tapyrus/colored_coin_gui.md
@@ -0,0 +1,27 @@
+## Tapyrus core GUI
+
+Tapyrus GUI has been enhanced to allow Token transactions. Following are the changes made
+
+### Overview Page
+Overview in the new Tapyrus GUI shows tokens as well. _Prev_ and _Next_ buttons can be used to scroll through all the available tokens. Only TPC is shown when no other tokens are available.
+
+![Overview Page with token](./images/Tapyrus-overview-token.png)
+
+### Send Token
+Sending a token is the same as sending TPC except that the new address must have been generated with the colorid 
+
+> ./src/tapyrus-cli -conf=~/.tapyrus/ getnewaddress "NFT" c3b8b7e3a2684c746d367420bd0899104005cfeeb59705a3f402fa37312f402624
+
+Then the token lable would be populated automatically and "TOKEN" would be set in the token type drop down.
+![Send coin page with token](./images/Tapyrus-send-token.png)
+
+### Receive Token
+Receiving tokens is also similar to receiving TPC. In addition to lable, message and amount, Token should also be populated. 
+![Receive token page](./images/Tapyrus-receive-token.png)
+
+A new entry is added to the payment history table after the address is generated.
+![Received payment dialog](./images/Tapyrus-receive-dialog.png)
+
+A new column called Token is added to the transaction table. It shows the token name or TPC for every transaction output. Amount column for TPC is formatted according to wallet setting. For tokens, it is always the number of tokens.
+
+![Transaction page](./images/Tapyrus-transaction-page.png)
\ No newline at end of file
diff --git a/doc/tapyrus/images/Tapyrus-overview-token.png b/doc/tapyrus/images/Tapyrus-overview-token.png
new file mode 100644
index 0000000000..9e60ece524
Binary files /dev/null and b/doc/tapyrus/images/Tapyrus-overview-token.png differ
diff --git a/doc/tapyrus/images/Tapyrus-receive-token.png b/doc/tapyrus/images/Tapyrus-receive-token.png
new file mode 100644
index 0000000000..7af9ae3ed5
Binary files /dev/null and b/doc/tapyrus/images/Tapyrus-receive-token.png differ
diff --git a/doc/tapyrus/images/Tapyrus-send-token.png b/doc/tapyrus/images/Tapyrus-send-token.png
new file mode 100644
index 0000000000..8ce67bfbcc
Binary files /dev/null and b/doc/tapyrus/images/Tapyrus-send-token.png differ
diff --git a/doc/tapyrus/images/Tapyrus-transaction-page.png b/doc/tapyrus/images/Tapyrus-transaction-page.png
new file mode 100644
index 0000000000..ee9553779a
Binary files /dev/null and b/doc/tapyrus/images/Tapyrus-transaction-page.png differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e10770814a..b13ca3b93c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,9 +15,7 @@ option(BUILD_TAPYRUS_SEEDER "Build tapyrus-seeder" ON)
 option(BUILD_TAPYRUS_CLI "Build tapyrus-cli" ON)
 option(BUILD_TAPYRUS_GENESIS "Build tapyrus-genesis" ON)
 option(BUILD_TAPYRUS_TX "Build tapyrus-tx" ON)
-
-# TODO: Fix qt building problem and turn ON.
-option(BUILD_TAPYRUS_QT "Build tapyrus-qt" ON)
+option(ENABLE_QRCODE "Build QR support in wallet" OFF)
 
 # Ensure that WINDRES_PREPROC is enabled when using windres.
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
@@ -308,4 +306,4 @@ if(BUILD_TAPYRUS_QT)
     add_subdirectory(qt)
 endif()
 
-message(status "BUILD_TAPYRUS_QT=${BUILD_TAPYRUS_QT}")
\ No newline at end of file
+message(STATUS "BUILD_TAPYRUS_QT=${BUILD_TAPYRUS_QT}")
\ No newline at end of file
diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt
index 0293f3b631..82f9e2ea92 100644
--- a/src/config/CMakeLists.txt
+++ b/src/config/CMakeLists.txt
@@ -150,5 +150,12 @@ set(ENABLE_WALLET ${BUILD_TAPYRUS_WALLET})
 # Activate ZeroMQ
 set(ENABLE_ZMQ ${BUILD_TAPYRUS_ZMQ})
 
+# Try to find libqrencode
+ # Only used in the wallet GUI
+ if(ENABLE_QRCODE AND BUILD_BITCOIN_WALLET AND BUILD_BITCOIN_QT)
+ 	find_package(QREncode REQUIRED)
+ 	set(USE_QRCODE 1 CACHE INTERNAL "QR code is enabled")
+ endif()
+ 
 # Generate the config
 configure_file(bitcoin-config.h.cmake.in bitcoin-config.h ESCAPE_QUOTES)
diff --git a/src/config/bitcoin-config.h.cmake.in b/src/config/bitcoin-config.h.cmake.in
index 0acdedcd99..249deccfb2 100644
--- a/src/config/bitcoin-config.h.cmake.in
+++ b/src/config/bitcoin-config.h.cmake.in
@@ -60,5 +60,6 @@
 
 #cmakedefine ENABLE_WALLET 1
 #cmakedefine ENABLE_ZMQ 1
+#cmakedefine ENABLE_QRCODE 0
 
 #endif // BITCOIN_BITCOIN_CONFIG_H
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 77f587e33b..f5f7f09f33 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -9,6 +9,7 @@
 #include <amount.h>     // For CAmount
 #include <net.h>        // For CConnman::NumConnections
 #include <netaddress.h> // For Network
+#include <coins.h>
 
 #include <functional>
 #include <memory>
@@ -21,7 +22,6 @@
 class CCoinControl;
 class CFeeRate;
 class CNodeStats;
-class Coin;
 class RPCTimerInterface;
 class UniValue;
 class proxyType;
diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
index ef6d0a1b80..3a15be24a4 100644
--- a/src/interfaces/wallet.cpp
+++ b/src/interfaces/wallet.cpp
@@ -58,7 +58,7 @@ class PendingWalletTxImpl : public PendingWalletTx
 };
 
 //! Construct wallet tx struct.
-WalletTx MakeWalletTx(CWallet& wallet, const CWalletTx& wtx)
+WalletTx MakeWalletTx(Node& node, CWallet& wallet, const CWalletTx& wtx)
 {
     WalletTx result;
     result.tx = wtx.tx;
@@ -83,11 +83,13 @@ WalletTx MakeWalletTx(CWallet& wallet, const CWalletTx& wtx)
     result.time = wtx.GetTxTime();
     result.value_map = wtx.mapValue;
     result.is_coinbase = wtx.IsCoinBase();
+    result.is_tokenInput = result.isTokenInput(node);
+    result.is_tokenOutput = result.isTokenOutput();
     return result;
 }
 
 //! Construct wallet tx status struct.
-WalletTxStatus MakeWalletTxStatus(const CWalletTx& wtx)
+WalletTxStatus MakeWalletTxStatus(Node& node, const CWalletTx& wtx)
 {
     WalletTxStatus result;
     auto mi = ::mapBlockIndex.find(wtx.hashBlock);
@@ -274,26 +276,26 @@ class WalletImpl : public Wallet
         }
         return {};
     }
-    WalletTx getWalletTx(const uint256& txid) override
+    WalletTx getWalletTx(Node& node, const uint256& txid) override
     {
         LOCK2(::cs_main, m_wallet.cs_wallet);
         auto mi = m_wallet.mapWallet.find(txid);
         if (mi != m_wallet.mapWallet.end()) {
-            return MakeWalletTx(m_wallet, mi->second);
+            return MakeWalletTx(node, m_wallet, mi->second);
         }
         return {};
     }
-    std::vector<WalletTx> getWalletTxs() override
+    std::vector<WalletTx> getWalletTxs(Node& node) override
     {
         LOCK2(::cs_main, m_wallet.cs_wallet);
         std::vector<WalletTx> result;
         result.reserve(m_wallet.mapWallet.size());
         for (const auto& entry : m_wallet.mapWallet) {
-            result.emplace_back(MakeWalletTx(m_wallet, entry.second));
+            result.emplace_back(MakeWalletTx(node, m_wallet, entry.second));
         }
         return result;
     }
-    bool tryGetTxStatus(const uint256& txid,
+    bool tryGetTxStatus(Node& node, const uint256& txid,
         interfaces::WalletTxStatus& tx_status,
         int& num_blocks,
         int64_t& adjusted_time) override
@@ -312,10 +314,10 @@ class WalletImpl : public Wallet
         }
         num_blocks = ::chainActive.Height();
         adjusted_time = GetAdjustedTime();
-        tx_status = MakeWalletTxStatus(mi->second);
+        tx_status = MakeWalletTxStatus(node, mi->second);
         return true;
     }
-    WalletTx getWalletTxDetails(const uint256& txid,
+    WalletTx getWalletTxDetails(Node& node, const uint256& txid,
         WalletTxStatus& tx_status,
         WalletOrderForm& order_form,
         bool& in_mempool,
@@ -329,8 +331,8 @@ class WalletImpl : public Wallet
             adjusted_time = GetAdjustedTime();
             in_mempool = mi->second.InMempool();
             order_form = mi->second.vOrderForm;
-            tx_status = MakeWalletTxStatus(mi->second);
-            return MakeWalletTx(m_wallet, mi->second);
+            tx_status = MakeWalletTxStatus(node, mi->second);
+            return MakeWalletTx(node, m_wallet, mi->second);
         }
         return {};
     }
@@ -358,10 +360,10 @@ class WalletImpl : public Wallet
         num_blocks = ::chainActive.Height();
         return true;
     }
-    CAmount getBalance() override { return m_wallet.GetBalance()[ColorIdentifier()]; }
-    CAmount getAvailableBalance(const CCoinControl& coin_control) override
+    CAmount getBalance(ColorIdentifier colorId) override { return m_wallet.GetBalance()[colorId]; }
+    CAmount getAvailableBalance(const CCoinControl& coin_control, ColorIdentifier colorId) override
     {
-        return m_wallet.GetAvailableBalance(&coin_control)[ColorIdentifier()];
+        return m_wallet.GetAvailableBalance(&coin_control)[colorId];
     }
     isminetype txinIsMine(const CTxIn& txin) override
     {
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
index 7a1c3efec5..9f337c65c4 100644
--- a/src/interfaces/wallet.h
+++ b/src/interfaces/wallet.h
@@ -11,6 +11,7 @@
 #include <script/standard.h>           // For CTxDestination
 #include <support/allocators/secure.h> // For SecureString
 #include <ui_interface.h>              // For ChangeType
+#include "node.h"
 
 #include <functional>
 #include <map>
@@ -166,19 +167,19 @@ class Wallet
     virtual CTransactionRef getTx(const uint256& txid) = 0;
 
     //! Get transaction information.
-    virtual WalletTx getWalletTx(const uint256& txid) = 0;
+    virtual WalletTx getWalletTx(Node& node, const uint256& txid) = 0;
 
     //! Get list of all wallet transactions.
-    virtual std::vector<WalletTx> getWalletTxs() = 0;
+    virtual std::vector<WalletTx> getWalletTxs(Node& node) = 0;
 
     //! Try to get updated status for a particular transaction, if possible without blocking.
-    virtual bool tryGetTxStatus(const uint256& txid,
+    virtual bool tryGetTxStatus(Node& node, const uint256& txid,
         WalletTxStatus& tx_status,
         int& num_blocks,
         int64_t& adjusted_time) = 0;
 
     //! Get transaction details.
-    virtual WalletTx getWalletTxDetails(const uint256& txid,
+    virtual WalletTx getWalletTxDetails(Node& node, const uint256& txid,
         WalletTxStatus& tx_status,
         WalletOrderForm& order_form,
         bool& in_mempool,
@@ -192,10 +193,10 @@ class Wallet
     virtual bool tryGetBalances(WalletBalances& balances, int& num_blocks) = 0;
 
     //! Get balance.
-    virtual CAmount getBalance() = 0;
+    virtual CAmount getBalance(ColorIdentifier colorId = ColorIdentifier()) = 0;
 
     //! Get available balance.
-    virtual CAmount getAvailableBalance(const CCoinControl& coin_control) = 0;
+    virtual CAmount getAvailableBalance(const CCoinControl& coin_control, ColorIdentifier colorId = ColorIdentifier()) = 0;
 
     //! Return whether transaction input belongs to wallet.
     virtual isminetype txinIsMine(const CTxIn& txin) = 0;
@@ -311,32 +312,35 @@ struct WalletBalances
     bool have_watch_only;
     TxColoredCoinBalancesMap watch_only_balances;
     TxColoredCoinBalancesMap unconfirmed_watch_only_balances;
+    std::set<ColorIdentifier> tokens;
+    std::set<ColorIdentifier>::iterator tokenIndex;
 
     WalletBalances(){
         have_watch_only = false;
+        tokenIndex = tokens.begin();
     }
 
-    CAmount getBalance(const ColorIdentifier& colorId = ColorIdentifier()) const
+    CAmount getBalance() const
     {
-        auto it = balances.find(colorId);
+        auto it = balances.find(*tokenIndex);
         return it != balances.end() ? it->second : 0;
     }
 
-    CAmount getUnconfirmedBalance(const ColorIdentifier& colorId = ColorIdentifier()) const
+    CAmount getUnconfirmedBalance() const
     {
-        auto it = unconfirmed_balances.find(colorId);
+        auto it = unconfirmed_balances.find(*tokenIndex);
         return it != unconfirmed_balances.end() ? it->second : 0;
     }
 
-    CAmount getWatchOnlyBalance(const ColorIdentifier& colorId = ColorIdentifier()) const
+    CAmount getWatchOnlyBalance() const
     {
-        auto it = watch_only_balances.find(colorId);
+        auto it = watch_only_balances.find(*tokenIndex);
         return it != watch_only_balances.end() ? it->second : 0;
     }
 
-    CAmount getUnconfirmedWatchOnlyBalance(const ColorIdentifier& colorId = ColorIdentifier()) const
+    CAmount getUnconfirmedWatchOnlyBalance() const
     {
-        auto it = unconfirmed_watch_only_balances.find(colorId);
+        auto it = unconfirmed_watch_only_balances.find(*tokenIndex);
         return it != unconfirmed_watch_only_balances.end() ? it->second : 0;
     }
 
@@ -346,6 +350,53 @@ struct WalletBalances
                watch_only_balances != prev.watch_only_balances ||
                unconfirmed_watch_only_balances != prev.unconfirmed_watch_only_balances;
     }
+
+    //collect all tokens in the wallet from all the balance lists
+    void refreshTokens() {
+        tokens.clear();
+
+        for(auto pair:balances)
+            tokens.insert(pair.first);
+        for(auto pair:unconfirmed_balances)
+            tokens.insert(pair.first);
+        for(auto pair:watch_only_balances)
+            tokens.insert(pair.first);
+        for(auto pair:unconfirmed_watch_only_balances)
+            tokens.insert(pair.first);
+
+        tokenIndex = tokens.begin();
+    }
+
+    void prev()
+    {
+        if(tokenIndex != tokens.begin())
+            tokenIndex--;
+        else
+        {
+            tokenIndex = tokens.end();
+            tokenIndex--;
+        }
+    }
+
+    void next()
+    {
+        if(tokenIndex != tokens.end())
+        {
+            tokenIndex++;
+            if(tokenIndex == tokens.end())
+                tokenIndex = tokens.begin();
+        }
+    }
+
+    bool isToken()
+    {
+        return (*tokenIndex).type != TokenTypes::NONE;
+    }
+
+    std::string getTokenName()
+    {
+        return (*tokenIndex).toHexString();
+    }
 };
 
 // Wallet transaction information.
@@ -362,6 +413,8 @@ struct WalletTx
     int64_t time;
     std::map<std::string, std::string> value_map;
     bool is_coinbase;
+    bool is_tokenInput;
+    bool is_tokenOutput;
 
     CAmount getCredit(const ColorIdentifier& colorId = ColorIdentifier()) const
     {
@@ -380,6 +433,40 @@ struct WalletTx
         auto it = changes.find(colorId);
         return it != changes.end() ? it->second : 0;
     }
+
+    std::set<ColorIdentifier> getAllColorIds(Node& node) const
+    {
+        std::set<ColorIdentifier> txColorIdSet{ColorIdentifier()};
+        //Get all color ids from all inputs and outputs
+        for(auto in :tx->vin)
+        {
+            Coin prev;
+            if(node.getUnspentOutput(in.prevout, prev))
+                txColorIdSet.insert(GetColorIdFromScript(prev.out.scriptPubKey));
+        }
+        for(auto out:tx->vout)
+            txColorIdSet.insert(GetColorIdFromScript(out.scriptPubKey));
+
+        return txColorIdSet;
+    }
+
+    bool isTokenInput(Node& node) const
+    {
+        Coin prev;
+        for(auto in :tx->vin)
+            if(node.getUnspentOutput(in.prevout, prev) && GetColorIdFromScript(prev.out.scriptPubKey).type != TokenTypes::NONE)
+                return true;
+        return false;
+    }
+
+    bool isTokenOutput() const
+    {
+        for(auto out:tx->vout)
+            if(GetColorIdFromScript(out.scriptPubKey).type != TokenTypes::NONE)
+                return true;
+
+        return false;
+    }
 };
 
 //! Updated transaction status.
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 2f4b76d6bc..f8c9d489a6 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -213,3 +213,21 @@ bool IsValidDestinationString(const std::string& str)
 {
     return IsValidDestinationString(str, Params());
 }
+
+bool IsColoredDestination(const std::string& str, ColorIdentifier* colorId)
+{
+   CTxDestination dest = DecodeDestination(str, Params());
+    if(dest.which() == 3)
+    {
+        if(colorId)
+            *colorId = boost::get<CColorKeyID>(dest).color;
+        return true;
+    }
+    else if(dest.which() == 4)
+    {
+        if(colorId)
+            *colorId = boost::get<CColorScriptID>(dest).color;
+        return true;
+    }
+   return false;
+}
\ No newline at end of file
diff --git a/src/key_io.h b/src/key_io.h
index d80c08f49c..eba5c58ce7 100644
--- a/src/key_io.h
+++ b/src/key_io.h
@@ -25,5 +25,6 @@ std::string EncodeDestination(const CTxDestination& dest);
 CTxDestination DecodeDestination(const std::string& str);
 bool IsValidDestinationString(const std::string& str);
 bool IsValidDestinationString(const std::string& str, const CChainParams& params);
+bool IsColoredDestination(const std::string& str, ColorIdentifier* colorId);
 
 #endif // BITCOIN_KEY_IO_H
diff --git a/src/outputtype.cpp b/src/outputtype.cpp
index a6ad092812..0e367a5dbd 100644
--- a/src/outputtype.cpp
+++ b/src/outputtype.cpp
@@ -15,11 +15,12 @@
 #include <string>
 
 
-CTxDestination GetDestinationForKey(const CPubKey& key, OutputType type)
+CTxDestination GetDestinationForKey(const CPubKey& key, OutputType type, const ColorIdentifier& colorId)
 {
     switch (type) {
     case OutputType::CHANGE_AUTO:
     case OutputType::LEGACY: return key.GetID();
+    case OutputType::TOKEN: return CColorKeyID(key.GetID(), colorId); 
     default: assert(false);
     }
 }
@@ -35,7 +36,7 @@ std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key)
     }
 }
 
-CTxDestination AddAndGetDestinationForScript(CKeyStore& keystore, const CScript& script, OutputType type)
+CTxDestination AddAndGetDestinationForScript(CKeyStore& keystore, const CScript& script, OutputType type, const ColorIdentifier& colorId)
 {
     // Add script to keystore
     keystore.AddCScript(script);
@@ -43,6 +44,8 @@ CTxDestination AddAndGetDestinationForScript(CKeyStore& keystore, const CScript&
     switch (type) {
     case OutputType::LEGACY:
         return CScriptID(script);
+    case OutputType::TOKEN:
+        return CColorScriptID(script, colorId);
     default: assert(false);
     }
 }
diff --git a/src/outputtype.h b/src/outputtype.h
index 0dcf0b3367..69957d7eb1 100644
--- a/src/outputtype.h
+++ b/src/outputtype.h
@@ -14,14 +14,14 @@
 
 enum class OutputType {
     LEGACY,
-
+    TOKEN,
     CHANGE_AUTO,
 };
 
 /**
  * Get a destination of the requested type (if possible) to the specified key.
  */
-CTxDestination GetDestinationForKey(const CPubKey& key, OutputType);
+CTxDestination GetDestinationForKey(const CPubKey& key, OutputType, const ColorIdentifier& colorId);
 
 /** Get all destinations (potentially) supported by the wallet for the given key. */
 std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key);
@@ -31,7 +31,7 @@ std::vector<CTxDestination> GetAllDestinationsForKey(const CPubKey& key);
  * This function will automatically add the script (and any other
  * necessary scripts) to the keystore.
  */
-CTxDestination AddAndGetDestinationForScript(CKeyStore& keystore, const CScript& script, OutputType);
+CTxDestination AddAndGetDestinationForScript(CKeyStore& keystore, const CScript& script, OutputType, const ColorIdentifier& colorId);
 
 #endif // BITCOIN_OUTPUTTYPE_H
 
diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
index 4a394bafab..d870153e4e 100644
--- a/src/qt/CMakeLists.txt
+++ b/src/qt/CMakeLists.txt
@@ -3,7 +3,7 @@
 project(tapyrus-qt)
 
 # This ensure that AUTOMOC doesn't run on generated files.
-cmake_policy(SET CMP0071 OLD)
+cmake_policy(SET CMP0071 NEW)
 
 include(BrewHelper)
 find_brew_prefix(QT5_PREFIX qt5)
@@ -11,8 +11,6 @@ find_brew_prefix(QT5_PREFIX qt5)
 set(QT_REQUIRED_COMPONENTS Core Widgets Network DBus Test)
 find_package(Qt5 COMPONENTS ${QT_REQUIRED_COMPONENTS} REQUIRED HINTS "${QT5_PREFIX}")
 
-find_package(QREncode REQUIRED)
-
 # Find out more about Qt. This is similar to
 # http://code.qt.io/cgit/qt/qtwebkit.git/tree/Source/cmake/OptionsQt.cmake
 get_target_property(QT_CORE_TYPE Qt5::Core TYPE)
@@ -157,17 +155,32 @@ add_library(tapyrus-qt-base
 	qrc_tapyrus_locale.cpp
 )
 
+# Linux support
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	list(APPEND QT_PLUGIN_COMPONENTS QXcbIntegrationPlugin)
+	list(APPEND QT_PLUGIN_PLATFORM_DEFINITIONS -DQT_QPA_PLATFORM_XCB=1)
+endif()
 # Windows support
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	list(APPEND QT_PLUGIN_COMPONENTS QWindowsIntegrationPlugin)
+	list(APPEND QT_PLUGIN_PLATFORM_DEFINITIONS -DQT_QPA_PLATFORM_WINDOWS=1)
 	target_sources(tapyrus-qt-base PRIVATE winshutdownmonitor.cpp)
 endif()
-
-target_include_directories(tapyrus-qt-base
-	PUBLIC
-		.
-		${CMAKE_CURRENT_BINARY_DIR}
-		${CMAKE_CURRENT_BINARY_DIR}/forms
-)
+# OSX support
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	list(APPEND QT_PLUGIN_COMPONENTS QCocoaIntegrationPlugin)
+	list(APPEND QT_PLUGIN_PLATFORM_DEFINITIONS -DQT_QPA_PLATFORM_COCOA=1)
+	target_sources(tapyrus-qt-base PRIVATE
+		macdockiconhandler.mm
+		macnotificationhandler.mm
+	)
+	set_property(TARGET tapyrus-qt-base PROPERTY AUTOMOC_MOC_OPTIONS "-DQ_OS_MAC")
+	target_link_libraries(tapyrus-qt-base
+		"-framework Foundation"
+		"-framework ApplicationServices"
+		"-framework AppKit"
+	)
+endif()
 
 target_link_libraries(tapyrus-qt-base
 	server
@@ -175,12 +188,8 @@ target_link_libraries(tapyrus-qt-base
 	Qt5::Widgets
 	Qt5::Network
 	Qt5::DBus
-	qrencode
 )
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	set_property(TARGET tapyrus-qt-base PROPERTY AUTOMOC_MOC_OPTIONS "-DQ_OS_MAC")
-endif()
 
 # Wallet
 if(BUILD_TAPYRUS_WALLET)
@@ -218,6 +227,11 @@ if(BUILD_TAPYRUS_WALLET)
 	)
 
 	target_link_libraries(tapyrus-qt-base wallet)
+
+	if(ENABLE_QRCODE)
+ 		find_package(QREncode REQUIRED)
+ 		target_link_libraries(tapyrus-qt-base QREncode::qrencode)
+ 	endif()
 endif()
 
 # The executable
diff --git a/src/qt/README.md b/src/qt/README.md
index 1acd71b48d..3c8cd5335e 100644
--- a/src/qt/README.md
+++ b/src/qt/README.md
@@ -60,7 +60,7 @@ Represents the view to a single wallet.
 
 * UI elements like BitcoinAmountField, which inherit from QWidget.
 * `bitcoinstrings.cpp`: automatically generated
-* `bitcoinunits.(h/cpp)`: TPC / mTPC / etc handling
+* `TapyrusUnits.(h/cpp)`: TPC / mTPC / etc handling
 * `callback.h`
 * `guiconstants.h`: UI colors, app name, etc
 * `guiutil.h`: several helper functions
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
index ac500bd5ad..03880ebc88 100644
--- a/src/qt/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
@@ -336,7 +336,7 @@ void AddressTableModel::updateEntry(const QString &address,
     priv->updateEntry(address, label, isMine, purpose, status);
 }
 
-QString AddressTableModel::addRow(const QString &type, const QString &label, const QString &address, const OutputType address_type)
+QString AddressTableModel::addRow(const QString &type, const QString &label, const QString &address, const QString &colorin, const OutputType address_type)
 {
     std::string strLabel = label.toStdString();
     std::string strAddress = address.toStdString();
@@ -363,6 +363,7 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con
     else if(type == Receive)
     {
         // Generate a new address to associate with given label
+        ColorIdentifier colorId(colorin.length() ? ParseHex(colorin.toStdString().c_str()) : ColorIdentifier());
         CPubKey newKey;
         if(!walletModel->wallet().getKeyFromPool(false /* internal */, newKey))
         {
@@ -379,7 +380,7 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con
                 return QString();
             }
         }
-        strAddress = EncodeDestination(GetDestinationForKey(newKey, address_type));
+        strAddress = EncodeDestination(GetDestinationForKey(newKey, address_type, colorId));
     }
     else
     {
diff --git a/src/qt/addresstablemodel.h b/src/qt/addresstablemodel.h
index 41bed4e290..6e3176d5a8 100644
--- a/src/qt/addresstablemodel.h
+++ b/src/qt/addresstablemodel.h
@@ -65,7 +65,7 @@ class AddressTableModel : public QAbstractTableModel
     /* Add an address to the model.
        Returns the added address on success, and an empty string otherwise.
      */
-    QString addRow(const QString &type, const QString &label, const QString &address, const OutputType address_type);
+    QString addRow(const QString &type, const QString &label, const QString &address, const QString &colorid, const OutputType address_type);
 
     /** Look up label for address in address book, if not found return empty string. */
     QString labelForAddress(const QString &address) const;
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 7154ac14be..c40a6703a7 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -247,13 +247,13 @@ static void BlockTipChanged(ClientModel *clientmodel, bool initialSync, int heig
 void ClientModel::subscribeToCoreSignals()
 {
     // Connect signals to client
-    m_handler_show_progress = m_node.handleShowProgress(boost::bind(ShowProgress, this, _1, _2));
-    m_handler_notify_num_connections_changed = m_node.handleNotifyNumConnectionsChanged(boost::bind(NotifyNumConnectionsChanged, this, _1));
-    m_handler_notify_network_active_changed = m_node.handleNotifyNetworkActiveChanged(boost::bind(NotifyNetworkActiveChanged, this, _1));
+    m_handler_show_progress = m_node.handleShowProgress(boost::bind(ShowProgress, this, boost::placeholders::_1, boost::placeholders::_2));
+    m_handler_notify_num_connections_changed = m_node.handleNotifyNumConnectionsChanged(boost::bind(NotifyNumConnectionsChanged, this, boost::placeholders::_1));
+    m_handler_notify_network_active_changed = m_node.handleNotifyNetworkActiveChanged(boost::bind(NotifyNetworkActiveChanged, this, boost::placeholders::_1));
     m_handler_notify_alert_changed = m_node.handleNotifyAlertChanged(boost::bind(NotifyAlertChanged, this));
     m_handler_banned_list_changed = m_node.handleBannedListChanged(boost::bind(BannedListChanged, this));
-    m_handler_notify_block_tip = m_node.handleNotifyBlockTip(boost::bind(BlockTipChanged, this, _1, _2, _3, _4, false));
-    m_handler_notify_header_tip = m_node.handleNotifyHeaderTip(boost::bind(BlockTipChanged, this, _1, _2, _3, _4, true));
+    m_handler_notify_block_tip = m_node.handleNotifyBlockTip(boost::bind(BlockTipChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, false));
+    m_handler_notify_header_tip = m_node.handleNotifyHeaderTip(boost::bind(BlockTipChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, true));
 }
 
 void ClientModel::unsubscribeFromCoreSignals()
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 14edf39052..178b7a938f 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -233,7 +233,7 @@ void CoinControlDialog::showMenu(const QPoint &point)
 // context menu action: copy amount
 void CoinControlDialog::copyAmount()
 {
-    GUIUtil::setClipboard(BitcoinUnits::removeSpaces(contextMenuItem->text(COLUMN_AMOUNT)));
+    GUIUtil::setClipboard(TapyrusUnits::removeSpaces(contextMenuItem->text(COLUMN_AMOUNT)));
 }
 
 // context menu action: copy label
@@ -535,7 +535,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
     }
 
     // actually update labels
-    int nDisplayUnit = BitcoinUnits::TPC;
+    int nDisplayUnit = TapyrusUnits::TPC;
     if (model && model->getOptionsModel())
         nDisplayUnit = model->getOptionsModel()->getDisplayUnit();
 
@@ -555,12 +555,12 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
 
     // stats
     l1->setText(QString::number(nQuantity));                                 // Quantity
-    l2->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nAmount));        // Amount
-    l3->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nPayFee));        // Fee
-    l4->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nAfterFee));      // After Fee
+    l2->setText(TapyrusUnits::formatWithUnit(nDisplayUnit, nAmount));        // Amount
+    l3->setText(TapyrusUnits::formatWithUnit(nDisplayUnit, nPayFee));        // Fee
+    l4->setText(TapyrusUnits::formatWithUnit(nDisplayUnit, nAfterFee));      // After Fee
     l5->setText(((nBytes > 0) ? ASYMP_UTF8 : "") + QString::number(nBytes));        // Bytes
     l7->setText(fDust ? tr("yes") : tr("no"));                               // Dust
-    l8->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nChange));        // Change
+    l8->setText(TapyrusUnits::formatWithUnit(nDisplayUnit, nChange));        // Change
     if (nPayFee > 0)
     {
         l3->setText(ASYMP_UTF8 + l3->text());
@@ -682,7 +682,7 @@ void CoinControlDialog::updateView()
             }
 
             // amount
-            itemOutput->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, out.txout.nValue));
+            itemOutput->setText(COLUMN_AMOUNT, TapyrusUnits::format(nDisplayUnit, out.txout.nValue));
             itemOutput->setData(COLUMN_AMOUNT, Qt::UserRole, QVariant((qlonglong)out.txout.nValue)); // padding so that sorting works correctly
 
             // date
@@ -716,7 +716,7 @@ void CoinControlDialog::updateView()
         if (treeMode)
         {
             itemWalletAddress->setText(COLUMN_CHECKBOX, "(" + QString::number(nChildren) + ")");
-            itemWalletAddress->setText(COLUMN_AMOUNT, BitcoinUnits::format(nDisplayUnit, nSum));
+            itemWalletAddress->setText(COLUMN_AMOUNT, TapyrusUnits::format(nDisplayUnit, nSum));
             itemWalletAddress->setData(COLUMN_AMOUNT, Qt::UserRole, QVariant((qlonglong)nSum));
         }
     }
diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp
index 613733dda4..0de6e95cbf 100644
--- a/src/qt/editaddressdialog.cpp
+++ b/src/qt/editaddressdialog.cpp
@@ -78,7 +78,7 @@ bool EditAddressDialog::saveCurrentRow()
         address = model->addRow(
                 AddressTableModel::Send,
                 ui->labelEdit->text(),
-                ui->addressEdit->text(),
+                ui->addressEdit->text(), "",
                 model->GetDefaultAddressType());
         break;
     case EditReceivingAddress:
diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui
index d311344bd4..11ab97b9c8 100644
--- a/src/qt/forms/overviewpage.ui
+++ b/src/qt/forms/overviewpage.ui
@@ -114,9 +114,19 @@
             <property name="spacing">
              <number>12</number>
             </property>
-            <item row="2" column="2">
-             <widget class="QLabel" name="labelWatchPending">
-              <property name="font">
+            <item row="0" column="0">
+             <widget class="QLabel" name="labelToken">
+              <property name="text">
+               <string>Token:</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QLabel" name="labelTokenName">
+               <property name="font">
                <font>
                 <weight>75</weight>
                 <bold>true</bold>
@@ -126,10 +136,10 @@
                <cursorShape>IBeamCursor</cursorShape>
               </property>
               <property name="toolTip">
-               <string>Unconfirmed transactions to watch-only addresses</string>
+               <string>Color of the Token or TPC </string>
               </property>
               <property name="text">
-               <string notr="true">0.000 000 00 TPC</string>
+               <string notr="true">TPC</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -139,8 +149,25 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
-             <widget class="QLabel" name="labelUnconfirmed">
+            <item row="0" column="2">
+             <widget class="QLabel" name="labelWatchonly">
+              <property name="text">
+               <string>Watch-only:</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="labelBalanceText">
+              <property name="text">
+               <string>Available:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QLabel" name="labelBalance">
               <property name="font">
                <font>
                 <weight>75</weight>
@@ -151,7 +178,7 @@
                <cursorShape>IBeamCursor</cursorShape>
               </property>
               <property name="toolTip">
-               <string>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</string>
+               <string>Your current spendable balance</string>
               </property>
               <property name="text">
                <string notr="true">0.000 000 00 TPC</string>
@@ -164,54 +191,33 @@
               </property>
              </widget>
             </item>
-            <item row="3" column="0" colspan="2">
-             <widget class="Line" name="line">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="2">
-             <widget class="Line" name="lineWatchBalance">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
+            <item row="1" column="2">
+             <widget class="QLabel" name="labelWatchAvailable">
+              <property name="font">
+               <font>
+                <weight>75</weight>
+                <bold>true</bold>
+               </font>
               </property>
-              <property name="minimumSize">
-               <size>
-                <width>140</width>
-                <height>0</height>
-               </size>
+              <property name="cursor">
+               <cursorShape>IBeamCursor</cursorShape>
               </property>
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+              <property name="toolTip">
+               <string>Your current balance in watch-only addresses</string>
               </property>
-             </widget>
-            </item>
-            <item row="4" column="0">
-             <widget class="QLabel" name="labelTotalText">
               <property name="text">
-               <string>Total:</string>
+               <string notr="true">0.000 000 00 TPC</string>
               </property>
-             </widget>
-            </item>
-            <item row="2" column="3">
-             <spacer name="horizontalSpacer_2">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
+              <property name="textInteractionFlags">
+               <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
               </property>
-             </spacer>
+             </widget>
             </item>
-            <item row="4" column="1">
-             <widget class="QLabel" name="labelTotal">
+            <item row="2" column="1">
+             <widget class="QLabel" name="labelUnconfirmed">
               <property name="font">
                <font>
                 <weight>75</weight>
@@ -222,7 +228,7 @@
                <cursorShape>IBeamCursor</cursorShape>
               </property>
               <property name="toolTip">
-               <string>Your current total balance</string>
+               <string>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</string>
               </property>
               <property name="text">
                <string notr="true">0.000 000 00 TPC</string>
@@ -235,8 +241,8 @@
               </property>
              </widget>
             </item>
-            <item row="4" column="2">
-             <widget class="QLabel" name="labelWatchTotal">
+            <item row="2" column="2">
+             <widget class="QLabel" name="labelWatchPending">
               <property name="font">
                <font>
                 <weight>75</weight>
@@ -247,7 +253,7 @@
                <cursorShape>IBeamCursor</cursorShape>
               </property>
               <property name="toolTip">
-               <string>Current total balance in watch-only addresses</string>
+               <string>Unconfirmed transactions to watch-only addresses</string>
               </property>
               <property name="text">
                <string notr="true">0.000 000 00 TPC</string>
@@ -260,25 +266,54 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="2">
-             <widget class="QLabel" name="labelWatchonly">
-              <property name="text">
-               <string>Watch-only:</string>
+            <item row="2" column="3">
+             <spacer name="horizontalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
               </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item row="3" column="0" colspan="2">
+             <widget class="Line" name="line">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="labelBalanceText">
+            <item row="3" column="2">
+             <widget class="Line" name="lineWatchBalance">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>140</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="0">
+             <widget class="QLabel" name="labelTotalText">
               <property name="text">
-               <string>Available:</string>
+               <string>Total:</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QLabel" name="labelBalance">
+            <item row="4" column="1">
+             <widget class="QLabel" name="labelTotal">
               <property name="font">
                <font>
                 <weight>75</weight>
@@ -289,7 +324,7 @@
                <cursorShape>IBeamCursor</cursorShape>
               </property>
               <property name="toolTip">
-               <string>Your current spendable balance</string>
+               <string>Your current total balance</string>
               </property>
               <property name="text">
                <string notr="true">0.000 000 00 TPC</string>
@@ -302,8 +337,8 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="2">
-             <widget class="QLabel" name="labelWatchAvailable">
+            <item row="4" column="2">
+             <widget class="QLabel" name="labelWatchTotal">
               <property name="font">
                <font>
                 <weight>75</weight>
@@ -314,7 +349,7 @@
                <cursorShape>IBeamCursor</cursorShape>
               </property>
               <property name="toolTip">
-               <string>Your current balance in watch-only addresses</string>
+               <string>Current total balance in watch-only addresses</string>
               </property>
               <property name="text">
                <string notr="true">0.000 000 00 TPC</string>
@@ -327,6 +362,50 @@
               </property>
              </widget>
             </item>
+            <item row="5" column="0">
+              <widget class="QPushButton" name="prevButton">
+              <property name="enabled">
+                <bool>true</bool>
+              </property>
+              <property name="maximumSize">
+                <size>
+                <width>300</width>
+                <height>16777215</height>
+                </size>
+              </property>
+              <property name="toolTip">
+                <string>Click to view next token balance.</string>
+              </property>
+              <property name="text">
+                <string>Prev</string>
+              </property>
+              <property name="flat">
+                <bool>false</bool>
+              </property>
+              </widget>
+            </item>
+            <item row="5" column="2">
+              <widget class="QPushButton" name="nextButton">
+              <property name="enabled">
+                <bool>true</bool>
+              </property>
+              <property name="maximumSize">
+                <size>
+                <width>300</width>
+                <height>16777215</height>
+                </size>
+              </property>
+              <property name="toolTip">
+                <string>Click to view next token balance.</string>
+              </property>
+              <property name="text">
+                <string>Next</string>
+              </property>
+              <property name="flat">
+                <bool>false</bool>
+              </property>
+              </widget>
+            </item>
             <item row="2" column="0">
              <widget class="QLabel" name="labelPendingText">
               <property name="text">
diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui
index d02f2615c1..176639c97e 100644
--- a/src/qt/forms/receivecoinsdialog.ui
+++ b/src/qt/forms/receivecoinsdialog.ui
@@ -28,6 +28,36 @@
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <layout class="QGridLayout" name="gridLayout">
+        <item row="2" column="2">
+         <widget class="QLabel" name="label_5">
+          <property name="text">
+           <string>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="label_2">
+          <property name="toolTip">
+           <string>An optional label to associate with the new receiving address.</string>
+          </property>
+          <property name="text">
+           <string>&amp;Label:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="buddy">
+           <cstring>reqLabel</cstring>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="2">
+         <widget class="QLineEdit" name="reqLabel">
+          <property name="toolTip">
+           <string>An optional label to associate with the new receiving address.</string>
+          </property>
+         </widget>
+        </item>
         <item row="5" column="0">
          <widget class="QLabel" name="label">
           <property name="toolTip">
@@ -45,59 +75,59 @@
          </widget>
         </item>
         <item row="6" column="0">
-         <widget class="QLabel" name="label_3">
+         <widget class="QLabel" name="token">
           <property name="toolTip">
-           <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Tapyrus network.</string>
+           <string>A token name/color to receive tokens with the new receiving address.</string>
           </property>
           <property name="text">
-           <string>&amp;Message:</string>
+           <string>&amp;Token:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="buddy">
-           <cstring>reqMessage</cstring>
+           <cstring>tokenName</cstring>
           </property>
          </widget>
         </item>
-        <item row="4" column="2">
-         <widget class="QLineEdit" name="reqLabel">
+        <item row="6" column="2">
+         <widget class="QLineEdit" name="tokenName">
           <property name="toolTip">
-           <string>An optional label to associate with the new receiving address.</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="2">
-         <widget class="QLabel" name="label_5">
-          <property name="text">
-           <string>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</string>
+           <string>A token name/color to receive tokens with the new receiving address.</string>
           </property>
          </widget>
         </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="label_2">
+        <item row="7" column="0">
+         <widget class="QLabel" name="label_3">
           <property name="toolTip">
-           <string>An optional label to associate with the new receiving address.</string>
+           <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Tapyrus network.</string>
           </property>
           <property name="text">
-           <string>&amp;Label:</string>
+           <string>&amp;Message:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="buddy">
-           <cstring>reqLabel</cstring>
+           <cstring>reqMessage</cstring>
           </property>
          </widget>
         </item>
-        <item row="6" column="2">
+        <item row="7" column="2">
          <widget class="QLineEdit" name="reqMessage">
           <property name="toolTip">
            <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Tapyrus network.</string>
           </property>
          </widget>
         </item>
-        <item row="7" column="2">
+        <item row="8" column="0">
+         <widget class="QLabel" name="label_7">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item row="8" column="2">
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
            <widget class="QPushButton" name="receiveButton">
@@ -154,13 +184,7 @@
           </item>
          </layout>
         </item>
-        <item row="7" column="0">
-         <widget class="QLabel" name="label_7">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
+
         <item row="5" column="2">
          <layout class="QHBoxLayout" name="horizontalLayout_6">
           <item>
diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui
index a216fa5251..e8ed3fe6e1 100644
--- a/src/qt/forms/sendcoinsentry.ui
+++ b/src/qt/forms/sendcoinsentry.ui
@@ -150,6 +150,35 @@
      </widget>
     </item>
     <item row="2" column="0">
+     <widget class="QLabel" name="labelToken">
+      <property name="text">
+       <string>&amp;Token:</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+      <property name="buddy">
+       <cstring>labelTokenName</cstring>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1">
+     <widget class="QLabel" name="labelTokenName">
+      <property name="text">
+       <string>&amp;</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignLeft|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+      <property name="buddy">
+       <cstring>labelToken</cstring>
+      </property>
+      <property name="toolTip">
+       <string>Token type of the address</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="0">
      <widget class="QLabel" name="amountLabel">
       <property name="text">
        <string>A&amp;mount:</string>
@@ -162,7 +191,7 @@
       </property>
      </widget>
     </item>
-    <item row="2" column="1">
+    <item row="3" column="1">
      <layout class="QHBoxLayout" name="horizontalLayoutAmount" stretch="0,1,0">
       <item>
        <widget class="BitcoinAmountField" name="payAmount"/>
@@ -173,7 +202,7 @@
          <string>The fee will be deducted from the amount being sent. The recipient will receive less tpc than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</string>
         </property>
         <property name="text">
-         <string>S&amp;ubtract fee from amount</string>
+         <string>Subtract fee from amount</string>
         </property>
        </widget>
       </item>
@@ -186,7 +215,7 @@
       </item>
      </layout>
     </item>
-    <item row="3" column="0">
+    <item row="4" column="0">
      <widget class="QLabel" name="messageLabel">
       <property name="text">
        <string>Message:</string>
@@ -196,7 +225,7 @@
       </property>
      </widget>
     </item>
-    <item row="3" column="1">
+    <item row="4" column="1">
      <widget class="QLabel" name="messageTextLabel">
       <property name="toolTip">
        <string>A message that was attached to the tapyrus coin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Tapyrus network.</string>
@@ -206,7 +235,7 @@
       </property>
      </widget>
     </item>
-    <item row="4" column="0" colspan="2">
+    <item row="5" column="0" colspan="2">
      <widget class="Line" name="line">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 1537c93e24..c4e4cfb515 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -158,7 +158,7 @@ bool parseTapyrusURI(const QUrl &uri, SendCoinsRecipient *out)
         {
             if(!i->second.isEmpty())
             {
-                if(!BitcoinUnits::parse(BitcoinUnits::TPC, i->second, &rv.amount))
+                if(!TapyrusUnits::parse(TapyrusUnits::TPC, i->second, &rv.amount))
                 {
                     return false;
                 }
@@ -189,7 +189,7 @@ QString formatTapyrusURI(const SendCoinsRecipient &info)
 
     if (info.amount)
     {
-        ret += QString("?amount=%1").arg(BitcoinUnits::format(BitcoinUnits::TPC, info.amount, false, BitcoinUnits::separatorNever));
+        ret += QString("?amount=%1").arg(TapyrusUnits::format(TapyrusUnits::TPC, info.amount, false, TapyrusUnits::separatorNever));
         paramCount++;
     }
 
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index cd4687fbd1..aae3e629a9 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -108,7 +108,7 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
     }
     ui->thirdPartyTxUrls->setPlaceholderText("https://example.com/tx/%s");
 
-    ui->unit->setModel(new BitcoinUnits(this));
+    ui->unit->setModel(new TapyrusUnits(this));
 
     /* Widget-to-option mapper */
     mapper = new QDataWidgetMapper(this);
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index fb265a93b7..5fc79789db 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -67,7 +67,7 @@ void OptionsModel::Init(bool resetSettings)
 
     // Display
     if (!settings.contains("nDisplayUnit"))
-        settings.setValue("nDisplayUnit", BitcoinUnits::TPC);
+        settings.setValue("nDisplayUnit", TapyrusUnits::TPC);
     nDisplayUnit = settings.value("nDisplayUnit").toInt();
 
     if (!settings.contains("strThirdPartyTxUrls"))
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index f2ef5acbf0..3bde9cddc4 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -44,7 +44,7 @@ class OptionsModel : public QAbstractListModel
         ProxyUseTor,            // bool
         ProxyIPTor,             // QString
         ProxyPortTor,           // int
-        DisplayUnit,            // BitcoinUnits::Unit
+        DisplayUnit,            // TapyrusUnits::Unit
         ThirdPartyTxUrls,       // QString
         Language,               // QString
         CoinControlFeatures,    // bool
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index aa3b817677..9679842f49 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -14,7 +14,6 @@
 #include <qt/transactionfilterproxy.h>
 #include <qt/transactiontablemodel.h>
 #include <qt/walletmodel.h>
-
 #include <QAbstractItemDelegate>
 #include <QPainter>
 
@@ -28,7 +27,7 @@ class TxViewDelegate : public QAbstractItemDelegate
     Q_OBJECT
 public:
     explicit TxViewDelegate(const PlatformStyle *_platformStyle, QObject *parent=nullptr):
-        QAbstractItemDelegate(parent), unit(BitcoinUnits::TPC),
+        QAbstractItemDelegate(parent), unit(TapyrusUnits::TPC),
         platformStyle(_platformStyle)
     {
 
@@ -86,7 +85,7 @@ class TxViewDelegate : public QAbstractItemDelegate
             foreground = option.palette.color(QPalette::Text);
         }
         painter->setPen(foreground);
-        QString amountText = BitcoinUnits::formatWithUnit(unit, amount, true, BitcoinUnits::separatorAlways);
+        QString amountText = TapyrusUnits::formatWithUnit(unit, amount, true, TapyrusUnits::separatorAlways);
         if(!confirmed)
         {
             amountText = QString("[") + amountText + QString("]");
@@ -119,8 +118,6 @@ OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent)
 {
     ui->setupUi(this);
 
-    m_balances.balances[ColorIdentifier()] = -1;
-
     // use a SingleColorIcon for the "out of sync warning" icon
     QIcon icon = platformStyle->SingleColorIcon(":/icons/warning");
     icon.addPixmap(icon.pixmap(QSize(64,64), QIcon::Normal), QIcon::Disabled); // also set the disabled icon because we are using a disabled QPushButton to work around missing HiDPI support of QLabel (https://bugreports.qt.io/browse/QTBUG-42503)
@@ -139,6 +136,9 @@ OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent)
     showOutOfSyncWarning(true);
     connect(ui->labelWalletStatus, SIGNAL(clicked()), this, SLOT(handleOutOfSyncWarningClicks()));
     connect(ui->labelTransactionsStatus, SIGNAL(clicked()), this, SLOT(handleOutOfSyncWarningClicks()));
+    connect(ui->nextButton, SIGNAL(clicked()), this, SLOT(next()));
+    connect(ui->prevButton, SIGNAL(clicked()), this, SLOT(prev()));
+
 }
 
 void OverviewPage::handleTransactionClicked(const QModelIndex &index)
@@ -157,22 +157,44 @@ OverviewPage::~OverviewPage()
     delete ui;
 }
 
-void OverviewPage::setBalance(const interfaces::WalletBalances& balances)
+void OverviewPage::updateBalances()
 {
     int unit = walletModel->getOptionsModel()->getDisplayUnit();
+    CAmount balance = m_balances.getBalance();
+    CAmount unconfirmed_balance = m_balances.getUnconfirmedBalance();
+    CAmount watch_only_balance = m_balances.getWatchOnlyBalance();
+    CAmount unconfirmed_watch_only_balance = m_balances.getUnconfirmedWatchOnlyBalance();
+
+    if(m_balances.isToken())
+        unit = TapyrusUnits::TOKEN;
+
+    ui->labelTokenName->setText(QString(m_balances.getTokenName().c_str()));
+    ui->labelBalance->setText(TapyrusUnits::formatWithUnit(unit, balance, false, TapyrusUnits::separatorAlways));
+    ui->labelUnconfirmed->setText(TapyrusUnits::formatWithUnit(unit, unconfirmed_balance, false, TapyrusUnits::separatorAlways));
+    ui->labelTotal->setText(TapyrusUnits::formatWithUnit(unit, balance + unconfirmed_balance, false, TapyrusUnits::separatorAlways));
+    ui->labelWatchAvailable->setText(TapyrusUnits::formatWithUnit(unit, watch_only_balance, false, TapyrusUnits::separatorAlways));
+    ui->labelWatchPending->setText(TapyrusUnits::formatWithUnit(unit, unconfirmed_watch_only_balance, false, TapyrusUnits::separatorAlways));
+    ui->labelWatchTotal->setText(TapyrusUnits::formatWithUnit(unit, watch_only_balance + unconfirmed_watch_only_balance, false, TapyrusUnits::separatorAlways));
+}
+
+void OverviewPage::prev()
+{
+    m_balances.prev();
+    updateBalances();
+}
+
+void OverviewPage::next()
+{
+    m_balances.next();
+    updateBalances();
+}
+
+void OverviewPage::setBalance(const interfaces::WalletBalances& balances)
+{
     m_balances = balances;
+    m_balances.refreshTokens();
 
-    CAmount balance = balances.getBalance();
-    CAmount unconfirmed_balance = balances.getUnconfirmedBalance();
-    CAmount watch_only_balance = balances.getWatchOnlyBalance();
-    CAmount unconfirmed_watch_only_balance = balances.getUnconfirmedWatchOnlyBalance();
-
-    ui->labelBalance->setText(BitcoinUnits::formatWithUnit(unit, balance, false, BitcoinUnits::separatorAlways));
-    ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, balance, false, BitcoinUnits::separatorAlways));
-    ui->labelTotal->setText(BitcoinUnits::formatWithUnit(unit, balance + unconfirmed_balance, false, BitcoinUnits::separatorAlways));
-    ui->labelWatchAvailable->setText(BitcoinUnits::formatWithUnit(unit, watch_only_balance, false, BitcoinUnits::separatorAlways));
-    ui->labelWatchPending->setText(BitcoinUnits::formatWithUnit(unit, unconfirmed_watch_only_balance, false, BitcoinUnits::separatorAlways));
-    ui->labelWatchTotal->setText(BitcoinUnits::formatWithUnit(unit, watch_only_balance + unconfirmed_watch_only_balance, false, BitcoinUnits::separatorAlways));
+    updateBalances();
 }
 
 // show/hide watch-only labels
@@ -236,6 +258,7 @@ void OverviewPage::updateDisplayUnit()
     {
         if (m_balances.getBalance() != -1) {
             setBalance(m_balances);
+            m_balances.refreshTokens();
         }
 
         // Update txdelegate->unit with the current unit
diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h
index 75100ae6f7..2857b071db 100644
--- a/src/qt/overviewpage.h
+++ b/src/qt/overviewpage.h
@@ -36,9 +36,12 @@ class OverviewPage : public QWidget
     void setClientModel(ClientModel *clientModel);
     void setWalletModel(WalletModel *walletModel);
     void showOutOfSyncWarning(bool fShow);
+    void updateBalances();
 
 public Q_SLOTS:
     void setBalance(const interfaces::WalletBalances& balances);
+    void prev();
+    void next();
 
 Q_SIGNALS:
     void transactionClicked(const QModelIndex &index);
@@ -53,6 +56,10 @@ public Q_SLOTS:
     TxViewDelegate *txdelegate;
     std::unique_ptr<TransactionFilterProxy> filter;
 
+    //list of tokens in the wallet for easy display.
+    std::set<ColorIdentifier> m_tokens;
+    std::set<ColorIdentifier>::iterator m_index;
+
 private Q_SLOTS:
     void updateDisplayUnit();
     void handleTransactionClicked(const QModelIndex &index);
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
index aca9f1a9e6..33f04bed67 100644
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -110,6 +110,7 @@ void ReceiveCoinsDialog::clear()
     ui->reqAmount->clear();
     ui->reqLabel->setText("");
     ui->reqMessage->setText("");
+    ui->tokenName->setText("");
     updateDisplayUnit();
 }
 
@@ -138,12 +139,14 @@ void ReceiveCoinsDialog::on_receiveButton_clicked()
 
     QString address;
     QString label = ui->reqLabel->text();
+    QString color = ui->tokenName->text();
+    const ColorIdentifier colorid(color.length() ? ParseHex(color.toStdString().c_str()) : ColorIdentifier());
     /* Generate new receiving address */
-    OutputType address_type = model->wallet().getDefaultAddressType();
+    OutputType address_type = ui->tokenName->text().isEmpty() ?  model->wallet().getDefaultAddressType() : OutputType::TOKEN;
 
-    address = model->getAddressTableModel()->addRow(AddressTableModel::Receive, label, "", address_type);
-    SendCoinsRecipient info(address, label,
-        ui->reqAmount->value(), ui->reqMessage->text());
+    address = model->getAddressTableModel()->addRow(AddressTableModel::Receive, label, "", color, address_type);
+    SendCoinsRecipient info(address, label, ui->reqAmount->value(), ui->reqMessage->text());
+    info.colorid = colorid;
     ReceiveRequestDialog *dialog = new ReceiveRequestDialog(this);
     dialog->setAttribute(Qt::WA_DeleteOnClose);
     dialog->setModel(model);
diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp
index 6ac2f2c694..b1e1a482a2 100644
--- a/src/qt/receiverequestdialog.cpp
+++ b/src/qt/receiverequestdialog.cpp
@@ -139,8 +139,10 @@ void ReceiveRequestDialog::update()
     html += "<b>"+tr("URI")+"</b>: ";
     html += "<a href=\""+uri+"\">" + GUIUtil::HtmlEscape(uri) + "</a><br>";
     html += "<b>"+tr("Address")+"</b>: " + GUIUtil::HtmlEscape(info.address) + "<br>";
+    if(info.colorid.type != TokenTypes::NONE)
+        html += "<b>"+tr("Token")+"</b>: " + info.colorid.toHexString().c_str() + "<br>";
     if(info.amount)
-        html += "<b>"+tr("Amount")+"</b>: " + BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), info.amount) + "<br>";
+        html += "<b>"+tr("Amount")+"</b>: " + (info.colorid.type == TokenTypes::NONE ? TapyrusUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), info.amount): TapyrusUnits::formatHtmlWithUnit(TapyrusUnits::TOKEN, info.amount) ) + "<br>";
     if(!info.label.isEmpty())
         html += "<b>"+tr("Label")+"</b>: " + GUIUtil::HtmlEscape(info.label) + "<br>";
     if(!info.message.isEmpty())
diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp
index 9eb6ff1c29..2bd7ea59a6 100644
--- a/src/qt/recentrequeststablemodel.cpp
+++ b/src/qt/recentrequeststablemodel.cpp
@@ -18,16 +18,14 @@ RecentRequestsTableModel::RecentRequestsTableModel(WalletModel *parent) :
     nReceiveRequestsMaxId = 0;
 
     // Load entries from wallet
-    std::vector<std::string> vReceiveRequests;
-    parent->loadReceiveRequests(vReceiveRequests);
+    std::vector<std::string> vReceiveRequests; 
     for (const std::string& request : vReceiveRequests)
         addNewRequest(request);
 
     /* These columns must match the indices in the ColumnIndex enumeration */
-    columns << tr("Date") << tr("Label") << tr("Message") << getAmountTitle();
-
-    connect(walletModel->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
-}
+    columns << tr("Date") << tr("Label") << tr("Message")  << tr("Token") << getAmountTitle();
+  ;
+}  
 
 RecentRequestsTableModel::~RecentRequestsTableModel()
 {
@@ -78,13 +76,16 @@ QVariant RecentRequestsTableModel::data(const QModelIndex &index, int role) cons
             {
                 return rec->recipient.message;
             }
+        case Token:
+            return QVariant(rec->recipient.colorid.toHexString().c_str());
+
         case Amount:
             if (rec->recipient.amount == 0 && role == Qt::DisplayRole)
                 return tr("(no amount requested)");
             else if (role == Qt::EditRole)
-                return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount, false, BitcoinUnits::separatorNever);
+                return rec->recipient.colorid.type == TokenTypes::NONE ?  TapyrusUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount, false, TapyrusUnits::separatorNever) : TapyrusUnits::formatWithUnit(TapyrusUnits::TOKEN, rec->recipient.amount);
             else
-                return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount);
+                return rec->recipient.colorid.type == TokenTypes::NONE ? TapyrusUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount) : TapyrusUnits::formatWithUnit(TapyrusUnits::TOKEN, rec->recipient.amount);
         }
     }
     else if (role == Qt::TextAlignmentRole)
@@ -122,7 +123,7 @@ void RecentRequestsTableModel::updateAmountColumnTitle()
 /** Gets title for amount column including current display unit if optionsModel reference available. */
 QString RecentRequestsTableModel::getAmountTitle()
 {
-    return (this->walletModel->getOptionsModel() != nullptr) ? tr("Requested") + " ("+BitcoinUnits::shortName(this->walletModel->getOptionsModel()->getDisplayUnit()) + ")" : "";
+    return (this->walletModel->getOptionsModel() != nullptr) ? tr("Requested") + " ("+TapyrusUnits::shortName(this->walletModel->getOptionsModel()->getDisplayUnit()) + ")" : "";
 }
 
 QModelIndex RecentRequestsTableModel::index(int row, int column, const QModelIndex &parent) const
@@ -228,6 +229,8 @@ bool RecentRequestEntryLessThan::operator()(RecentRequestEntry &left, RecentRequ
         return pLeft->recipient.label < pRight->recipient.label;
     case RecentRequestsTableModel::Message:
         return pLeft->recipient.message < pRight->recipient.message;
+    case RecentRequestsTableModel::Token:
+        return pLeft->recipient.colorid < pRight->recipient.colorid;
     case RecentRequestsTableModel::Amount:
         return pLeft->recipient.amount < pRight->recipient.amount;
     default:
diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h
index 67d8aa114c..710f33d340 100644
--- a/src/qt/recentrequeststablemodel.h
+++ b/src/qt/recentrequeststablemodel.h
@@ -65,7 +65,8 @@ class RecentRequestsTableModel: public QAbstractTableModel
         Date = 0,
         Label = 1,
         Message = 2,
-        Amount = 3,
+        Token = 3,
+        Amount = 4,
         NUMBER_OF_COLUMNS
     };
 
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index d3a789bbe2..9d6f69de00 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -269,7 +269,7 @@ void SendCoinsDialog::on_sendButton_clicked()
 
     // process prepareStatus and on error generate message shown to user
     processSendCoinsReturn(prepareStatus,
-        BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), currentTransaction.getTransactionFee()));
+        TapyrusUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), currentTransaction.getTransactionFee()));
 
     if(prepareStatus.status != WalletModel::OK) {
         fNewRecipientAllowed = true;
@@ -283,7 +283,7 @@ void SendCoinsDialog::on_sendButton_clicked()
     for (const SendCoinsRecipient &rcp : currentTransaction.getRecipients())
     {
         // generate bold amount string with wallet name in case of multiwallet
-        QString amount = "<b>" + BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), rcp.amount);
+        QString amount = "<b>" + model->isColoredAddress(rcp.address) ? TapyrusUnits::formatHtmlWithUnit(TapyrusUnits::TOKEN, rcp.amount) : TapyrusUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), rcp.amount);
         if (model->isMultiwallet()) {
             amount.append(" <u>"+tr("from wallet %1").arg(GUIUtil::HtmlEscape(model->getWalletName()))+"</u> ");
         }
@@ -327,7 +327,7 @@ void SendCoinsDialog::on_sendButton_clicked()
 
         // append transaction fee value
         questionString.append("<span style='color:#aa0000; font-weight:bold;'>");
-        questionString.append(BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), txFee));
+        questionString.append(TapyrusUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), txFee));
         questionString.append("</span><br />");
 
         // append RBF message according to transaction's signalling
@@ -344,13 +344,13 @@ void SendCoinsDialog::on_sendButton_clicked()
     questionString.append("<hr />");
     CAmount totalAmount = currentTransaction.getTotalTransactionAmount() + txFee;
     QStringList alternativeUnits;
-    for (BitcoinUnits::Unit u : BitcoinUnits::availableUnits())
+    for (TapyrusUnits::Unit u : TapyrusUnits::availableUnits())
     {
         if(u != model->getOptionsModel()->getDisplayUnit())
-            alternativeUnits.append(BitcoinUnits::formatHtmlWithUnit(u, totalAmount));
+            alternativeUnits.append(TapyrusUnits::formatHtmlWithUnit(u, totalAmount));
     }
     questionString.append(QString("<b>%1</b>: <b>%2</b>").arg(tr("Total Amount"))
-        .arg(BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), totalAmount)));
+        .arg(TapyrusUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), totalAmount)));
     questionString.append(QString("<br /><span style='font-size:10pt; font-weight:normal;'>(=%1)</span>")
         .arg(alternativeUnits.join(" " + tr("or") + " ")));
 
@@ -522,7 +522,7 @@ void SendCoinsDialog::setBalance(const interfaces::WalletBalances& balances)
 {
     if(model && model->getOptionsModel())
     {
-        ui->labelBalance->setText(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), balances.getBalance()));
+        ui->labelBalance->setText(TapyrusUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), balances.getBalance()));
     }
 }
 
@@ -569,7 +569,7 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn
         msgParams.second = CClientUIInterface::MSG_ERROR;
         break;
     case WalletModel::AbsurdFee:
-        msgParams.first = tr("A fee higher than %1 is considered an absurdly high fee.").arg(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), model->node().getMaxTxFee()));
+        msgParams.first = tr("A fee higher than %1 is considered an absurdly high fee.").arg(TapyrusUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), model->node().getMaxTxFee()));
         break;
     case WalletModel::PaymentRequestExpired:
         msgParams.first = tr("Payment request expired.");
@@ -613,8 +613,8 @@ void SendCoinsDialog::useAvailableBalance(SendCoinsEntry* entry)
         coin_control = *CoinControlDialog::coinControl();
     }
 
-    // Calculate available amount to send.
-    CAmount amount = model->wallet().getAvailableBalance(coin_control);
+    // get available amount to send from the entry
+    CAmount amount = entry->getAvailableBalance(coin_control);
     for (int i = 0; i < ui->entries->count(); ++i) {
         SendCoinsEntry* e = qobject_cast<SendCoinsEntry*>(ui->entries->itemAt(i)->widget());
         if (e && !e->isHidden() && e != entry) {
@@ -623,7 +623,7 @@ void SendCoinsDialog::useAvailableBalance(SendCoinsEntry* entry)
     }
 
     if (amount > 0) {
-      entry->checkSubtractFeeFromAmount();
+      //entry->checkSubtractFeeFromAmount();
       entry->setAmount(amount);
     } else {
       entry->setAmount(0);
@@ -656,7 +656,7 @@ void SendCoinsDialog::updateFeeMinimizedLabel()
     if (ui->radioSmartFee->isChecked())
         ui->labelFeeMinimized->setText(ui->labelSmartFee->text());
     else {
-        ui->labelFeeMinimized->setText(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), ui->customFee->value()) + "/kB");
+        ui->labelFeeMinimized->setText(TapyrusUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), ui->customFee->value()) + "/kB");
     }
 }
 
@@ -664,7 +664,7 @@ void SendCoinsDialog::updateMinFeeLabel()
 {
     if (model && model->getOptionsModel())
         ui->checkBoxMinimumFee->setText(tr("Pay only the required fee of %1").arg(
-            BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), model->wallet().getRequiredFee(1000)) + "/kB")
+            TapyrusUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), model->wallet().getRequiredFee(1000)) + "/kB")
         );
 }
 
@@ -692,7 +692,7 @@ void SendCoinsDialog::updateSmartFeeLabel()
     FeeReason reason;
     CFeeRate feeRate = CFeeRate(model->wallet().getMinimumFee(1000, coin_control, &returned_target, &reason));
 
-    ui->labelSmartFee->setText(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), feeRate.GetFeePerK()) + "/kB");
+    ui->labelSmartFee->setText(TapyrusUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), feeRate.GetFeePerK()) + "/kB");
 
     if (reason == FeeReason::FALLBACK) {
         ui->labelSmartFee2->show(); // (Smart fee not initialized yet. This usually takes a few blocks...)
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index d56656362c..1abad64f42 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -14,6 +14,7 @@
 #include <qt/guiutil.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
+#include <qt/tapyrusunits.h>
 
 #include <QApplication>
 #include <QClipboard>
@@ -79,6 +80,23 @@ void SendCoinsEntry::on_addressBookButton_clicked()
 void SendCoinsEntry::on_payTo_textChanged(const QString &address)
 {
     updateLabel(address);
+    if(model && model->isColoredAddress(address))
+    {
+        //unit is TOKEN
+        ui->payAmount->setDisplayUnit(TapyrusUnits::TOKEN);
+        ui->payAmount_is->setDisplayUnit(TapyrusUnits::TOKEN);
+        ui->payAmount_s->setDisplayUnit(TapyrusUnits::TOKEN);
+        ui->labelTokenName->setText(model->getColorFromAddress(address).toHexString().c_str());
+        ui->checkboxSubtractFeeFromAmount->setEnabled(false);
+        ui->checkboxSubtractFeeFromAmount->setCheckState(Qt::Unchecked);
+    }
+    else
+    {
+        updateDisplayUnit();
+        ui->labelTokenName->clear();
+        ui->checkboxSubtractFeeFromAmount->setEnabled(true);
+        ui->checkboxSubtractFeeFromAmount->setCheckState(Qt::Unchecked);
+    }
 }
 
 void SendCoinsEntry::setModel(WalletModel *_model)
@@ -96,6 +114,7 @@ void SendCoinsEntry::clear()
     // clear UI elements for normal payment
     ui->payTo->clear();
     ui->addAsLabel->clear();
+    ui->labelTokenName->clear();
     ui->payAmount->clear();
     ui->checkboxSubtractFeeFromAmount->setCheckState(Qt::Unchecked);
     ui->messageTextLabel->clear();
@@ -252,3 +271,10 @@ bool SendCoinsEntry::updateLabel(const QString &address)
 
     return false;
 }
+
+CAmount SendCoinsEntry::getAvailableBalance(CCoinControl& coin_control)
+{
+    const QString address = ui->payTo->text();
+    ColorIdentifier colorId = model->getColorFromAddress(address);
+    return model->wallet().getAvailableBalance(coin_control, colorId);
+}
\ No newline at end of file
diff --git a/src/qt/sendcoinsentry.h b/src/qt/sendcoinsentry.h
index 582516bac2..cf0ce90110 100644
--- a/src/qt/sendcoinsentry.h
+++ b/src/qt/sendcoinsentry.h
@@ -32,6 +32,7 @@ class SendCoinsEntry : public QStackedWidget
     void setModel(WalletModel *model);
     bool validate(interfaces::Node& node);
     SendCoinsRecipient getValue();
+    CAmount getAvailableBalance(CCoinControl& coin_control);
 
     /** Return whether the entry is still empty and unedited */
     bool isClear();
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index e438d22919..3620186f7b 100644
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -178,7 +178,7 @@ static void ShowProgress(SplashScreen *splash, const std::string &title, int nPr
 #ifdef ENABLE_WALLET
 void SplashScreen::ConnectWallet(std::unique_ptr<interfaces::Wallet> wallet)
 {
-    m_connected_wallet_handlers.emplace_back(wallet->handleShowProgress(boost::bind(ShowProgress, this, _1, _2, false)));
+    m_connected_wallet_handlers.emplace_back(wallet->handleShowProgress(boost::bind(ShowProgress, this, boost::placeholders::_1, boost::placeholders::_2, false)));
     m_connected_wallets.emplace_back(std::move(wallet));
 }
 #endif
@@ -186,8 +186,8 @@ void SplashScreen::ConnectWallet(std::unique_ptr<interfaces::Wallet> wallet)
 void SplashScreen::subscribeToCoreSignals()
 {
     // Connect signals to client
-    m_handler_init_message = m_node.handleInitMessage(boost::bind(InitMessage, this, _1));
-    m_handler_show_progress = m_node.handleShowProgress(boost::bind(ShowProgress, this, _1, _2, _3));
+    m_handler_init_message = m_node.handleInitMessage(boost::bind(InitMessage, this, boost::placeholders::_1));
+    m_handler_show_progress = m_node.handleShowProgress(boost::bind(ShowProgress, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
 #ifdef ENABLE_WALLET
     m_handler_load_wallet = m_node.handleLoadWallet([this](std::unique_ptr<interfaces::Wallet> wallet) { ConnectWallet(std::move(wallet)); });
 #endif
diff --git a/src/qt/tapyrus.cpp b/src/qt/tapyrus.cpp
index ad169a7224..f733ecc752 100644
--- a/src/qt/tapyrus.cpp
+++ b/src/qt/tapyrus.cpp
@@ -152,11 +152,11 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons
 /** Class encapsulating Bitcoin Core startup and shutdown.
  * Allows running startup and shutdown in a different thread from the UI thread.
  */
-class BitcoinCore: public QObject
+class TapyrusCore: public QObject
 {
     Q_OBJECT
 public:
-    explicit BitcoinCore(interfaces::Node& node);
+    explicit TapyrusCore(interfaces::Node& node);
 
 public Q_SLOTS:
     void initialize();
@@ -174,13 +174,13 @@ public Q_SLOTS:
     interfaces::Node& m_node;
 };
 
-/** Main Bitcoin application object */
-class BitcoinApplication: public QApplication
+/** Main Tapyrus application object */
+class TapyrusApplication: public QApplication
 {
     Q_OBJECT
 public:
-    explicit BitcoinApplication(interfaces::Node& node, int &argc, char **argv);
-    ~BitcoinApplication();
+    explicit TapyrusApplication(interfaces::Node& node, int &argc, char **argv);
+    ~TapyrusApplication();
 
 #ifdef ENABLE_WALLET
     /// Create payment server
@@ -244,18 +244,18 @@ public Q_SLOTS:
 
 #include <qt/tapyrus.moc>
 
-BitcoinCore::BitcoinCore(interfaces::Node& node) :
+TapyrusCore::TapyrusCore(interfaces::Node& node) :
     QObject(), m_node(node)
 {
 }
 
-void BitcoinCore::handleRunawayException(const std::exception *e)
+void TapyrusCore::handleRunawayException(const std::exception *e)
 {
     PrintExceptionContinue(e, "Runaway exception");
     Q_EMIT runawayException(QString::fromStdString(m_node.getWarnings("gui")));
 }
 
-void BitcoinCore::initialize()
+void TapyrusCore::initialize()
 {
     try
     {
@@ -269,7 +269,7 @@ void BitcoinCore::initialize()
     }
 }
 
-void BitcoinCore::shutdown()
+void TapyrusCore::shutdown()
 {
     try
     {
@@ -284,7 +284,7 @@ void BitcoinCore::shutdown()
     }
 }
 
-BitcoinApplication::BitcoinApplication(interfaces::Node& node, int &argc, char **argv):
+TapyrusApplication::TapyrusApplication(interfaces::Node& node, int &argc, char **argv):
     QApplication(argc, argv),
     coreThread(0),
     m_node(node),
@@ -302,10 +302,10 @@ BitcoinApplication::BitcoinApplication(interfaces::Node& node, int &argc, char *
     setQuitOnLastWindowClosed(false);
 }
 
-void BitcoinApplication::setupPlatformStyle()
+void TapyrusApplication::setupPlatformStyle()
 {
     // UI per-platform customization
-    // This must be done inside the BitcoinApplication constructor, or after it, because
+    // This must be done inside the TapyrusApplication constructor, or after it, because
     // PlatformStyle::instantiate requires a QApplication
     std::string platformName;
     platformName = gArgs.GetArg("-uiplatform", BitcoinGUI::DEFAULT_UIPLATFORM);
@@ -315,7 +315,7 @@ void BitcoinApplication::setupPlatformStyle()
     assert(platformStyle);
 }
 
-BitcoinApplication::~BitcoinApplication()
+TapyrusApplication::~TapyrusApplication()
 {
     if(coreThread)
     {
@@ -338,18 +338,18 @@ BitcoinApplication::~BitcoinApplication()
 }
 
 #ifdef ENABLE_WALLET
-void BitcoinApplication::createPaymentServer()
+void TapyrusApplication::createPaymentServer()
 {
     paymentServer = new PaymentServer(this);
 }
 #endif
 
-void BitcoinApplication::createOptionsModel(bool resetSettings)
+void TapyrusApplication::createOptionsModel(bool resetSettings)
 {
     optionsModel = new OptionsModel(m_node, nullptr, resetSettings);
 }
 
-void BitcoinApplication::createWindow(const NetworkStyle *networkStyle)
+void TapyrusApplication::createWindow(const NetworkStyle *networkStyle)
 {
     window = new BitcoinGUI(m_node, platformStyle, networkStyle, 0);
 
@@ -357,7 +357,7 @@ void BitcoinApplication::createWindow(const NetworkStyle *networkStyle)
     connect(pollShutdownTimer, SIGNAL(timeout()), window, SLOT(detectShutdown()));
 }
 
-void BitcoinApplication::createSplashScreen(const NetworkStyle *networkStyle)
+void TapyrusApplication::createSplashScreen(const NetworkStyle *networkStyle)
 {
     SplashScreen *splash = new SplashScreen(m_node, 0, networkStyle);
     // We don't hold a direct pointer to the splash screen after creation, but the splash
@@ -367,12 +367,12 @@ void BitcoinApplication::createSplashScreen(const NetworkStyle *networkStyle)
     connect(this, SIGNAL(requestedShutdown()), splash, SLOT(close()));
 }
 
-void BitcoinApplication::startThread()
+void TapyrusApplication::startThread()
 {
     if(coreThread)
         return;
     coreThread = new QThread(this);
-    BitcoinCore *executor = new BitcoinCore(m_node);
+    TapyrusCore *executor = new TapyrusCore(m_node);
     executor->moveToThread(coreThread);
 
     /*  communication to and from thread */
@@ -388,7 +388,7 @@ void BitcoinApplication::startThread()
     coreThread->start();
 }
 
-void BitcoinApplication::parameterSetup()
+void TapyrusApplication::parameterSetup()
 {
     // Default printtoconsole to false for the GUI. GUI programs should not
     // print to the console unnecessarily.
@@ -398,14 +398,14 @@ void BitcoinApplication::parameterSetup()
     m_node.initParameterInteraction();
 }
 
-void BitcoinApplication::requestInitialize()
+void TapyrusApplication::requestInitialize()
 {
     qDebug() << __func__ << ": Requesting initialize";
     startThread();
     Q_EMIT requestedInitialize();
 }
 
-void BitcoinApplication::requestShutdown()
+void TapyrusApplication::requestShutdown()
 {
     // Show a simple window indicating shutdown status
     // Do this first as some of the steps may take some time below,
@@ -434,7 +434,7 @@ void BitcoinApplication::requestShutdown()
     Q_EMIT requestedShutdown();
 }
 
-void BitcoinApplication::addWallet(WalletModel* walletModel)
+void TapyrusApplication::addWallet(WalletModel* walletModel)
 {
 #ifdef ENABLE_WALLET
     window->addWallet(walletModel);
@@ -442,15 +442,13 @@ void BitcoinApplication::addWallet(WalletModel* walletModel)
     if (m_wallet_models.empty()) {
         window->setCurrentWallet(walletModel->getWalletName());
     }
-    connect(walletModel, SIGNAL(coinsSent(WalletModel*, SendCoinsRecipient, QByteArray)),
-         paymentServer, SLOT(fetchPaymentACK(WalletModel*, const SendCoinsRecipient&, QByteArray)));
      connect(walletModel, SIGNAL(unload()), this, SLOT(removeWallet()));
 
     m_wallet_models.push_back(walletModel);
 #endif
 }
 
-void BitcoinApplication::removeWallet()
+void TapyrusApplication::removeWallet()
 {
 #ifdef ENABLE_WALLET
     WalletModel* walletModel = static_cast<WalletModel*>(sender());
@@ -460,7 +458,7 @@ void BitcoinApplication::removeWallet()
 #endif
 }
 
-void BitcoinApplication::initializeResult(bool success)
+void TapyrusApplication::initializeResult(bool success)
 {
     qDebug() << __func__ << ": Initialization result: " << success;
     // Set exit result.
@@ -518,18 +516,18 @@ void BitcoinApplication::initializeResult(bool success)
     }
 }
 
-void BitcoinApplication::shutdownResult()
+void TapyrusApplication::shutdownResult()
 {
     quit(); // Exit second main loop invocation after shutdown finished
 }
 
-void BitcoinApplication::handleRunawayException(const QString &message)
+void TapyrusApplication::handleRunawayException(const QString &message)
 {
     QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Tapyrus can no longer continue safely and will quit.") + QString("\n\n") + message);
     ::exit(EXIT_FAILURE);
 }
 
-WId BitcoinApplication::getMainWinId() const
+WId TapyrusApplication::getMainWinId() const
 {
     if (!window)
         return 0;
@@ -561,17 +559,11 @@ int main(int argc, char *argv[])
     Q_INIT_RESOURCE(tapyrus);
     Q_INIT_RESOURCE(tapyrus_locale);
 
-    BitcoinApplication app(*node, argc, argv);
-#if QT_VERSION > 0x050100
     // Generate high-dpi pixmaps
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-#endif
-#if QT_VERSION >= 0x050600
     QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
-#ifdef Q_OS_MAC
-    QApplication::setAttribute(Qt::AA_DontShowIconsInMenus);
-#endif
+
+    TapyrusApplication app(*node, argc, argv);
 
     // Register meta types used for QMetaObject::invokeMethod
     qRegisterMetaType< bool* >();
diff --git a/src/qt/tapyrusamountfield.cpp b/src/qt/tapyrusamountfield.cpp
index 14c5bdb4ed..64d5048bc1 100644
--- a/src/qt/tapyrusamountfield.cpp
+++ b/src/qt/tapyrusamountfield.cpp
@@ -24,7 +24,7 @@ class AmountSpinBox: public QAbstractSpinBox
 public:
     explicit AmountSpinBox(QWidget *parent):
         QAbstractSpinBox(parent),
-        currentUnit(BitcoinUnits::TPC),
+        currentUnit(TapyrusUnits::TPC),
         singleStep(100000) // tapyrus
     {
         setAlignment(Qt::AlignRight);
@@ -48,7 +48,7 @@ class AmountSpinBox: public QAbstractSpinBox
         CAmount val = parse(input, &valid);
         if(valid)
         {
-            input = BitcoinUnits::format(currentUnit, val, false, BitcoinUnits::separatorAlways);
+            input = TapyrusUnits::format(currentUnit, val, false, TapyrusUnits::separatorAlways);
             lineEdit()->setText(input);
         }
     }
@@ -60,7 +60,7 @@ class AmountSpinBox: public QAbstractSpinBox
 
     void setValue(const CAmount& value)
     {
-        lineEdit()->setText(BitcoinUnits::format(currentUnit, value, false, BitcoinUnits::separatorAlways));
+        lineEdit()->setText(TapyrusUnits::format(currentUnit, value, false, TapyrusUnits::separatorAlways));
         Q_EMIT valueChanged();
     }
 
@@ -69,7 +69,7 @@ class AmountSpinBox: public QAbstractSpinBox
         bool valid = false;
         CAmount val = value(&valid);
         val = val + steps * singleStep;
-        val = qMin(qMax(val, CAmount(0)), BitcoinUnits::maxMoney());
+        val = qMin(qMax(val, CAmount(0)), TapyrusUnits::maxMoney());
         setValue(val);
     }
 
@@ -99,7 +99,7 @@ class AmountSpinBox: public QAbstractSpinBox
 
             const QFontMetrics fm(fontMetrics());
             int h = lineEdit()->minimumSizeHint().height();
-            int w = fm.width(BitcoinUnits::format(BitcoinUnits::TPC, BitcoinUnits::maxMoney(), false, BitcoinUnits::separatorAlways));
+            int w = fm.width(TapyrusUnits::format(TapyrusUnits::TPC, TapyrusUnits::maxMoney(), false, TapyrusUnits::separatorAlways));
             w += 2; // cursor blinking space
 
             QStyleOptionSpinBox opt;
@@ -137,10 +137,10 @@ class AmountSpinBox: public QAbstractSpinBox
     CAmount parse(const QString &text, bool *valid_out=0) const
     {
         CAmount val = 0;
-        bool valid = BitcoinUnits::parse(currentUnit, text, &val);
+        bool valid = TapyrusUnits::parse(currentUnit, text, &val);
         if(valid)
         {
-            if(val < 0 || val > BitcoinUnits::maxMoney())
+            if(val < 0 || val > TapyrusUnits::maxMoney())
                 valid = false;
         }
         if(valid_out)
@@ -178,7 +178,7 @@ class AmountSpinBox: public QAbstractSpinBox
         {
             if(val > 0)
                 rv |= StepDownEnabled;
-            if(val < BitcoinUnits::maxMoney())
+            if(val < TapyrusUnits::maxMoney())
                 rv |= StepUpEnabled;
         }
         return rv;
@@ -202,7 +202,7 @@ BitcoinAmountField::BitcoinAmountField(QWidget *parent) :
     QHBoxLayout *layout = new QHBoxLayout(this);
     layout->addWidget(amount);
     unit = new QValueComboBox(this);
-    unit->setModel(new BitcoinUnits(this));
+    unit->setModel(new TapyrusUnits(this));
     layout->addWidget(unit);
     layout->addStretch(1);
     layout->setContentsMargins(0,0,0,0);
@@ -286,7 +286,7 @@ void BitcoinAmountField::unitChanged(int idx)
     unit->setToolTip(unit->itemData(idx, Qt::ToolTipRole).toString());
 
     // Determine new unit ID
-    int newUnit = unit->itemData(idx, BitcoinUnits::UnitRole).toInt();
+    int newUnit = unit->itemData(idx, TapyrusUnits::UnitRole).toInt();
 
     amount->setDisplayUnit(newUnit);
 }
diff --git a/src/qt/tapyrusgui.cpp b/src/qt/tapyrusgui.cpp
index fb82a358fc..9de68764fd 100644
--- a/src/qt/tapyrusgui.cpp
+++ b/src/qt/tapyrusgui.cpp
@@ -995,7 +995,7 @@ void BitcoinGUI::incomingTransaction(const QString& date, int unit, const CAmoun
 {
     // On new transaction, make an info balloon
     QString msg = tr("Date: %1\n").arg(date) +
-                  tr("Amount: %1\n").arg(BitcoinUnits::formatWithUnit(unit, amount, true));
+                  tr("Amount: %1\n").arg(TapyrusUnits::formatWithUnit(unit, amount, true));
     if (m_node.getWallets().size() > 1 && !walletName.isEmpty()) {
         msg += tr("Wallet: %1\n").arg(walletName);
     }
@@ -1221,8 +1221,8 @@ static bool ThreadSafeMessageBox(BitcoinGUI *gui, const std::string& message, co
 void BitcoinGUI::subscribeToCoreSignals()
 {
     // Connect signals to client
-    m_handler_message_box = m_node.handleMessageBox(boost::bind(ThreadSafeMessageBox, this, _1, _2, _3));
-    m_handler_question = m_node.handleQuestion(boost::bind(ThreadSafeMessageBox, this, _1, _3, _4));
+    m_handler_message_box = m_node.handleMessageBox(boost::bind(ThreadSafeMessageBox, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
+    m_handler_question = m_node.handleQuestion(boost::bind(ThreadSafeMessageBox, this, boost::placeholders::_1, boost::placeholders::_3, boost::placeholders::_4));
 }
 
 void BitcoinGUI::unsubscribeFromCoreSignals()
@@ -1243,12 +1243,12 @@ UnitDisplayStatusBarControl::UnitDisplayStatusBarControl(const PlatformStyle *pl
 {
     createContextMenu();
     setToolTip(tr("Unit to show amounts in. Click to select another unit."));
-    QList<BitcoinUnits::Unit> units = BitcoinUnits::availableUnits();
+    QList<TapyrusUnits::Unit> units = TapyrusUnits::availableUnits();
     int max_width = 0;
     const QFontMetrics fm(font());
-    for (const BitcoinUnits::Unit unit : units)
+    for (const TapyrusUnits::Unit unit : units)
     {
-        max_width = qMax(max_width, fm.width(BitcoinUnits::longName(unit)));
+        max_width = qMax(max_width, fm.width(TapyrusUnits::longName(unit)));
     }
     setMinimumSize(max_width, 0);
     setAlignment(Qt::AlignRight | Qt::AlignVCenter);
@@ -1265,12 +1265,19 @@ void UnitDisplayStatusBarControl::mousePressEvent(QMouseEvent *event)
 void UnitDisplayStatusBarControl::createContextMenu()
 {
     menu = new QMenu(this);
-    for (BitcoinUnits::Unit u : BitcoinUnits::availableUnits())
+    for (TapyrusUnits::Unit u : TapyrusUnits::availableUnits())
     {
-        QAction *menuAction = new QAction(QString(BitcoinUnits::longName(u)), this);
+        QAction *menuAction = new QAction(QString(TapyrusUnits::longName(u)), this);
         menuAction->setData(QVariant(u));
         menu->addAction(menuAction);
     }
+    /*for (auto tokenAmtPair: model->wallet()->getT Balances().balances )
+    {
+        QString longName = QString(tokenAmtPair.first().toHexString());
+        QAction *menuAction = new QAction(longName, this);
+        menuAction->setData(QVariant(longName));
+        menu->addAction(menuAction);
+    }*/
     connect(menu,SIGNAL(triggered(QAction*)),this,SLOT(onMenuSelection(QAction*)));
 }
 
@@ -1292,7 +1299,7 @@ void UnitDisplayStatusBarControl::setOptionsModel(OptionsModel *_optionsModel)
 /** When Display Units are changed on OptionsModel it will refresh the display text of the control on the status bar */
 void UnitDisplayStatusBarControl::updateDisplayUnit(int newUnits)
 {
-    setText(BitcoinUnits::longName(newUnits));
+    setText(TapyrusUnits::longName(newUnits));
 }
 
 /** Shows context menu with Display Unit options by the mouse coordinates */
diff --git a/src/qt/tapyrusunits.cpp b/src/qt/tapyrusunits.cpp
index 9d1d83404c..4b905b8295 100644
--- a/src/qt/tapyrusunits.cpp
+++ b/src/qt/tapyrusunits.cpp
@@ -8,23 +8,24 @@
 
 #include <QStringList>
 
-BitcoinUnits::BitcoinUnits(QObject *parent):
+TapyrusUnits::TapyrusUnits(QObject *parent):
         QAbstractListModel(parent),
         unitlist(availableUnits())
 {
 }
 
-QList<BitcoinUnits::Unit> BitcoinUnits::availableUnits()
+QList<TapyrusUnits::Unit> TapyrusUnits::availableUnits()
 {
-    QList<BitcoinUnits::Unit> unitlist;
+    QList<TapyrusUnits::Unit> unitlist;
     unitlist.append(TPC);
     unitlist.append(mTPC);
     unitlist.append(uTPC);
     unitlist.append(TAP);
+    unitlist.append(TOKEN);
     return unitlist;
 }
 
-bool BitcoinUnits::valid(int unit)
+bool TapyrusUnits::valid(int unit)
 {
     switch(unit)
     {
@@ -32,13 +33,14 @@ bool BitcoinUnits::valid(int unit)
     case mTPC:
     case uTPC:
     case TAP:
+    case TOKEN:
         return true;
     default:
         return false;
     }
 }
 
-QString BitcoinUnits::longName(int unit)
+QString TapyrusUnits::longName(int unit)
 {
     switch(unit)
     {
@@ -46,21 +48,23 @@ QString BitcoinUnits::longName(int unit)
     case mTPC: return QString("mTPC");
     case uTPC: return QString::fromUtf8("µTPC (tpcs)");
     case TAP: return QString("Tapyrus (tap)");
+    case TOKEN: return QString("TOKEN");
     default: return QString("???");
     }
 }
 
-QString BitcoinUnits::shortName(int unit)
+QString TapyrusUnits::shortName(int unit)
 {
     switch(unit)
     {
     case uTPC: return QString::fromUtf8("tpcs");
     case TAP: return QString("tap");
+    case TOKEN: return QString("token");
     default: return longName(unit);
     }
 }
 
-QString BitcoinUnits::description(int unit)
+QString TapyrusUnits::description(int unit)
 {
     switch(unit)
     {
@@ -68,35 +72,38 @@ QString BitcoinUnits::description(int unit)
     case mTPC: return QString("Milli-TPC (1 / 1" THIN_SP_UTF8 "000)");
     case uTPC: return QString("Micro-TPC (tpcs) (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)");
     case TAP: return QString("Tapyrus (tap) (1 / 100" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)");
+    case TOKEN: return QString("Tapyrus token");
     default: return QString("???");
     }
 }
 
-qint64 BitcoinUnits::factor(int unit)
+qint64 TapyrusUnits::factor(int unit)
 {
     switch(unit)
     {
     case TPC: return 100000000;
     case mTPC: return 100000;
     case uTPC: return 100;
-    case TAP: return 1;
+    case TAP:
+    case TOKEN: return 1;
     default: return 100000000;
     }
 }
 
-int BitcoinUnits::decimals(int unit)
+int TapyrusUnits::decimals(int unit)
 {
     switch(unit)
     {
     case TPC: return 8;
     case mTPC: return 5;
     case uTPC: return 2;
-    case TAP: return 0;
+    case TAP:
+    case TOKEN: return 0;
     default: return 0;
     }
 }
 
-QString BitcoinUnits::format(int unit, const CAmount& nIn, bool fPlus, SeparatorStyle separators)
+QString TapyrusUnits::format(int unit, const CAmount& nIn, bool fPlus, SeparatorStyle separators)
 {
     // Note: not using straight sprintf here because we do NOT want
     // localized number formatting.
@@ -140,12 +147,12 @@ QString BitcoinUnits::format(int unit, const CAmount& nIn, bool fPlus, Separator
 // Please take care to use formatHtmlWithUnit instead, when
 // appropriate.
 
-QString BitcoinUnits::formatWithUnit(int unit, const CAmount& amount, bool plussign, SeparatorStyle separators)
+QString TapyrusUnits::formatWithUnit(int unit, const CAmount& amount, bool plussign, SeparatorStyle separators)
 {
     return format(unit, amount, plussign, separators) + QString(" ") + shortName(unit);
 }
 
-QString BitcoinUnits::formatHtmlWithUnit(int unit, const CAmount& amount, bool plussign, SeparatorStyle separators)
+QString TapyrusUnits::formatHtmlWithUnit(int unit, const CAmount& amount, bool plussign, SeparatorStyle separators)
 {
     QString str(formatWithUnit(unit, amount, plussign, separators));
     str.replace(QChar(THIN_SP_CP), QString(THIN_SP_HTML));
@@ -153,7 +160,7 @@ QString BitcoinUnits::formatHtmlWithUnit(int unit, const CAmount& amount, bool p
 }
 
 
-bool BitcoinUnits::parse(int unit, const QString &value, CAmount *val_out)
+bool TapyrusUnits::parse(int unit, const QString &value, CAmount *val_out)
 {
     if(!valid(unit) || value.isEmpty())
         return false; // Refuse to parse invalid unit or empty string
@@ -192,23 +199,23 @@ bool BitcoinUnits::parse(int unit, const QString &value, CAmount *val_out)
     return ok;
 }
 
-QString BitcoinUnits::getAmountColumnTitle(int unit)
+QString TapyrusUnits::getAmountColumnTitle(int unit)
 {
     QString amountTitle = QObject::tr("Amount");
-    if (BitcoinUnits::valid(unit))
+    if (TapyrusUnits::valid(unit))
     {
-        amountTitle += " ("+BitcoinUnits::shortName(unit) + ")";
+        amountTitle += " ("+TapyrusUnits::shortName(unit) + ")";
     }
     return amountTitle;
 }
 
-int BitcoinUnits::rowCount(const QModelIndex &parent) const
+int TapyrusUnits::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
     return unitlist.size();
 }
 
-QVariant BitcoinUnits::data(const QModelIndex &index, int role) const
+QVariant TapyrusUnits::data(const QModelIndex &index, int role) const
 {
     int row = index.row();
     if(row >= 0 && row < unitlist.size())
@@ -228,7 +235,7 @@ QVariant BitcoinUnits::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
-CAmount BitcoinUnits::maxMoney()
+CAmount TapyrusUnits::maxMoney()
 {
     return MAX_MONEY;
 }
diff --git a/src/qt/tapyrusunits.h b/src/qt/tapyrusunits.h
index c0c4028b7f..673a64e604 100644
--- a/src/qt/tapyrusunits.h
+++ b/src/qt/tapyrusunits.h
@@ -44,14 +44,14 @@
 /** Bitcoin unit definitions. Encapsulates parsing and formatting
    and serves as list model for drop-down selection boxes.
 */
-class BitcoinUnits: public QAbstractListModel
+class TapyrusUnits: public QAbstractListModel
 {
     Q_OBJECT
 
 public:
-    explicit BitcoinUnits(QObject *parent);
+    explicit TapyrusUnits(QObject *parent);
 
-    /** Bitcoin units.
+    /** Tapyrus units.
       @note Source: https://en.bitcoin.it/wiki/Units . Please add only sensible ones
      */
     enum Unit
@@ -59,7 +59,8 @@ class BitcoinUnits: public QAbstractListModel
         TPC,
         mTPC,
         uTPC,
-        TAP
+        TAP,
+        TOKEN
     };
 
     enum SeparatorStyle
@@ -124,8 +125,8 @@ class BitcoinUnits: public QAbstractListModel
     static CAmount maxMoney();
 
 private:
-    QList<BitcoinUnits::Unit> unitlist;
+    QList<TapyrusUnits::Unit> unitlist;
 };
-typedef BitcoinUnits::Unit BitcoinUnit;
+typedef TapyrusUnits::Unit TapyrusUnit;
 
 #endif // TAPYRUS_QT_TAPYRUSUNITS_H
diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp
index cae480f8d4..2f5c563085 100644
--- a/src/qt/test/addressbooktests.cpp
+++ b/src/qt/test/addressbooktests.cpp
@@ -67,7 +67,7 @@ void TestAddAddressesToSendBook()
         CKey key;
         key.MakeNewKey(true);
         CTxDestination dest(GetDestinationForKey(
-            key.GetPubKey(), wallet->m_default_address_type));
+            key.GetPubKey(), wallet->m_default_address_type, ColorIdentifier()));
 
         return std::make_pair(dest, QString::fromStdString(EncodeDestination(dest)));
     };
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
index 987cc69ad6..199cbec394 100644
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -143,7 +143,7 @@ void TestGUI()
     wallet->LoadWallet(firstRun);
     {
         LOCK(wallet->cs_wallet);
-        wallet->SetAddressBook(GetDestinationForKey(test.coinbaseKey.GetPubKey(), wallet->m_default_address_type), "", "receive");
+        wallet->SetAddressBook(GetDestinationForKey(test.coinbaseKey.GetPubKey(), wallet->m_default_address_type, ColorIdentifier()), "", "receive");
         wallet->AddKeyPubKey(test.coinbaseKey, test.coinbaseKey.GetPubKey());
     }
     {
@@ -155,7 +155,11 @@ void TestGUI()
     wallet->SetBroadcastTransactions(true);
 
     // Create widgets for sending coins and listing transactions.
+#if defined(MAC_OSX)
+    std::unique_ptr<const PlatformStyle> platformStyle(PlatformStyle::instantiate("macosx"));
+#else
     std::unique_ptr<const PlatformStyle> platformStyle(PlatformStyle::instantiate("other"));
+#endif
     SendCoinsDialog sendCoinsDialog(platformStyle.get());
     TransactionView transactionView(platformStyle.get());
     auto node = interfaces::MakeNode();
@@ -188,7 +192,7 @@ void TestGUI()
     QString balanceText = balanceLabel->text();
     int unit = walletModel.getOptionsModel()->getDisplayUnit();
     CAmount balance = walletModel.wallet().getBalance();
-    QString balanceComparison = BitcoinUnits::formatWithUnit(unit, balance, false, BitcoinUnits::separatorAlways);
+    QString balanceComparison = TapyrusUnits::formatWithUnit(unit, balance, false, TapyrusUnits::separatorAlways);
     QCOMPARE(balanceText, balanceComparison);
 
     // Check Request Payment button
diff --git a/src/qt/test_tapyrus_qt b/src/qt/test_tapyrus_qt
new file mode 100755
index 0000000000..d98d6cd69c
Binary files /dev/null and b/src/qt/test_tapyrus_qt differ
diff --git a/src/qt/trafficgraphwidget.cpp b/src/qt/trafficgraphwidget.cpp
index 35569149fc..2c7b8c9609 100644
--- a/src/qt/trafficgraphwidget.cpp
+++ b/src/qt/trafficgraphwidget.cpp
@@ -9,7 +9,7 @@
 #include <QPainter>
 #include <QColor>
 #include <QTimer>
-
+#include <QPainterPath>
 #include <cmath>
 
 #define DESIRED_SAMPLES         800
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 2a2461b19d..a61be23a0b 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -43,8 +43,6 @@ QString TransactionDesc::FormatTxStatus(const interfaces::WalletTx& wtx, const i
             return tr("conflicted with a transaction with %1 confirmations").arg(-nDepth);
         else if (nDepth == 0)
             return tr("0/unconfirmed, %1").arg((inMempool ? tr("in memory pool") : tr("not in memory pool"))) + (status.is_abandoned ? ", "+tr("abandoned") : "");
-        else if (nDepth < 6)
-            return tr("%1/unconfirmed").arg(nDepth);
         else
             return tr("%1 confirmations").arg(nDepth);
     }
@@ -57,17 +55,25 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
     interfaces::WalletTxStatus status;
     interfaces::WalletOrderForm orderForm;
     bool inMempool;
-    interfaces::WalletTx wtx = wallet.getWalletTxDetails(rec->hash, status, orderForm, inMempool, numBlocks, adjustedTime);
+    interfaces::WalletTx wtx = wallet.getWalletTxDetails(node, rec->hash, status, orderForm, inMempool, numBlocks, adjustedTime);
 
     QString strHTML;
 
     strHTML.reserve(4000);
     strHTML += "<html><font face='verdana, arial, helvetica, sans-serif'>";
 
+    std::set<ColorIdentifier> txColorIdSet{wtx.getAllColorIds(node)};
+
+    std::map<const ColorIdentifier, std::tuple<CAmount, CAmount, CAmount> > creditMap;
+    for(auto color : txColorIdSet)
+    {
+        CAmount nCredit = wtx.getCredit(color);
+        CAmount nDebit = wtx.getDebit(color);
+        CAmount nNet = nCredit - nDebit;
+        creditMap.emplace(color, std::make_tuple(nCredit, nDebit, nNet) );
+    }
+
     int64_t nTime = wtx.time;
-    CAmount nCredit = wtx.getCredit();
-    CAmount nDebit = wtx.getDebit();
-    CAmount nNet = nCredit - nDebit;
 
     strHTML += "<b>" + tr("Status") + ":</b> " + FormatTxStatus(wtx, status, inMempool, numBlocks, adjustedTime);
     strHTML += "<br>";
@@ -77,7 +83,11 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
     //
     // From
     //
-    if (wtx.is_coinbase)
+    if(!wtx.is_tokenInput && wtx.is_tokenOutput)
+    {
+        strHTML += "<b>" + tr("Source") + ":</b> " + tr("Token Issue") + "<br>";
+    }
+    else if (wtx.is_coinbase)
     {
         strHTML += "<b>" + tr("Source") + ":</b> " + tr("Generated") + "<br>";
     }
@@ -86,31 +96,6 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
         // Online transaction
         strHTML += "<b>" + tr("From") + ":</b> " + GUIUtil::HtmlEscape(wtx.value_map["from"]) + "<br>";
     }
-    else
-    {
-        // Offline transaction
-        if (nNet > 0)
-        {
-            // Credit
-            CTxDestination address = DecodeDestination(rec->address);
-            if (IsValidDestination(address)) {
-                std::string name;
-                isminetype ismine;
-                if (wallet.getAddress(address, &name, &ismine, /* purpose= */ nullptr))
-                {
-                    strHTML += "<b>" + tr("From") + ":</b> " + tr("unknown") + "<br>";
-                    strHTML += "<b>" + tr("To") + ":</b> ";
-                    strHTML += GUIUtil::HtmlEscape(rec->address);
-                    QString addressOwned = ismine == ISMINE_SPENDABLE ? tr("own address") : tr("watch-only");
-                    if (!name.empty())
-                        strHTML += " (" + addressOwned + ", " + tr("label") + ": " + GUIUtil::HtmlEscape(name) + ")";
-                    else
-                        strHTML += " (" + addressOwned + ")";
-                    strHTML += "<br>";
-                }
-            }
-        }
-    }
 
     //
     // To
@@ -128,98 +113,107 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
         strHTML += GUIUtil::HtmlEscape(strAddress) + "<br>";
     }
 
-    //
-    // Amount
-    //
-    if (wtx.is_coinbase && nCredit == 0)
+    isminetype fAllFromMe = ISMINE_SPENDABLE;
+    for (isminetype mine : wtx.txin_is_mine)
     {
-        //
-        // Coinbase
-        //
-        CAmount nUnmatured = 0;
-        for (const CTxOut& txout : wtx.tx->vout)
-            nUnmatured += wallet.getCredit(txout, ISMINE_ALL);
-        strHTML += "<b>" + tr("Credit") + ":</b> ";
-        if (status.is_in_main_chain)
-            strHTML += BitcoinUnits::formatHtmlWithUnit(unit, nUnmatured);
-        else
-            strHTML += "(" + tr("not accepted") + ")";
-        strHTML += "<br>";
+        if(fAllFromMe > mine) fAllFromMe = mine;
     }
-    else if (nNet > 0)
+
+    isminetype fAllToMe = ISMINE_SPENDABLE;
+    for (isminetype mine : wtx.txout_is_mine)
     {
-        //
-        // Credit
-        //
-        strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, nNet) + "<br>";
+        if(fAllToMe > mine) fAllToMe = mine;
     }
-    else
+    if(fAllFromMe && ISMINE_WATCH_ONLY)
+        strHTML += "<b>" + tr("From") + ":</b> " + tr("watch-only") + "<br>";
+
+    for (const CTxOut& txout : wtx.tx->vout)
     {
-        isminetype fAllFromMe = ISMINE_SPENDABLE;
-        for (isminetype mine : wtx.txin_is_mine)
-        {
-            if(fAllFromMe > mine) fAllFromMe = mine;
-        }
+        ColorIdentifier colorId = GetColorIdFromScript(txout.scriptPubKey);
 
-        isminetype fAllToMe = ISMINE_SPENDABLE;
-        for (isminetype mine : wtx.txout_is_mine)
+        CAmount nCredit = std::get<0>(creditMap[colorId]);
+        CAmount nDebit = std::get<1>(creditMap[colorId]);
+        CAmount nNet = std::get<2>(creditMap[colorId]);
+
+        //
+        // Amount
+        //
+        if (wtx.is_coinbase)
         {
-            if(fAllToMe > mine) fAllToMe = mine;
+            //
+            // Coinbase
+            //
+            strHTML += "<b>" + tr("Token") + ":</b> " + TapyrusUnits::longName(unit) + "<br>";
+            strHTML += "<b>" + tr("Credit") + ":</b> ";
+            if (status.is_in_main_chain)
+                strHTML += TapyrusUnits::formatHtmlWithUnit(unit, nNet);
+            else
+                strHTML += "(" + tr("not accepted") + ")";
+            strHTML += "<br>";
         }
-
-        if (fAllFromMe)
+        else if (nNet > 0)
         {
-            if(fAllFromMe & ISMINE_WATCH_ONLY)
-                strHTML += "<b>" + tr("From") + ":</b> " + tr("watch-only") + "<br>";
-
             //
-            // Debit
+            // Credit
             //
-            auto mine = wtx.txout_is_mine.begin();
-            for (const CTxOut& txout : wtx.tx->vout)
-            {
-                // Ignore change
-                isminetype toSelf = *(mine++);
-                if ((toSelf == ISMINE_SPENDABLE) && (fAllFromMe == ISMINE_SPENDABLE))
-                    continue;
+            strHTML += "<b>" + tr("Token") + ":</b> " + (colorId.type == TokenTypes::NONE ? TapyrusUnits::longName(unit) : colorId.toHexString().c_str()) + "<br>";
+            strHTML += "<b>" + tr("Credit") + ":</b> " + (colorId.type == TokenTypes::NONE ?  TapyrusUnits::formatHtmlWithUnit(unit, nNet) : TapyrusUnits::formatHtmlWithUnit(TapyrusUnits::TOKEN, nNet)) + "<br>";
 
-                if (!wtx.value_map.count("to") || wtx.value_map["to"].empty())
+            // Offline transaction
+            CTxDestination address = DecodeDestination(rec->address);
+            if (IsValidDestination(address)) {
+                std::string name;
+                isminetype ismine;
+                if (wallet.getAddress(address, &name, &ismine, /* purpose= */ nullptr))
                 {
-                    // Offline transaction
-                    CTxDestination address;
-                    if (ExtractDestination(txout.scriptPubKey, address))
-                    {
-                        strHTML += "<b>" + tr("To") + ":</b> ";
-                        std::string name;
-                        if (wallet.getAddress(
-                                address, &name, /* is_mine= */ nullptr, /* purpose= */ nullptr) && !name.empty())
-                            strHTML += GUIUtil::HtmlEscape(name) + " ";
-                        strHTML += GUIUtil::HtmlEscape(EncodeDestination(address));
-                        if(toSelf == ISMINE_SPENDABLE)
-                            strHTML += " (own address)";
-                        else if(toSelf & ISMINE_WATCH_ONLY)
-                            strHTML += " (watch-only)";
-                        strHTML += "<br>";
-                    }
+                    strHTML += "<b>" + tr("From") + ":</b> " + tr("unknown") + "<br>";
+                    strHTML += "<b>" + tr("To") + ":</b> ";
+                    strHTML += GUIUtil::HtmlEscape(rec->address);
+                    QString addressOwned = ismine == ISMINE_SPENDABLE ? tr("own address") : tr("watch-only");
+                    if (!name.empty())
+                        strHTML += " (" + addressOwned + ", " + tr("label") + ": " + GUIUtil::HtmlEscape(name) + ")";
+                    else
+                        strHTML += " (" + addressOwned + ")";
+                    strHTML += "<br>";
                 }
-
-                strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, -txout.nValue) + "<br>";
-                if(toSelf)
-                    strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, txout.nValue) + "<br>";
             }
+        }
+        else if (fAllFromMe)
+        {
+            //
+            // Debit
+            //
+            auto mine = wtx.txout_is_mine.begin();
+
+            // Ignore change
+            isminetype toSelf = *(mine++);
+            //if ((toSelf == ISMINE_SPENDABLE) && (fAllFromMe == ISMINE_SPENDABLE))
+            //    continue;
 
-            if (fAllToMe)
+            if (!wtx.value_map.count("to") || wtx.value_map["to"].empty())
             {
-                // Payment to self
-                CAmount nChange = wtx.getChange();
-                CAmount nValue = nCredit - nChange;
-                strHTML += "<b>" + tr("Total debit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, -nValue) + "<br>";
-                strHTML += "<b>" + tr("Total credit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, nValue) + "<br>";
+                // Offline transaction
+                CTxDestination address;
+                if (ExtractDestination(txout.scriptPubKey, address))
+                {
+                    strHTML += "<b>" + tr("To") + ":</b> ";
+                    std::string name;
+                    if (wallet.getAddress(
+                            address, &name, /* is_mine= */ nullptr, /* purpose= */ nullptr) && !name.empty())
+                        strHTML += GUIUtil::HtmlEscape(name) + " ";
+                    strHTML += GUIUtil::HtmlEscape(EncodeDestination(address));
+                    if(toSelf == ISMINE_SPENDABLE)
+                        strHTML += " (own address)";
+                    else if(toSelf & ISMINE_WATCH_ONLY)
+                        strHTML += " (watch-only)";
+                    strHTML += "<br>";
+                }
             }
 
-            CAmount nTxFee = nDebit - wtx.tx->GetValueOut(ColorIdentifier());
-            if (nTxFee > 0)
-                strHTML += "<b>" + tr("Transaction fee") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, -nTxFee) + "<br>";
+            strHTML += "<b>" + tr("Token") + ":</b> " + (colorId.type == TokenTypes::NONE ? TapyrusUnits::longName(unit) : colorId.toHexString().c_str()) + "<br>";
+            strHTML += "<b>" + tr("Debit") + ":</b> " + (colorId.type == TokenTypes::NONE ?  TapyrusUnits::formatHtmlWithUnit(unit, -nDebit) : TapyrusUnits::formatHtmlWithUnit(TapyrusUnits::TOKEN, -nDebit) )+ "<br>";
+            if(toSelf)
+                strHTML += "<b>" + tr("Credit") + ":</b> " + (colorId.type == TokenTypes::NONE ?  TapyrusUnits::formatHtmlWithUnit(unit, nCredit) : TapyrusUnits::formatHtmlWithUnit(TapyrusUnits::TOKEN, nCredit) ) + "<br>";
         }
         else
         {
@@ -229,19 +223,22 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
             auto mine = wtx.txin_is_mine.begin();
             for (const CTxIn& txin : wtx.tx->vin) {
                 if (*(mine++)) {
-                    strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, -wallet.getDebit(txin, ISMINE_ALL)) + "<br>";
+                    strHTML += "<b>" + tr("Debit") + ":</b> " + (colorId.type == TokenTypes::NONE ? TapyrusUnits::formatHtmlWithUnit(unit, -wallet.getDebit(txin, ISMINE_ALL)) : TapyrusUnits::formatHtmlWithUnit(TapyrusUnits::TOKEN, -wallet.getDebit(txin, ISMINE_ALL))) + "<br>";
                 }
             }
             mine = wtx.txout_is_mine.begin();
             for (const CTxOut& txout : wtx.tx->vout) {
                 if (*(mine++)) {
-                    strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, wallet.getCredit(txout, ISMINE_ALL)) + "<br>";
+                    strHTML += "<b>" + tr("Credit") + ":</b> " + (colorId.type == TokenTypes::NONE ? TapyrusUnits::formatHtmlWithUnit(unit, wallet.getCredit(txout, ISMINE_ALL)) : TapyrusUnits::formatHtmlWithUnit(TapyrusUnits::TOKEN, wallet.getCredit(txout, ISMINE_ALL))) + "<br>";
                 }
             }
         }
     }
 
-    strHTML += "<b>" + tr("Net amount") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, nNet, true) + "<br>";
+
+    CAmount nTxFee = std::get<1>(creditMap[ColorIdentifier()]) - wtx.tx->GetValueOut(ColorIdentifier());
+    if (nTxFee > 0)
+        strHTML += "<br><b>" + tr("Transaction fee") + ":</b> " + TapyrusUnits::formatHtmlWithUnit(unit, -nTxFee) + "<br>";
 
     //
     // Message
@@ -274,10 +271,10 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
         strHTML += "<hr><br>" + tr("Debug information") + "<br><br>";
         for (const CTxIn& txin : wtx.tx->vin)
             if(wallet.txinIsMine(txin))
-                strHTML += "<b>" + tr("Debit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, -wallet.getDebit(txin, ISMINE_ALL)) + "<br>";
+                strHTML += "<b>" + tr("Debit") + ":</b> " + TapyrusUnits::formatHtmlWithUnit(unit, -wallet.getDebit(txin, ISMINE_ALL)) + "<br>";
         for (const CTxOut& txout : wtx.tx->vout)
             if(wallet.txoutIsMine(txout))
-                strHTML += "<b>" + tr("Credit") + ":</b> " + BitcoinUnits::formatHtmlWithUnit(unit, wallet.getCredit(txout, ISMINE_ALL)) + "<br>";
+                strHTML += "<b>" + tr("Credit") + ":</b> " + TapyrusUnits::formatHtmlWithUnit(unit, wallet.getCredit(txout, ISMINE_ALL)) + "<br>";
 
         strHTML += "<br><b>" + tr("Transaction") + ":</b><br>";
         strHTML += GUIUtil::HtmlEscape(wtx.tx->ToString(), true);
@@ -303,7 +300,7 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall
                             strHTML += GUIUtil::HtmlEscape(name) + " ";
                         strHTML += QString::fromStdString(EncodeDestination(address));
                     }
-                    strHTML = strHTML + " " + tr("Amount") + "=" + BitcoinUnits::formatHtmlWithUnit(unit, vout.nValue);
+                    strHTML = strHTML + " " + tr("Amount") + "=" + TapyrusUnits::formatHtmlWithUnit(unit, vout.nValue);
                     strHTML = strHTML + " IsMine=" + (wallet.txoutIsMine(vout) & ISMINE_SPENDABLE ? tr("true") : tr("false")) + "</li>";
                     strHTML = strHTML + " IsWatchOnly=" + (wallet.txoutIsMine(vout) & ISMINE_WATCH_ONLY ? tr("true") : tr("false")) + "</li>";
                 }
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index a6d91b9802..737f2f9d01 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -25,76 +25,102 @@ bool TransactionRecord::showTransaction()
 /*
  * Decompose CWallet transaction to model transaction records.
  */
-QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interfaces::WalletTx& wtx)
+QList<TransactionRecord> TransactionRecord::decomposeTransaction(interfaces::Node& node, const interfaces::WalletTx& wtx)
 {
     QList<TransactionRecord> parts;
     int64_t nTime = wtx.time;
 
-    CAmount nCredit = wtx.getCredit();
-    CAmount nDebit = wtx.getDebit();
-    CAmount nNet = nCredit - nDebit;
+    std::set<ColorIdentifier> txColorIdSet{wtx.getAllColorIds(node)};
+
+    //credit, debit and net are separate for each colorid
+    std::map<const ColorIdentifier, std::tuple<CAmount, CAmount, CAmount> > creditMap;
+    for(auto color : txColorIdSet)
+    {
+        CAmount nCredit = wtx.getCredit(color);
+        CAmount nDebit = wtx.getDebit(color);
+        CAmount nNet = nCredit - nDebit;
+        creditMap.emplace(color, std::make_tuple(nCredit, nDebit, nNet) );
+    }
+
     uint256 hash = wtx.tx->GetHashMalFix();
     std::map<std::string, std::string> mapValue = wtx.value_map;
 
-    if (nNet > 0 || wtx.is_coinbase)
+    bool involvesWatchAddress = false;
+    isminetype fAllFromMe = ISMINE_SPENDABLE;
+    for (isminetype mine : wtx.txin_is_mine)
     {
-        //
-        // Credit
-        //
-        for(unsigned int i = 0; i < wtx.tx->vout.size(); i++)
+        if(mine & ISMINE_WATCH_ONLY) involvesWatchAddress = true;
+        if(fAllFromMe > mine) fAllFromMe = mine;
+    }
+
+    isminetype fAllToMe = ISMINE_SPENDABLE;
+    for (isminetype mine : wtx.txout_is_mine)
+    {
+        if(mine & ISMINE_WATCH_ONLY) involvesWatchAddress = true;
+        if(fAllToMe > mine) fAllToMe = mine;
+    }
+
+    for(unsigned int i = 0; i < wtx.tx->vout.size(); i++)
+    {
+        const CTxOut& txout = wtx.tx->vout[i];
+        ColorIdentifier colorId = GetColorIdFromScript(txout.scriptPubKey);
+
+        CAmount nCredit = std::get<0>(creditMap[colorId]);
+        CAmount nDebit = std::get<1>(creditMap[colorId]);
+        CAmount nNet = std::get<2>(creditMap[colorId]);
+
+        if (nNet > 0 || wtx.is_coinbase)
         {
-            const CTxOut& txout = wtx.tx->vout[i];
+            //
+            // Credit
+            //
+
             isminetype mine = wtx.txout_is_mine[i];
-            if(mine)
+            if(!mine)
+                continue;
+
+            TransactionRecord sub(hash, nTime);
+            sub.idx = i; // vout index
+            sub.credit = nCredit;
+            sub.involvesWatchAddress = mine & ISMINE_WATCH_ONLY;
+            if (wtx.txout_address_is_mine[i])
             {
-                TransactionRecord sub(hash, nTime);
-                CTxDestination address;
-                sub.idx = i; // vout index
-                sub.credit = txout.nValue;
-                sub.involvesWatchAddress = mine & ISMINE_WATCH_ONLY;
-                if (wtx.txout_address_is_mine[i])
-                {
-                    // Received by Bitcoin Address
+                // Received by Tapyrus Address
+                if(colorId.type == TokenTypes::NONE)
                     sub.type = TransactionRecord::RecvWithAddress;
-                    sub.address = EncodeDestination(wtx.txout_address[i]);
-                }
                 else
-                {
-                    // Received by IP connection (deprecated features), or a multisignature or other non-simple transaction
+                    sub.type = TransactionRecord::TokenRecvWithAddress;
+                sub.address = EncodeDestination(wtx.txout_address[i]);
+            }
+            else
+            {
+                // Received by IP connection (deprecated features), or a multisignature or other non-simple transaction
+                if(colorId.type == TokenTypes::NONE)
                     sub.type = TransactionRecord::RecvFromOther;
-                    sub.address = mapValue["from"];
-                }
-                if (wtx.is_coinbase)
-                {
-                    // Generated
-                    sub.type = TransactionRecord::Generated;
-                }
-
-                parts.append(sub);
+                else
+                    sub.type = TransactionRecord::TokenRecvFromOther;
+                sub.address = mapValue["from"];
             }
-        }
-    }
-    else
-    {
-        bool involvesWatchAddress = false;
-        isminetype fAllFromMe = ISMINE_SPENDABLE;
-        for (isminetype mine : wtx.txin_is_mine)
-        {
-            if(mine & ISMINE_WATCH_ONLY) involvesWatchAddress = true;
-            if(fAllFromMe > mine) fAllFromMe = mine;
-        }
 
-        isminetype fAllToMe = ISMINE_SPENDABLE;
-        for (isminetype mine : wtx.txout_is_mine)
-        {
-            if(mine & ISMINE_WATCH_ONLY) involvesWatchAddress = true;
-            if(fAllToMe > mine) fAllToMe = mine;
+
+            if(!wtx.is_tokenInput &&  wtx.is_tokenOutput);
+            {
+                sub.type = TransactionRecord::TokenIssue;
+            }
+
+            if(wtx.is_coinbase)
+            {
+                sub.type = TransactionRecord::Generated;
+            }
+
+            parts.append(sub);
+            continue;
         }
 
         if (fAllFromMe && fAllToMe)
         {
             // Payment to self
-            CAmount nChange = wtx.getChange();
+            CAmount nChange = wtx.getChange(colorId);
             parts.append(TransactionRecord(hash, nTime, TransactionRecord::SendToSelf, "",
                             -(nDebit - nChange), nCredit - nChange));
             parts.last().involvesWatchAddress = involvesWatchAddress;   // maybe pass to TransactionRecord as constructor argument
@@ -104,46 +130,46 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const interface
             //
             // Debit
             //
-            CAmount nTxFee = nDebit - wtx.tx->GetValueOut(ColorIdentifier());
+            CAmount nTxFee = std::get<1>(creditMap[ColorIdentifier()]) - wtx.tx->GetValueOut(ColorIdentifier());
 
-            for (unsigned int nOut = 0; nOut < wtx.tx->vout.size(); nOut++)
+            TransactionRecord sub(hash, nTime);
+            sub.idx = i;
+            sub.involvesWatchAddress = involvesWatchAddress;
+
+            // Ignore parts sent to self, as this is usually the change
+            // from a transaction sent back to our own address.
+            if(wtx.txout_is_mine[i])
+                continue;
+
+            if (!boost::get<CNoDestination>(&wtx.txout_address[i]))
             {
-                const CTxOut& txout = wtx.tx->vout[nOut];
-                TransactionRecord sub(hash, nTime);
-                sub.idx = nOut;
-                sub.involvesWatchAddress = involvesWatchAddress;
-
-                if(wtx.txout_is_mine[nOut])
-                {
-                    // Ignore parts sent to self, as this is usually the change
-                    // from a transaction sent back to our own address.
-                    continue;
-                }
-
-                if (!boost::get<CNoDestination>(&wtx.txout_address[nOut]))
-                {
-                    // Sent to Bitcoin Address
+                // Sent to Tapyrus Address
+                if(colorId.type == TokenTypes::NONE)
                     sub.type = TransactionRecord::SendToAddress;
-                    sub.address = EncodeDestination(wtx.txout_address[nOut]);
-                }
                 else
-                {
-                    // Sent to IP, or other non-address transaction like OP_EVAL
+                    sub.type = TransactionRecord::TokenSendToAddress;
+                sub.address = EncodeDestination(wtx.txout_address[i]);
+            }
+            else
+            {
+                // Sent to IP, or other non-address transaction like OP_EVAL
+                if(colorId.type == TokenTypes::NONE)
                     sub.type = TransactionRecord::SendToOther;
-                    sub.address = mapValue["to"];
-                }
-
-                CAmount nValue = txout.nValue;
-                /* Add fee to first output */
-                if (nTxFee > 0)
-                {
-                    nValue += nTxFee;
-                    nTxFee = 0;
-                }
-                sub.debit = -nValue;
-
-                parts.append(sub);
+                else
+                    sub.type = TransactionRecord::TokenSendToOther;
+                sub.address = mapValue["to"];
             }
+
+            CAmount nValue = nDebit;
+            /* Add fee to first tpc output */
+            if (nTxFee > 0 && colorId.type == TokenTypes::NONE)
+            {
+                nValue += nTxFee;
+                nTxFee = 0;
+            }
+            sub.debit = -nValue;
+
+            parts.append(sub);
         }
         else
         {
@@ -209,10 +235,6 @@ void TransactionRecord::updateStatus(const interfaces::WalletTxStatus& wtx, int
             if (wtx.is_abandoned)
                 status.status = TransactionStatus::Abandoned;
         }
-        else if (status.depth < RecommendedNumConfirmations)
-        {
-            status.status = TransactionStatus::Confirming;
-        }
         else
         {
             status.status = TransactionStatus::Confirmed;
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
index eb3388882c..f38c798d74 100644
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -34,7 +34,6 @@ class TransactionStatus
         OpenUntilDate,      /**< Transaction not yet final, waiting for date */
         OpenUntilBlock,     /**< Transaction not yet final, waiting for block */
         Unconfirmed,        /**< Not yet mined into a block **/
-        Confirming,         /**< Confirmed, but waiting for the recommended number of confirmations **/
         Conflicted,         /**< Conflicts with other transaction or mempool **/
         Abandoned,          /**< Abandoned from the wallet **/
         /// Generated (mined) transactions
@@ -80,7 +79,13 @@ class TransactionRecord
         SendToOther,
         RecvWithAddress,
         RecvFromOther,
-        SendToSelf
+        SendToSelf,
+        TokenIssue,
+        TokenSendToAddress,
+        TokenSendToOther,
+        TokenRecvWithAddress,
+        TokenRecvFromOther,
+        TokenSendToSelf
     };
 
     /** Number of confirmation recommended for accepting a transaction */
@@ -108,7 +113,7 @@ class TransactionRecord
     /** Decompose CWallet transaction to model transaction records.
      */
     static bool showTransaction();
-    static QList<TransactionRecord> decomposeTransaction(const interfaces::WalletTx& wtx);
+    static QList<TransactionRecord> decomposeTransaction(interfaces::Node& node, const interfaces::WalletTx& wtx);
 
     /** @name Immutable transaction attributes
       @{*/
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index c2f3c61a9a..6121ac7155 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -34,6 +34,7 @@ static int column_alignments[] = {
         Qt::AlignLeft|Qt::AlignVCenter, /* date */
         Qt::AlignLeft|Qt::AlignVCenter, /* type */
         Qt::AlignLeft|Qt::AlignVCenter, /* address */
+        Qt::AlignLeft|Qt::AlignVCenter,  /* token */
         Qt::AlignRight|Qt::AlignVCenter /* amount */
     };
 
@@ -73,14 +74,14 @@ class TransactionTablePriv
 
     /* Query entire wallet anew from core.
      */
-    void refreshWallet(interfaces::Wallet& wallet)
+    void refreshWallet(interfaces::Node& node, interfaces::Wallet& wallet)
     {
         qDebug() << "TransactionTablePriv::refreshWallet";
         cachedWallet.clear();
         {
-            for (const auto& wtx : wallet.getWalletTxs()) {
+            for (const auto& wtx : wallet.getWalletTxs(node)) {
                 if (TransactionRecord::showTransaction()) {
-                    cachedWallet.append(TransactionRecord::decomposeTransaction(wtx));
+                    cachedWallet.append(TransactionRecord::decomposeTransaction(node, wtx));
                 }
             }
         }
@@ -91,7 +92,7 @@ class TransactionTablePriv
 
        Call with transaction that was added, removed or changed.
      */
-    void updateWallet(interfaces::Wallet& wallet, const uint256 &hash, int status, bool showTransaction)
+    void updateWallet(interfaces::Wallet& wallet, const uint256 &hash, int status, bool showTransaction, interfaces::Node& node)
     {
         qDebug() << "TransactionTablePriv::updateWallet: " + QString::fromStdString(hash.ToString()) + " " + QString::number(status);
 
@@ -127,7 +128,7 @@ class TransactionTablePriv
             if(showTransaction)
             {
                 // Find transaction in wallet
-                interfaces::WalletTx wtx = wallet.getWalletTx(hash);
+                interfaces::WalletTx wtx = wallet.getWalletTx(node, hash);
                 if(!wtx.tx)
                 {
                     qWarning() << "TransactionTablePriv::updateWallet: Warning: Got CT_NEW, but transaction is not in wallet";
@@ -135,7 +136,7 @@ class TransactionTablePriv
                 }
                 // Added -- insert at the right position
                 QList<TransactionRecord> toInsert =
-                        TransactionRecord::decomposeTransaction(wtx);
+                        TransactionRecord::decomposeTransaction(node, wtx);
                 if(!toInsert.isEmpty()) /* only if something to insert */
                 {
                     parent->beginInsertRows(QModelIndex(), lowerIndex, lowerIndex+toInsert.size()-1);
@@ -176,7 +177,7 @@ class TransactionTablePriv
         return cachedWallet.size();
     }
 
-    TransactionRecord *index(interfaces::Wallet& wallet, int idx)
+    TransactionRecord *index(interfaces::Node& node, interfaces::Wallet& wallet, int idx)
     {
         if(idx >= 0 && idx < cachedWallet.size())
         {
@@ -192,7 +193,7 @@ class TransactionTablePriv
             interfaces::WalletTxStatus wtx;
             int numBlocks;
             int64_t adjustedTime;
-            if (wallet.tryGetTxStatus(rec->hash, wtx, numBlocks, adjustedTime) && rec->statusUpdateNeeded(numBlocks)) {
+            if (wallet.tryGetTxStatus(node, rec->hash, wtx, numBlocks, adjustedTime) && rec->statusUpdateNeeded(numBlocks)) {
                 rec->updateStatus(wtx, numBlocks, adjustedTime);
             }
             return rec;
@@ -223,8 +224,8 @@ TransactionTableModel::TransactionTableModel(const PlatformStyle *_platformStyle
         fProcessingQueuedTransactions(false),
         platformStyle(_platformStyle)
 {
-    columns << QString() << QString() << tr("Date") << tr("Type") << tr("Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());
-    priv->refreshWallet(walletModel->wallet());
+    columns << QString() << QString() << tr("Date") << tr("Type") << tr("Label") << tr("Token") << TapyrusUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());
+    priv->refreshWallet(walletModel->node(), walletModel->wallet());
 
     connect(walletModel->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
 
@@ -240,7 +241,7 @@ TransactionTableModel::~TransactionTableModel()
 /** Updates the column title to "Amount (DisplayUnit)" and emits headerDataChanged() signal for table headers to react. */
 void TransactionTableModel::updateAmountColumnTitle()
 {
-    columns[Amount] = BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());
+    columns[Amount] = TapyrusUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());
     Q_EMIT headerDataChanged(Qt::Horizontal,Amount,Amount);
 }
 
@@ -249,7 +250,7 @@ void TransactionTableModel::updateTransaction(const QString &hash, int status, b
     uint256 updated;
     updated.SetHex(hash.toStdString());
 
-    priv->updateWallet(walletModel->wallet(), updated, status, showTransaction);
+    priv->updateWallet(walletModel->wallet(), updated, status, showTransaction, walletModel->node());
 }
 
 void TransactionTableModel::updateConfirmations()
@@ -292,9 +293,6 @@ QString TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) cons
     case TransactionStatus::Abandoned:
         status = tr("Abandoned");
         break;
-    case TransactionStatus::Confirming:
-        status = tr("Confirming (%1 of %2 recommended confirmations)").arg(wtx->status.depth).arg(TransactionRecord::RecommendedNumConfirmations);
-        break;
     case TransactionStatus::Confirmed:
         status = tr("Confirmed (%1 confirmations)").arg(wtx->status.depth);
         break;
@@ -351,6 +349,17 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const
         return tr("Payment to yourself");
     case TransactionRecord::Generated:
         return tr("Mined");
+    case TransactionRecord::TokenRecvWithAddress:
+        return tr("Token Received with");
+    case TransactionRecord::TokenRecvFromOther:
+        return tr("Token Received from");
+    case TransactionRecord::TokenSendToAddress:
+    case TransactionRecord::TokenSendToOther:
+        return tr("Token Sent to");
+    case TransactionRecord::TokenSendToSelf:
+        return tr("Token Payment to yourself");
+    case TransactionRecord::TokenIssue:
+        return tr("Token issue");
     default:
         return QString();
     }
@@ -362,11 +371,17 @@ QVariant TransactionTableModel::txAddressDecoration(const TransactionRecord *wtx
     {
     case TransactionRecord::Generated:
         return QIcon(":/icons/tx_mined");
+    case TransactionRecord::TokenIssue:
+        return QIcon(":/icons/tx_mined");
     case TransactionRecord::RecvWithAddress:
     case TransactionRecord::RecvFromOther:
+    case TransactionRecord::TokenRecvWithAddress:
+    case TransactionRecord::TokenRecvFromOther:
         return QIcon(":/icons/tx_input");
     case TransactionRecord::SendToAddress:
     case TransactionRecord::SendToOther:
+    case TransactionRecord::TokenSendToAddress:
+    case TransactionRecord::TokenSendToOther:
         return QIcon(":/icons/tx_output");
     default:
         return QIcon(":/icons/tx_inout");
@@ -384,12 +399,17 @@ QString TransactionTableModel::formatTxToAddress(const TransactionRecord *wtx, b
     switch(wtx->type)
     {
     case TransactionRecord::RecvFromOther:
+    case TransactionRecord::TokenRecvFromOther:
         return QString::fromStdString(wtx->address) + watchAddress;
     case TransactionRecord::RecvWithAddress:
     case TransactionRecord::SendToAddress:
     case TransactionRecord::Generated:
+    case TransactionRecord::TokenRecvWithAddress:
+    case TransactionRecord::TokenSendToAddress:
+    case TransactionRecord::TokenIssue:
         return lookupAddress(wtx->address, tooltip) + watchAddress;
     case TransactionRecord::SendToOther:
+    case TransactionRecord::TokenSendToOther:
         return QString::fromStdString(wtx->address) + watchAddress;
     case TransactionRecord::SendToSelf:
     default:
@@ -405,12 +425,16 @@ QVariant TransactionTableModel::addressColor(const TransactionRecord *wtx) const
     case TransactionRecord::RecvWithAddress:
     case TransactionRecord::SendToAddress:
     case TransactionRecord::Generated:
+    case TransactionRecord::TokenRecvWithAddress:
+    case TransactionRecord::TokenSendToAddress:
+    case TransactionRecord::TokenIssue:
         {
         QString label = walletModel->getAddressTableModel()->labelForAddress(QString::fromStdString(wtx->address));
         if(label.isEmpty())
             return COLOR_BAREADDRESS;
         } break;
     case TransactionRecord::SendToSelf:
+    case TransactionRecord::TokenSendToSelf:
         return COLOR_BAREADDRESS;
     default:
         break;
@@ -418,9 +442,15 @@ QVariant TransactionTableModel::addressColor(const TransactionRecord *wtx) const
     return QVariant();
 }
 
-QString TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed, BitcoinUnits::SeparatorStyle separators) const
+QString TransactionTableModel::formatTxToken(const TransactionRecord *wtx) const
+{
+    ColorIdentifier colorId = walletModel->getColorFromAddress(QString::fromStdString(wtx->address));
+    return QString(colorId.toHexString().c_str());
+}
+
+QString TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed, TapyrusUnits::SeparatorStyle separators) const
 {
-    QString str = BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), wtx->credit + wtx->debit, false, separators);
+    QString str = walletModel->isColoredAddress(QString::fromStdString(wtx->address)) ? TapyrusUnits::format(TapyrusUnits::TOKEN, wtx->credit + wtx->debit, false, separators) : TapyrusUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), wtx->credit + wtx->debit, false, separators);
     if(showUnconfirmed)
     {
         if(!wtx->status.countsForBalance)
@@ -442,15 +472,6 @@ QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx)
         return QIcon(":/icons/transaction_0");
     case TransactionStatus::Abandoned:
         return QIcon(":/icons/transaction_abandoned");
-    case TransactionStatus::Confirming:
-        switch(wtx->status.depth)
-        {
-        case 1: return QIcon(":/icons/transaction_1");
-        case 2: return QIcon(":/icons/transaction_2");
-        case 3: return QIcon(":/icons/transaction_3");
-        case 4: return QIcon(":/icons/transaction_4");
-        default: return QIcon(":/icons/transaction_5");
-        };
     case TransactionStatus::Confirmed:
         return QIcon(":/icons/transaction_confirmed");
     case TransactionStatus::Conflicted:
@@ -474,7 +495,8 @@ QString TransactionTableModel::formatTooltip(const TransactionRecord *rec) const
 {
     QString tooltip = formatTxStatus(rec) + QString("\n") + formatTxType(rec);
     if(rec->type==TransactionRecord::RecvFromOther || rec->type==TransactionRecord::SendToOther ||
-       rec->type==TransactionRecord::SendToAddress || rec->type==TransactionRecord::RecvWithAddress)
+       rec->type==TransactionRecord::SendToAddress || rec->type==TransactionRecord::RecvWithAddress ||rec->type==TransactionRecord::TokenRecvFromOther || rec->type==TransactionRecord::TokenSendToOther ||
+       rec->type==TransactionRecord::TokenSendToAddress || rec->type==TransactionRecord::TokenRecvWithAddress)
     {
         tooltip += QString(" ") + formatTxToAddress(rec, true);
     }
@@ -514,8 +536,10 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
             return formatTxType(rec);
         case ToAddress:
             return formatTxToAddress(rec, false);
+        case Token:
+            return formatTxToken(rec);
         case Amount:
-            return formatTxAmount(rec, true, BitcoinUnits::separatorAlways);
+            return formatTxAmount(rec, true, TapyrusUnits::separatorAlways);
         }
         break;
     case Qt::EditRole:
@@ -532,8 +556,10 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
             return (rec->involvesWatchAddress ? 1 : 0);
         case ToAddress:
             return formatTxToAddress(rec, true);
+        case Token:
+            return formatTxToken(rec);
         case Amount:
-            return qint64(rec->credit + rec->debit);
+            return formatTxAmount(rec, true, TapyrusUnits::separatorAlways);
         }
         break;
     case Qt::ToolTipRole:
@@ -574,8 +600,10 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
         return QString::fromStdString(rec->address);
     case LabelRole:
         return walletModel->getAddressTableModel()->labelForAddress(QString::fromStdString(rec->address));
+    case TokenRole:
+        return QString::fromStdString(walletModel->getColorFromAddress(QString::fromStdString(rec->address)).toHexString());
     case AmountRole:
-        return qint64(rec->credit + rec->debit);
+        return formatTxAmount(rec, true, TapyrusUnits::separatorAlways);
     case TxHashRole:
         return rec->getTxHash();
     case TxHexRole:
@@ -605,14 +633,14 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
                 details.append(QString::fromStdString(rec->address));
                 details.append(" ");
             }
-            details.append(formatTxAmount(rec, false, BitcoinUnits::separatorNever));
+            details.append(formatTxAmount(rec, false, TapyrusUnits::separatorNever));
             return details;
         }
     case ConfirmedRole:
         return rec->status.countsForBalance;
     case FormattedAmountRole:
         // Used for copy/export, so don't include separators
-        return formatTxAmount(rec, false, BitcoinUnits::separatorNever);
+        return formatTxAmount(rec, false, TapyrusUnits::separatorNever);
     case StatusRole:
         return rec->status.status;
     }
@@ -644,6 +672,8 @@ QVariant TransactionTableModel::headerData(int section, Qt::Orientation orientat
                 return tr("Whether or not a watch-only address is involved in this transaction.");
             case ToAddress:
                 return tr("User-defined intent/purpose of the transaction.");
+            case Token:
+                return tr("Token type/ color of the transaction.");
             case Amount:
                 return tr("Amount removed from or added to balance.");
             }
@@ -655,10 +685,10 @@ QVariant TransactionTableModel::headerData(int section, Qt::Orientation orientat
 QModelIndex TransactionTableModel::index(int row, int column, const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
-    TransactionRecord *data = priv->index(walletModel->wallet(), row);
+    TransactionRecord *data = priv->index(walletModel->node(), walletModel->wallet(), row);
     if(data)
     {
-        return createIndex(row, column, priv->index(walletModel->wallet(), row));
+        return createIndex(row, column, priv->index(walletModel->node(), walletModel->wallet(), row));
     }
     return QModelIndex();
 }
@@ -736,8 +766,8 @@ static void ShowProgress(TransactionTableModel *ttm, const std::string &title, i
 void TransactionTableModel::subscribeToCoreSignals()
 {
     // Connect signals to wallet
-    m_handler_transaction_changed = walletModel->wallet().handleTransactionChanged(boost::bind(NotifyTransactionChanged, this, _1, _2));
-    m_handler_show_progress = walletModel->wallet().handleShowProgress(boost::bind(ShowProgress, this, _1, _2));
+    m_handler_transaction_changed = walletModel->wallet().handleTransactionChanged(boost::bind(NotifyTransactionChanged, this, boost::placeholders::_1, boost::placeholders::_2));
+    m_handler_show_progress = walletModel->wallet().handleShowProgress(boost::bind(ShowProgress, this, boost::placeholders::_1, boost::placeholders::_2));
 }
 
 void TransactionTableModel::unsubscribeFromCoreSignals()
diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h
index 3754ec37f1..098dc87559 100644
--- a/src/qt/transactiontablemodel.h
+++ b/src/qt/transactiontablemodel.h
@@ -37,7 +37,8 @@ class TransactionTableModel : public QAbstractTableModel
         Date = 2,
         Type = 3,
         ToAddress = 4,
-        Amount = 5
+        Token = 5,
+        Amount = 6
     };
 
     /** Roles to get specific information from a transaction row.
@@ -58,6 +59,8 @@ class TransactionTableModel : public QAbstractTableModel
         AddressRole,
         /** Label of address related to transaction */
         LabelRole,
+        /** Token of address related to transaction */
+        TokenRole,
         /** Net amount of transaction */
         AmountRole,
         /** Transaction hash */
@@ -101,7 +104,8 @@ class TransactionTableModel : public QAbstractTableModel
     QString formatTxDate(const TransactionRecord *wtx) const;
     QString formatTxType(const TransactionRecord *wtx) const;
     QString formatTxToAddress(const TransactionRecord *wtx, bool tooltip) const;
-    QString formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed=true, BitcoinUnits::SeparatorStyle separators=BitcoinUnits::separatorStandard) const;
+    QString formatTxToken(const TransactionRecord *wtx) const;
+    QString formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed=true, TapyrusUnits::SeparatorStyle separators=TapyrusUnits::separatorStandard) const;
     QString formatTooltip(const TransactionRecord *rec) const;
     QVariant txStatusDecoration(const TransactionRecord *wtx) const;
     QVariant txWatchonlyDecoration(const TransactionRecord *wtx) const;
diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index 0a2663274e..2263044b56 100644
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -85,11 +85,16 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
 
     typeWidget->addItem(tr("All"), TransactionFilterProxy::ALL_TYPES);
     typeWidget->addItem(tr("Received with"), TransactionFilterProxy::TYPE(TransactionRecord::RecvWithAddress) |
-                                        TransactionFilterProxy::TYPE(TransactionRecord::RecvFromOther));
+                TransactionFilterProxy::TYPE(TransactionRecord::RecvFromOther)|
+                TransactionFilterProxy::TYPE(TransactionRecord::TokenRecvWithAddress)|
+                TransactionFilterProxy::TYPE(TransactionRecord::TokenRecvFromOther));
     typeWidget->addItem(tr("Sent to"), TransactionFilterProxy::TYPE(TransactionRecord::SendToAddress) |
-                                  TransactionFilterProxy::TYPE(TransactionRecord::SendToOther));
-    typeWidget->addItem(tr("To yourself"), TransactionFilterProxy::TYPE(TransactionRecord::SendToSelf));
+                TransactionFilterProxy::TYPE(TransactionRecord::SendToOther)|
+                TransactionFilterProxy::TYPE(TransactionRecord::TokenSendToAddress)|
+                TransactionFilterProxy::TYPE(TransactionRecord::TokenSendToOther));
+    typeWidget->addItem(tr("To yourself"), TransactionFilterProxy::TYPE(TransactionRecord::SendToSelf) | TransactionFilterProxy::TYPE(TransactionRecord::TokenSendToSelf));
     typeWidget->addItem(tr("Mined"), TransactionFilterProxy::TYPE(TransactionRecord::Generated));
+    typeWidget->addItem(tr("Token"), TransactionFilterProxy::TYPE(TransactionRecord::TokenRecvWithAddress)|TransactionFilterProxy::TYPE(TransactionRecord::TokenRecvFromOther)|TransactionFilterProxy::TYPE(TransactionRecord::TokenSendToAddress)|TransactionFilterProxy::TYPE(TransactionRecord::TokenSendToOther));
     typeWidget->addItem(tr("Other"), TransactionFilterProxy::TYPE(TransactionRecord::Other));
 
     hlayout->addWidget(typeWidget);
@@ -332,7 +337,7 @@ void TransactionView::changedAmount()
     if(!transactionProxyModel)
         return;
     CAmount amount_parsed = 0;
-    if (BitcoinUnits::parse(model->getOptionsModel()->getDisplayUnit(), amountWidget->text(), &amount_parsed)) {
+    if (TapyrusUnits::parse(model->getOptionsModel()->getDisplayUnit(), amountWidget->text(), &amount_parsed)) {
         transactionProxyModel->setMinAmount(amount_parsed);
     }
     else
@@ -366,7 +371,7 @@ void TransactionView::exportClicked()
     writer.addColumn(tr("Type"), TransactionTableModel::Type, Qt::EditRole);
     writer.addColumn(tr("Label"), 0, TransactionTableModel::LabelRole);
     writer.addColumn(tr("Address"), 0, TransactionTableModel::AddressRole);
-    writer.addColumn(BitcoinUnits::getAmountColumnTitle(model->getOptionsModel()->getDisplayUnit()), 0, TransactionTableModel::FormattedAmountRole);
+    writer.addColumn(TapyrusUnits::getAmountColumnTitle(model->getOptionsModel()->getDisplayUnit()), 0, TransactionTableModel::FormattedAmountRole);
     writer.addColumn(tr("ID"), 0, TransactionTableModel::TxHashRole);
 
     if(!writer.write()) {
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 3748ecbaf9..4134607d99 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -125,6 +125,18 @@ bool WalletModel::validateAddress(const QString &address)
     return IsValidDestinationString(address.toStdString());
 }
 
+bool WalletModel::isColoredAddress(const QString &address)
+{
+    return IsColoredDestination(address.toStdString(), nullptr);
+}
+
+ColorIdentifier WalletModel::getColorFromAddress(const QString &address)
+{
+    ColorIdentifier colorId;
+    if(IsColoredDestination(address.toStdString(), &colorId))
+        return colorId;
+}
+
 WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransaction &transaction, const CCoinControl& coinControl)
 {
     CAmount total = 0;
@@ -389,10 +401,10 @@ void WalletModel::subscribeToCoreSignals()
     // Connect signals to wallet
     m_handler_unload = m_wallet->handleUnload(boost::bind(&NotifyUnload, this));
     m_handler_status_changed = m_wallet->handleStatusChanged(boost::bind(&NotifyKeyStoreStatusChanged, this));
-    m_handler_address_book_changed = m_wallet->handleAddressBookChanged(boost::bind(NotifyAddressBookChanged, this, _1, _2, _3, _4, _5));
-    m_handler_transaction_changed = m_wallet->handleTransactionChanged(boost::bind(NotifyTransactionChanged, this, _1, _2));
-    m_handler_show_progress = m_wallet->handleShowProgress(boost::bind(ShowProgress, this, _1, _2));
-    m_handler_watch_only_changed = m_wallet->handleWatchOnlyChanged(boost::bind(NotifyWatchonlyChanged, this, _1));
+    m_handler_address_book_changed = m_wallet->handleAddressBookChanged(boost::bind(NotifyAddressBookChanged, this,boost::placeholders:: _1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5));
+    m_handler_transaction_changed = m_wallet->handleTransactionChanged(boost::bind(NotifyTransactionChanged, this, boost::placeholders::_1, boost::placeholders::_2));
+    m_handler_show_progress = m_wallet->handleShowProgress(boost::bind(ShowProgress, this, boost::placeholders::_1, boost::placeholders::_2));
+    m_handler_watch_only_changed = m_wallet->handleWatchOnlyChanged(boost::bind(NotifyWatchonlyChanged, this, boost::placeholders::_1));
 }
 
 void WalletModel::unsubscribeFromCoreSignals()
@@ -483,15 +495,15 @@ bool WalletModel::bumpFee(uint256 hash)
     questionString.append("<tr><td>");
     questionString.append(tr("Current fee:"));
     questionString.append("</td><td>");
-    questionString.append(BitcoinUnits::formatHtmlWithUnit(getOptionsModel()->getDisplayUnit(), old_fee));
+    questionString.append(TapyrusUnits::formatHtmlWithUnit(getOptionsModel()->getDisplayUnit(), old_fee));
     questionString.append("</td></tr><tr><td>");
     questionString.append(tr("Increase:"));
     questionString.append("</td><td>");
-    questionString.append(BitcoinUnits::formatHtmlWithUnit(getOptionsModel()->getDisplayUnit(), new_fee - old_fee));
+    questionString.append(TapyrusUnits::formatHtmlWithUnit(getOptionsModel()->getDisplayUnit(), new_fee - old_fee));
     questionString.append("</td></tr><tr><td>");
     questionString.append(tr("New fee:"));
     questionString.append("</td><td>");
-    questionString.append(BitcoinUnits::formatHtmlWithUnit(getOptionsModel()->getDisplayUnit(), new_fee));
+    questionString.append(TapyrusUnits::formatHtmlWithUnit(getOptionsModel()->getDisplayUnit(), new_fee));
     questionString.append("</td></tr></table>");
     SendConfirmationDialog confirmationDialog(tr("Confirm fee bump"), questionString);
     confirmationDialog.exec();
@@ -542,3 +554,10 @@ bool WalletModel::isMultiwallet()
 {
     return m_node.getWallets().size() > 1;
 }
+
+//Constructor definition moved here to initialize colorid
+SendCoinsRecipient::SendCoinsRecipient(const QString &addr, const QString &_label, const CAmount& _amount, const QString &_message):
+    address(addr), label(_label), amount(_amount), message(_message), fSubtractFeeFromAmount(false), nVersion(SendCoinsRecipient::CURRENT_VERSION)
+    {
+        IsColoredDestination(address.toStdString(), &colorid);
+    }
\ No newline at end of file
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 0579b372b0..1b8fd97192 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -51,9 +51,9 @@ QT_END_NAMESPACE
 class SendCoinsRecipient
 {
 public:
-    explicit SendCoinsRecipient() : amount(0), fSubtractFeeFromAmount(false), nVersion(SendCoinsRecipient::CURRENT_VERSION) { }
-    explicit SendCoinsRecipient(const QString &addr, const QString &_label, const CAmount& _amount, const QString &_message):
-        address(addr), label(_label), amount(_amount), message(_message), fSubtractFeeFromAmount(false), nVersion(SendCoinsRecipient::CURRENT_VERSION) {}
+    explicit SendCoinsRecipient() : amount(0), fSubtractFeeFromAmount(false), colorid(), nVersion(SendCoinsRecipient::CURRENT_VERSION)  { }
+    //only decleration is here
+    explicit SendCoinsRecipient(const QString &addr, const QString &_label, const CAmount& _amount, const QString &_message);
 
     // If from an unauthenticated payment request, this is used for storing
     // the addresses, e.g. address-A<br />address-B<br />address-C.
@@ -62,6 +62,7 @@ class SendCoinsRecipient
     // Todo: This is a hack, should be replaced with a cleaner solution!
     QString address;
     QString label;
+    ColorIdentifier colorid;
     CAmount amount;
     // If from a payment request, this is used for storing the memo
     QString message;
@@ -86,6 +87,7 @@ class SendCoinsRecipient
         READWRITE(this->nVersion);
         READWRITE(sAddress);
         READWRITE(sLabel);
+        READWRITE(colorid);
         READWRITE(amount);
         READWRITE(sMessage);
         READWRITE(sPaymentRequest);
@@ -139,6 +141,10 @@ class WalletModel : public QObject
     // Check address for validity
     bool validateAddress(const QString &address);
 
+    //check if the address is a token
+    bool isColoredAddress(const QString &address);
+    ColorIdentifier getColorFromAddress(const QString &address);
+
     // Return status record for SendCoins, contains error id + information
     struct SendCoinsReturn
     {
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 5dc9771206..c5baad47f7 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -136,7 +136,7 @@ static UniValue createmultisig(const JSONRPCRequest& request)
     // Construct using pay-to-script-hash:
     const CScript inner = CreateMultisigRedeemscript(required, pubkeys);
     CBasicKeyStore keystore;
-    const CTxDestination dest = AddAndGetDestinationForScript(keystore, inner, output_type);
+    const CTxDestination dest = AddAndGetDestinationForScript(keystore, inner, output_type, ColorIdentifier());
 
     UniValue result(UniValue::VOBJ);
     result.pushKV("address", EncodeDestination(dest));
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index db103feeb7..1bd70d2eb5 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -23,6 +23,7 @@ unsigned nMaxDatacarrierBytes = MAX_OP_RETURN_RELAY;
 
 CScriptID::CScriptID(const CScript& in) : uint160(Hash160(in.begin(), in.end())) {}
 
+CColorScriptID::CColorScriptID(const CScript& in, const ColorIdentifier& colorin): uint160(Hash160(in.begin(), in.end())), color(colorin) {}
 
 const char* GetTxnOutputType(txnouttype t)
 {
diff --git a/src/script/standard.h b/src/script/standard.h
index c4c6a77410..cb3a513cec 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -33,6 +33,7 @@ class CColorScriptID : public uint160
 public:
     ColorIdentifier color;
     explicit CColorScriptID(const ColorIdentifier& colorin) : uint160(), color(colorin) {}
+    explicit CColorScriptID(const CScript& in, const ColorIdentifier& colorin);
     explicit CColorScriptID(const uint160& in, const ColorIdentifier& colorin) : uint160(in), color(colorin) {}
 };
 /**
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 29ce064967..c2572c187d 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -82,7 +82,7 @@ static bool GetWalletAddressesForKey(CWallet * const pwallet, const CKeyID &keyi
         }
     }
     if (!fLabelFound) {
-        strAddr = EncodeDestination(GetDestinationForKey(key.GetPubKey(), pwallet->m_default_address_type));
+        strAddr = EncodeDestination(GetDestinationForKey(key.GetPubKey(), pwallet->m_default_address_type, ColorIdentifier()));
     }
     return fLabelFound;
 }
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 54234fcb98..ba2c097c94 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -218,7 +218,7 @@ static UniValue getnewaddress(const JSONRPCRequest& request)
     OutputType output_type = pwallet->m_default_address_type;
 
     if (colorId.type == TokenTypes::NONE)
-        dest = GetDestinationForKey(newKey, output_type);
+        dest = GetDestinationForKey(newKey, output_type, colorId);
     else
         dest = CColorKeyID(newKey.GetID(), colorId);
 
@@ -285,7 +285,7 @@ static UniValue getrawchangeaddress(const JSONRPCRequest& request)
     CTxDestination dest;
     OutputType output_type = pwallet->m_default_change_type;
     if (colorId.type == TokenTypes::NONE)
-        dest = GetDestinationForKey(vchPubKey, output_type);
+        dest = GetDestinationForKey(vchPubKey, output_type, colorId);
     else
         dest = CColorKeyID(vchPubKey.GetID(), colorId);
 
@@ -1054,7 +1054,7 @@ static UniValue addmultisigaddress(const JSONRPCRequest& request)
 
     // Construct using pay-to-script-hash:
     CScript inner = CreateMultisigRedeemscript(required, pubkeys);
-    CTxDestination dest = AddAndGetDestinationForScript(*pwallet, inner, output_type);
+    CTxDestination dest = AddAndGetDestinationForScript(*pwallet, inner, output_type, ColorIdentifier());
     pwallet->SetAddressBook(dest, label, "send");
 
     UniValue result(UniValue::VOBJ);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 8dcb1b1d40..30ec2d065a 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -856,7 +856,7 @@ bool CWallet::GetLabelDestination(CTxDestination &dest, const std::string& label
             bForceNew = true;
         else {
             // Check if the current key has been used (TODO: check other addresses with the same key)
-            CScript scriptPubKey = GetScriptForDestination(GetDestinationForKey(account.vchPubKey, m_default_address_type));
+            CScript scriptPubKey = GetScriptForDestination(GetDestinationForKey(account.vchPubKey, m_default_address_type, ColorIdentifier()));
             for (std::map<uint256, CWalletTx>::iterator it = mapWallet.begin();
                  it != mapWallet.end() && account.vchPubKey.IsValid();
                  ++it)
@@ -873,11 +873,11 @@ bool CWallet::GetLabelDestination(CTxDestination &dest, const std::string& label
         if (!GetKeyFromPool(account.vchPubKey, false))
             return false;
 
-        dest = GetDestinationForKey(account.vchPubKey, m_default_address_type);
+        dest = GetDestinationForKey(account.vchPubKey, m_default_address_type, ColorIdentifier());
         SetAddressBook(dest, label, "receive");
         batch.WriteAccount(label, account);
     } else {
-        dest = GetDestinationForKey(account.vchPubKey, m_default_address_type);
+        dest = GetDestinationForKey(account.vchPubKey, m_default_address_type, ColorIdentifier());
     }
 
     return true;
@@ -2727,7 +2727,7 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CTransac
 
                 const OutputType change_type =  m_default_change_type;
 
-                scriptChange = GetScriptForDestination(GetDestinationForKey(vchPubKey, change_type));
+                scriptChange = GetScriptForDestination(GetDestinationForKey(vchPubKey, change_type, ColorIdentifier()));
             }
             CTxOut change_prototype_txout(0, scriptChange);
             coin_selection_params.change_output_size = GetSerializeSize(change_prototype_txout, SER_DISK, 0);