diff --git a/firmware/coins-gen.py b/firmware/coins-gen.py
index 7cb323c725..59c88a868f 100755
--- a/firmware/coins-gen.py
+++ b/firmware/coins-gen.py
@@ -11,7 +11,7 @@ for c in coins:
         '"%s"' % c['coin_name'] if c['coin_name'] is not None else 'NULL',
 
         'true' if c['coin_shortcut'] is not None else 'false',
-        '"%s"' % c['coin_shortcut'] if c['coin_shortcut'] is not None else 'NULL',
+        '" %s"' % c['coin_shortcut'] if c['coin_shortcut'] is not None else 'NULL',
 
         'true' if c['address_type'] is not None else 'false',
         '%d' % c['address_type'] if c['address_type'] is not None else '0',
diff --git a/firmware/coins.c b/firmware/coins.c
index 0ceaf3d499..4a2f11ae5e 100644
--- a/firmware/coins.c
+++ b/firmware/coins.c
@@ -26,27 +26,16 @@
 // filled CoinType Protobuf structure defined in https://github.com/trezor/trezor-common/blob/master/protob/types.proto#L133
 // address types > 0xFF represent a two-byte prefix in big-endian order
 const CoinType coins[COINS_COUNT] = {
-	{true, "Bitcoin",       true, "BTC",  true,    0, true,     500000, true,    5, true, "\x18" "Bitcoin Signed Message:\n",  true, 0x0488b21e, true, 0x0488ade4, true, false, },
-	{true, "Testnet",       true, "TEST", true,  111, true,   10000000, true,  196, true, "\x18" "Bitcoin Signed Message:\n",  true, 0x043587cf, true, 0x04358394, true, true,  },
-	{true, "Namecoin",      true, "NMC",  true,   52, true,   10000000, true,    5, true, "\x19" "Namecoin Signed Message:\n", true, 0x019da462, true, 0x019d9cfe, true, false, },
-	{true, "Litecoin",      true, "LTC",  true,   48, true,    1000000, true,   50, true, "\x19" "Litecoin Signed Message:\n", true, 0x019da462, true, 0x019d9cfe, true, true,  },
-	{true, "Dogecoin",      true, "DOGE", true,   30, true, 1000000000, true,   22, true, "\x19" "Dogecoin Signed Message:\n", true, 0x02facafd, true, 0x02fac398, true, false, },
-	{true, "Dash",          true, "DASH", true,   76, true,     100000, true,   16, true, "\x19" "DarkCoin Signed Message:\n", true, 0x02fe52cc, true, 0x02fe52f8, true, false, },
-	{true, "Zcash",         true, "ZEC",  true, 7352, true,    1000000, true, 7357, true, "\x16" "Zcash Signed Message:\n",    true, 0x0488b21e, true, 0x0488ade4, true, false, },
-	{true, "Zcash Testnet", true, "TAZ",  true, 7461, true,   10000000, true, 7354, true, "\x16" "Zcash Signed Message:\n",    true, 0x043587cf, true, 0x04358394, true, false, },
+	{true, "Bitcoin",       true, " BTC",  true,    0, true,     500000, true,    5, true, "\x18" "Bitcoin Signed Message:\n",  true, 0x0488b21e, true, 0x0488ade4, true, false, },
+	{true, "Testnet",       true, " TEST", true,  111, true,   10000000, true,  196, true, "\x18" "Bitcoin Signed Message:\n",  true, 0x043587cf, true, 0x04358394, true, true,  },
+	{true, "Namecoin",      true, " NMC",  true,   52, true,   10000000, true,    5, true, "\x19" "Namecoin Signed Message:\n", true, 0x019da462, true, 0x019d9cfe, true, false, },
+	{true, "Litecoin",      true, " LTC",  true,   48, true,    1000000, true,   50, true, "\x19" "Litecoin Signed Message:\n", true, 0x019da462, true, 0x019d9cfe, true, true,  },
+	{true, "Dogecoin",      true, " DOGE", true,   30, true, 1000000000, true,   22, true, "\x19" "Dogecoin Signed Message:\n", true, 0x02facafd, true, 0x02fac398, true, false, },
+	{true, "Dash",          true, " DASH", true,   76, true,     100000, true,   16, true, "\x19" "DarkCoin Signed Message:\n", true, 0x02fe52cc, true, 0x02fe52f8, true, false, },
+	{true, "Zcash",         true, " ZEC",  true, 7352, true,    1000000, true, 7357, true, "\x16" "Zcash Signed Message:\n",    true, 0x0488b21e, true, 0x0488ade4, true, false, },
+	{true, "Zcash Testnet", true, " TAZ",  true, 7461, true,   10000000, true, 7354, true, "\x16" "Zcash Signed Message:\n",    true, 0x043587cf, true, 0x04358394, true, false, },
 };
 
-const CoinType *coinByShortcut(const char *shortcut)
-{
-	if (!shortcut) return 0;
-	for (int i = 0; i < COINS_COUNT; i++) {
-		if (strcmp(shortcut, coins[i].coin_shortcut) == 0) {
-			return &(coins[i]);
-		}
-	}
-	return 0;
-}
-
 const CoinType *coinByName(const char *name)
 {
 	if (!name) return 0;
diff --git a/firmware/coins.h b/firmware/coins.h
index 46a70a7720..1ae87eb846 100644
--- a/firmware/coins.h
+++ b/firmware/coins.h
@@ -26,7 +26,6 @@
 
 extern const CoinType coins[COINS_COUNT];
 
-const CoinType *coinByShortcut(const char *shortcut);
 const CoinType *coinByName(const char *name);
 const CoinType *coinByAddressType(uint32_t address_type);
 bool coinExtractAddressType(const CoinType *coin, const char *addr, uint32_t *address_type);