feat: add graphql support (#349)

* fix: eslint warnings * refactor: use ramda + sanctuary instead of lodash * refactor: use prettier-standard for formatting * feat: enable security * feat: add graphql * chore: remove trailing commas from linter * docs: new scripts on react and new-admin-server * feat: handle authentication on graphql * fix: perf improvement to date picker * chore: add insecure-dev script to run servers
2019-12-24 14:36:41 +00:00 · 2019-12-24 14:36:41 +00:00 · b8e0c2175b
commit b8e0c2175b
parent 49f434f1d1
182 changed files with 8827 additions and 4623 deletions
--- a/bin/insecure-dev.sh
+++ b/bin/insecure-dev.sh
@ -0,0 +1,3 @@
+#!/bin/bash
+
+node bin/new-lamassu-admin-server --dev & node bin/new-graphql-dev-insecure
--- a/bin/new-graphql-dev-insecure
+++ b/bin/new-graphql-dev-insecure
@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+const adminServer = require('../lib/new-admin/graphql-dev-insecure')
+
+adminServer.run()
--- a/bin/new-lamassu-register
+++ b/bin/new-lamassu-register
@ -0,0 +1,30 @@
+#!/usr/bin/env node
+
+const login = require('../lib/admin/login')
+const options = require('../lib/options')
+
+const name = process.argv[2]
+const domain = options.hostname
+
+if (!domain) {
+  console.error('No hostname configured in lamassu.json')
+  process.exit(1)
+}
+
+if (!name) {
+  console.log('Usage: lamassu-register <username>')
+  process.exit(2)
+}
+
+login.generateOTP(name).then(otp => {
+  if (domain === 'localhost') {
+    console.log(`https://${domain}:3000/register?otp=${otp}`)
+  } else {
+    console.log(`https://${domain}?otp=${otp}`)
+  }
+
+  process.exit(0)
+}).catch(err => {
+  console.log('Error: %s', err)
+  process.exit(3)
+})
--- a/lib/logs.js
+++ b/lib/logs.js
@ -95,4 +95,15 @@ function getMachineLogs (deviceId, until = new Date().toISOString()) {
    }))
 }

-module.exports = { getUnlimitedMachineLogs, getMachineLogs, update, getLastSeen, clearOldLogs }
+function simpleGetMachineLogs (deviceId, until = new Date().toISOString()) {
+  const sql = `select id, log_level, timestamp, message from logs
+  where device_id=$1
+  and timestamp <= $3
+  order by timestamp desc, serial desc
+  limit $2`
+
+  return db.any(sql, [ deviceId, NUM_RESULTS, until ])
+    .then(_.map(_.mapKeys(_.camelCase)))
+}
+
+module.exports = { getUnlimitedMachineLogs, getMachineLogs, simpleGetMachineLogs, update, getLastSeen, clearOldLogs }
--- a/lib/new-admin/README.md
+++ b/lib/new-admin/README.md
@ -0,0 +1,6 @@
+## Running
+
+Differences from main lamassu-admin:
+
+- `bin/new-lamassu-register <username>` to add a user
+- `bin/insecure-dev` to run the server
--- a/lib/new-admin/admin-server.js
+++ b/lib/new-admin/admin-server.js
@ -1,103 +1,92 @@
-const bodyParser = require('body-parser')
-const cors = require('cors')
+const fs = require('fs')
 const express = require('express')
-const http = require('http')
-const got = require('got')
+const https = require('https')
+const helmet = require('helmet')
+const cookieParser = require('cookie-parser')
+const { ApolloServer, AuthenticationError } = require('apollo-server-express')

-const supportLogs = require('../support_logs')
-const machineLoader = require('../machine-loader')
-const logs = require('../logs')
-const transactions = require('./transactions')
+const T = require('../time')
+const options = require('../options')

-const serverLogs = require('./server-logs')
-const supervisor = require('./supervisor')
-const funding = require('./funding')
-const config = require('./config')
+const login = require('./login')
+const { typeDefs, resolvers } = require('./graphql/schema')

 const devMode = require('minimist')(process.argv.slice(2)).dev
+const NEVER = new Date(Date.now() + 100 * T.years)

-const app = express()
-app.use(bodyParser.json())
-
-if (devMode) {
-  app.use(cors())
+const hostname = options.hostname
+if (!hostname) {
+  console.error('Error: no hostname specified.')
+  process.exit(1)
 }

-app.get('/api/config', async (req, res, next) => {
-  const state = config.getConfig(req.params.config)
-  const data = await config.fetchData()
-  res.json({ state, data })
-  next()
+const app = express()
+app.use(helmet({ noCache: true }))
+app.use(cookieParser())
+
+const apolloServer = new ApolloServer({
+  typeDefs,
+  resolvers,
+  playground: false,
+  introspection: false,
+  formatError: error => {
+    console.log(error)
+    return error
+  },
+  context: async ({ req }) => {
+    const token = req.cookies && req.cookies.token
+
+    const success = await login.authenticate(token)
+    if (!success) throw new AuthenticationError('Authentication failed')
+  }
 })

-app.post('/api/config', (req, res, next) => {
-  config.saveConfig(req.body)
-    .then(it => res.json(it))
-    .then(() => dbNotify())
-    .catch(next)
+apolloServer.applyMiddleware({
+  app,
+  cors: {
+    credentials: true,
+    origin: devMode && 'https://localhost:3000'
+  }
 })

-app.get('/api/funding', (req, res) => {
-  return funding.getFunding()
-    .then(r => res.json(r))
+app.get('/api/register', (req, res, next) => {
+  const otp = req.query.otp
+
+  if (!otp) return next()
+
+  return login.register(otp)
+    .then(r => {
+      if (r.expired) return res.status(401).send('OTP expired, generate new registration link')
+
+      // Maybe user is using old registration key, attempt to authenticate
+      if (!r.success) return next()
+
+      const cookieOpts = {
+        httpOnly: true,
+        secure: true,
+        domain: hostname,
+        sameSite: true,
+        expires: NEVER
+      }
+
+      const token = r.token
+      req.token = token
+      res.cookie('token', token, cookieOpts)
+      res.sendStatus(200)
+    })
 })

-app.get('/api/machines', (req, res) => {
-  machineLoader.getMachineNames()
-    .then(r => res.send({ machines: r }))
-})
-
-app.get('/api/logs/:deviceId', (req, res, next) => {
-  return logs.getMachineLogs(req.params.deviceId)
-    .then(r => res.send(r))
-    .catch(next)
-})
-
-app.post('/api/support_logs', (req, res, next) => {
-  return supportLogs.insert(req.query.deviceId)
-    .then(r => res.send(r))
-    .catch(next)
-})
-
-app.get('/api/version', (req, res, next) => {
-  res.send(require('../../package.json').version)
-})
-
-app.get('/api/uptimes', (req, res, next) => {
-  return supervisor.getAllProcessInfo()
-    .then(r => res.send(r))
-    .catch(next)
-})
-
-app.post('/api/server_support_logs', (req, res, next) => {
-  return serverLogs.insert()
-    .then(r => res.send(r))
-    .catch(next)
-})
-
-app.get('/api/server_logs', (req, res, next) => {
-  return serverLogs.getServerLogs()
-    .then(r => res.send(r))
-    .catch(next)
-})
-
-app.get('/api/txs', (req, res, next) => {
-  return transactions.batch()
-    .then(r => res.send(r))
-    .catch(next)
-})
-
-function dbNotify () {
-  return got.post('http://localhost:3030/dbChange')
-    .catch(e => console.error('Error: lamassu-server not responding'))
+const certOptions = {
+  key: fs.readFileSync(options.keyPath),
+  cert: fs.readFileSync(options.certPath)
 }

 function run () {
-  const serverPort = 8070
+  const serverPort = devMode ? 8070 : 443

  const serverLog = `lamassu-admin-server listening on port ${serverPort}`

-  const webServer = http.createServer(app)
+  const webServer = https.createServer(certOptions, app)
  webServer.listen(serverPort, () => console.log(serverLog))
 }

--- a/lib/new-admin/config.js
+++ b/lib/new-admin/config.js
@ -1,109 +0,0 @@
-const _ = require('lodash/fp')
-const devMode = require('minimist')(process.argv.slice(2)).dev
-
-const settingsLoader = require('../new-settings-loader')
-const machineLoader = require('../machine-loader')
-
-const currencies = require('../../currencies.json')
-const languageRec = require('../../languages.json')
-const countries = require('../../countries.json')
-
-function saveConfig (config) {
-  return settingsLoader.saveConfig(config)
-}
-
-function getConfig () {
-  return settingsLoader.getConfig()
-}
-
-function massageCurrencies (currencies) {
-  const convert = r => ({
-    code: r['Alphabetic Code'],
-    display: r['Currency']
-  })
-  const top5Codes = ['USD', 'EUR', 'GBP', 'CAD', 'AUD']
-  const mapped = _.map(convert, currencies)
-  const codeToRec = code => _.find(_.matchesProperty('code', code), mapped)
-  const top5 = _.map(codeToRec, top5Codes)
-  const raw = _.uniqBy(_.get('code'), _.concat(top5, mapped))
-  return raw.filter(r => r.code[0] !== 'X' && r.display.indexOf('(') === -1)
-}
-
-const mapLanguage = lang => {
-  const arr = lang.split('-')
-  const code = arr[0]
-  const country = arr[1]
-  const langNameArr = languageRec.lang[code]
-  if (!langNameArr) return null
-  const langName = langNameArr[0]
-  if (!country) return {code: lang, display: langName}
-  return {code: lang, display: `${langName} [${country}]`}
-}
-
-const supportedLanguages = languageRec.supported
-const languages = supportedLanguages.map(mapLanguage).filter(r => r)
-const ALL_CRYPTOS = ['BTC', 'ETH', 'LTC', 'DASH', 'ZEC', 'BCH']
-
-const filterAccounts = (data, isDevMode) => {
-  const notAllowed = ['mock-ticker', 'mock-wallet', 'mock-exchange', 'mock-sms', 'mock-id-verify', 'mock-zero-conf']
-  const filterOut = o => _.includes(o.code, notAllowed)
-  return isDevMode ? data : {...data, accounts: _.filter(a => !filterOut(a), data.accounts)}
-}
-
-function fetchData () {
-  return machineLoader.getMachineNames()
-    .then(machineList => ({
-      currencies: massageCurrencies(currencies),
-      cryptoCurrencies: [
-        {code: 'BTC', display: 'Bitcoin'},
-        {code: 'ETH', display: 'Ethereum'},
-        {code: 'LTC', display: 'Litecoin'},
-        {code: 'DASH', display: 'Dash'},
-        {code: 'ZEC', display: 'Zcash'},
-        {code: 'BCH', display: 'Bitcoin Cash'}
-      ],
-      languages: languages,
-      countries,
-      accounts: [
-        {code: 'bitpay', display: 'Bitpay', class: 'ticker', cryptos: ['BTC', 'BCH']},
-        {code: 'kraken', display: 'Kraken', class: 'ticker', cryptos: ['BTC', 'ETH', 'LTC', 'DASH', 'ZEC', 'BCH']},
-        {code: 'bitstamp', display: 'Bitstamp', class: 'ticker', cryptos: ['BTC', 'ETH', 'LTC', 'BCH']},
-        {code: 'coinbase', display: 'Coinbase', class: 'ticker', cryptos: ['BTC', 'ETH', 'LTC', 'BCH']},
-        {code: 'itbit', display: 'itBit', class: 'ticker', cryptos: ['BTC']},
-        {code: 'mock-ticker', display: 'Mock (Caution!)', class: 'ticker', cryptos: ALL_CRYPTOS},
-        {code: 'bitcoind', display: 'bitcoind', class: 'wallet', cryptos: ['BTC']},
-        {code: 'no-layer2', display: 'No Layer 2', class: 'layer2', cryptos: ALL_CRYPTOS},
-        {code: 'infura', display: 'Infura', class: 'wallet', cryptos: ['ETH']},
-        {code: 'geth', display: 'geth', class: 'wallet', cryptos: ['ETH']},
-        {code: 'zcashd', display: 'zcashd', class: 'wallet', cryptos: ['ZEC']},
-        {code: 'litecoind', display: 'litecoind', class: 'wallet', cryptos: ['LTC']},
-        {code: 'dashd', display: 'dashd', class: 'wallet', cryptos: ['DASH']},
-        {code: 'bitcoincashd', display: 'bitcoincashd', class: 'wallet', cryptos: ['BCH']},
-        {code: 'bitgo', display: 'BitGo', class: 'wallet', cryptos: ['BTC', 'ZEC', 'LTC', 'BCH', 'DASH']},
-        {code: 'bitstamp', display: 'Bitstamp', class: 'exchange', cryptos: ['BTC', 'ETH', 'LTC', 'BCH']},
-        {code: 'itbit', display: 'itBit', class: 'exchange', cryptos: ['BTC']},
-        {code: 'kraken', display: 'Kraken', class: 'exchange', cryptos: ['BTC', 'ETH', 'LTC', 'DASH', 'ZEC', 'BCH']},
-        {code: 'mock-wallet', display: 'Mock (Caution!)', class: 'wallet', cryptos: ALL_CRYPTOS},
-        {code: 'no-exchange', display: 'No exchange', class: 'exchange', cryptos: ALL_CRYPTOS},
-        {code: 'mock-exchange', display: 'Mock exchange', class: 'exchange', cryptos: ALL_CRYPTOS},
-        {code: 'mock-sms', display: 'Mock SMS', class: 'sms'},
-        {code: 'mock-id-verify', display: 'Mock ID verifier', class: 'idVerifier'},
-        {code: 'twilio', display: 'Twilio', class: 'sms'},
-        {code: 'mailgun', display: 'Mailgun', class: 'email'},
-        {code: 'all-zero-conf', display: 'Always 0-conf', class: 'zeroConf', cryptos: ['BTC', 'ZEC', 'LTC', 'DASH', 'BCH']},
-        {code: 'no-zero-conf', display: 'Always 1-conf', class: 'zeroConf', cryptos: ALL_CRYPTOS},
-        {code: 'blockcypher', display: 'Blockcypher', class: 'zeroConf', cryptos: ['BTC']},
-        {code: 'mock-zero-conf', display: 'Mock 0-conf', class: 'zeroConf', cryptos: ['BTC', 'ZEC', 'LTC', 'DASH', 'BCH', 'ETH']}
-      ],
-      machines: machineList.map(machine => ({machine: machine.deviceId, display: machine.name}))
-    }))
-    .then((data) => {
-      return filterAccounts(data, devMode)
-    })
-}
-
-module.exports = {
-  saveConfig,
-  getConfig,
-  fetchData
-}
--- a/lib/new-admin/config/accounts.js
+++ b/lib/new-admin/config/accounts.js
@ -0,0 +1,46 @@
+const { COINS, ALL_CRYPTOS } = require('./coins')
+
+const { BTC, BCH, DASH, ETH, LTC, ZEC } = COINS
+
+const TICKER = 'ticker'
+const WALLET = 'wallet'
+const LAYER_2 = 'layer2'
+const EXCHANGE = 'exchange'
+const SMS = 'sms'
+const ID_VERIFIER = 'idVerifier'
+const EMAIL = 'email'
+const ZERO_CONF = 'zeroConf'
+
+const ACCOUNT_LIST = [
+  { code: 'bitpay', display: 'Bitpay', class: TICKER, cryptos: [BTC, BCH] },
+  { code: 'kraken', display: 'Kraken', class: TICKER, cryptos: [BTC, ETH, LTC, DASH, ZEC, BCH] },
+  { code: 'bitstamp', display: 'Bitstamp', class: TICKER, cryptos: [BTC, ETH, LTC, BCH] },
+  { code: 'coinbase', display: 'Coinbase', class: TICKER, cryptos: [BTC, ETH, LTC, BCH] },
+  { code: 'itbit', display: 'itBit', class: TICKER, cryptos: [BTC] },
+  { code: 'mock-ticker', display: 'Mock (Caution!)', class: TICKER, cryptos: ALL_CRYPTOS },
+  { code: 'bitcoind', display: 'bitcoind', class: WALLET, cryptos: [BTC] },
+  { code: 'no-layer2', display: 'No Layer 2', class: LAYER_2, cryptos: ALL_CRYPTOS },
+  { code: 'infura', display: 'Infura', class: WALLET, cryptos: [ETH] },
+  { code: 'geth', display: 'geth', class: WALLET, cryptos: [ETH] },
+  { code: 'zcashd', display: 'zcashd', class: WALLET, cryptos: [ZEC] },
+  { code: 'litecoind', display: 'litecoind', class: WALLET, cryptos: [LTC] },
+  { code: 'dashd', display: 'dashd', class: WALLET, cryptos: [DASH] },
+  { code: 'bitcoincashd', display: 'bitcoincashd', class: WALLET, cryptos: [BCH] },
+  { code: 'bitgo', display: 'BitGo', class: WALLET, cryptos: [BTC, ZEC, LTC, BCH, DASH] },
+  { code: 'bitstamp', display: 'Bitstamp', class: EXCHANGE, cryptos: [BTC, ETH, LTC, BCH] },
+  { code: 'itbit', display: 'itBit', class: EXCHANGE, cryptos: [BTC] },
+  { code: 'kraken', display: 'Kraken', class: EXCHANGE, cryptos: [BTC, ETH, LTC, DASH, ZEC, BCH] },
+  { code: 'mock-wallet', display: 'Mock (Caution!)', class: WALLET, cryptos: ALL_CRYPTOS },
+  { code: 'no-exchange', display: 'No exchange', class: EXCHANGE, cryptos: ALL_CRYPTOS },
+  { code: 'mock-exchange', display: 'Mock exchange', class: EXCHANGE, cryptos: ALL_CRYPTOS },
+  { code: 'mock-sms', display: 'Mock SMS', class: SMS },
+  { code: 'mock-id-verify', display: 'Mock ID verifier', class: ID_VERIFIER },
+  { code: 'twilio', display: 'Twilio', class: SMS },
+  { code: 'mailgun', display: 'Mailgun', class: EMAIL },
+  { code: 'all-zero-conf', display: 'Always 0-conf', class: ZERO_CONF, cryptos: [BTC, ZEC, LTC, DASH, BCH] },
+  { code: 'no-zero-conf', display: 'Always 1-conf', class: ZERO_CONF, cryptos: ALL_CRYPTOS },
+  { code: 'blockcypher', display: 'Blockcypher', class: ZERO_CONF, cryptos: [BTC] },
+  { code: 'mock-zero-conf', display: 'Mock 0-conf', class: ZERO_CONF, cryptos: [BTC, ZEC, LTC, DASH, BCH, ETH] }
+]
+
+module.exports = { ACCOUNT_LIST }
--- a/lib/new-admin/config/coins.js
+++ b/lib/new-admin/config/coins.js
@ -0,0 +1,23 @@
+const _ = require('lodash/fp')
+
+const COINS = {
+  BTC: 'BTC',
+  ETH: 'ETH',
+  LTC: 'LTC',
+  DASH: 'DASH',
+  ZEC: 'ZEC',
+  BCH: 'BCH'
+}
+
+const COIN_LIST = [
+  { code: COINS.BTC, display: 'Bitcoin' },
+  { code: COINS.ETH, display: 'Ethereum' },
+  { code: COINS.LTC, display: 'Litecoin' },
+  { code: COINS.DASH, display: 'Dash' },
+  { code: COINS.ZEC, display: 'Zcash' },
+  { code: COINS.BCH, display: 'Bitcoin Cash' }
+]
+
+const ALL_CRYPTOS = _.keys(COINS)
+
+module.exports = { COINS, ALL_CRYPTOS, COIN_LIST }
--- a/lib/new-admin/config/index.js
+++ b/lib/new-admin/config/index.js
@ -0,0 +1,39 @@
+const _ = require('lodash/fp')
+
+const { COIN_LIST: coins } = require('./coins')
+const { ACCOUNT_LIST: accounts } = require('./accounts')
+
+const countries = require('../../../countries.json')
+const currenciesRec = require('../../../currencies.json')
+const languageRec = require('../../../languages.json')
+
+function massageCurrencies (currencies) {
+  const convert = r => ({
+    code: r['Alphabetic Code'],
+    display: r['Currency']
+  })
+  const top5Codes = ['USD', 'EUR', 'GBP', 'CAD', 'AUD']
+  const mapped = _.map(convert, currencies)
+  const codeToRec = code => _.find(_.matchesProperty('code', code), mapped)
+  const top5 = _.map(codeToRec, top5Codes)
+  const raw = _.uniqBy(_.get('code'), _.concat(top5, mapped))
+  return raw.filter(r => r.code[0] !== 'X' && r.display.indexOf('(') === -1)
+}
+
+const mapLanguage = lang => {
+  const arr = lang.split('-')
+  const code = arr[0]
+  const country = arr[1]
+  const langNameArr = languageRec.lang[code]
+  if (!langNameArr) return null
+  const langName = langNameArr[0]
+  if (!country) return { code: lang, display: langName }
+  return { code: lang, display: `${langName} [${country}]` }
+}
+
+const supportedLanguages = languageRec.supported
+
+const languages = supportedLanguages.map(mapLanguage).filter(r => r)
+const currencies = massageCurrencies(currenciesRec)
+
+module.exports = { coins, accounts, countries, currencies, languages }
--- a/lib/new-admin/graphql-dev-insecure.js
+++ b/lib/new-admin/graphql-dev-insecure.js
@ -0,0 +1,23 @@
+const bodyParser = require('body-parser')
+const express = require('express')
+const { ApolloServer } = require('apollo-server-express')
+
+const { typeDefs, resolvers } = require('./graphql/schema')
+
+const app = express()
+const server = new ApolloServer({
+  typeDefs,
+  resolvers
+})
+
+server.applyMiddleware({ app })
+
+app.use(bodyParser.json())
+
+function run () {
+  const serverLog = `lamassu-admin-server listening on port ${8080}${server.graphqlPath}`
+
+  app.listen(8080, () => console.log(serverLog))
+}
+
+module.exports = { run }
--- a/lib/new-admin/graphql/schema.js
+++ b/lib/new-admin/graphql/schema.js
@ -0,0 +1,197 @@
+const { gql } = require('apollo-server-express')
+const { GraphQLDateTime } = require('graphql-iso-date')
+const { GraphQLJSON, GraphQLJSONObject } = require('graphql-type-json')
+const got = require('got')
+
+const machineLoader = require('../../machine-loader')
+const logs = require('../../logs')
+const supportLogs = require('../../support_logs')
+const settingsLoader = require('../../new-settings-loader')
+
+const serverVersion = require('../../../package.json').version
+
+const transactions = require('../transactions')
+const funding = require('../funding')
+const supervisor = require('../supervisor')
+const serverLogs = require('../server-logs')
+const { accounts, coins, countries, currencies, languages } = require('../config')
+
+// TODO why does server logs messages can be null?
+const typeDefs = gql`
+  scalar JSON
+  scalar JSONObject
+  scalar Date
+
+  type Currency {
+    code: String!
+    display: String!
+  }
+
+  type CryptoCurrency {
+    code: String!
+    display: String!
+  }
+
+  type Country {
+    code: String!
+    display: String!
+  }
+
+  type Language {
+    code: String!
+    display: String!
+  }
+
+  type Machine {
+    name: String!
+    deviceId: ID!
+    paired: Boolean!
+    cashbox: Int
+    cassette1: Int
+    cassette2: Int
+  }
+
+  type Account {
+    code: String!
+    display: String!
+    class: String!
+    cryptos: [String]
+  }
+
+  type MachineLog {
+    id: ID!
+    logLevel: String!
+    timestamp: Date!
+    message: String!
+  }
+
+  type ServerLog {
+    id: ID!
+    logLevel: String!
+    timestamp: Date!
+    message: String
+  }
+
+  type CoinFunds {
+    cryptoCode: String!
+    fundingAddress: String!
+    fundingAddressUrl: String!
+    confirmedBalance: String!
+    pending: String!
+    fiatConfirmedBalance: String!
+    fiatPending: String!
+    fiatCode: String!
+    display: String!
+    unitScale: String!
+  }
+
+  type ProcessStatus {
+    name: String!
+    state: String!
+    uptime: Date!
+  }
+
+  type Transaction {
+    id: ID!
+    txClass: String!
+    deviceId: ID!
+    toAddress: String
+    cryptoAtoms: String!
+    cryptoCode: String!
+    fiat: String!
+    fiatCode: String!
+    fee: String
+    txHash: String
+    phone: String
+    error: String
+    created: Date
+    send: Boolean
+    sendConfirmed: Boolean
+    timedout: Boolean
+    sendTime: Date
+    errorCode: String
+    operatorCompleted: Boolean
+    sendPending: Boolean
+    cashInFee: String
+    cashInFeeCrypto: String
+    minimumTx: Float
+    customerId: ID
+    txVersion: Int!
+    termsAccepted: Boolean
+    commissionPercentage: String 
+    rawTickerPrice: String
+    isPaperWallet: Boolean
+    customerPhone: String
+    customerIdCardDataNumber: String
+    customerIdCardDataExpiration: Date
+    customerIdCardData: JSONObject
+    customerName: String
+    customerFrontCameraPath: String
+    customerIdCardPhotoPath: String
+    expired: Boolean
+    machineName: String
+  }
+
+  type Query {
+    countries: [Country]
+    currencies: [Currency]
+    languages: [Language]
+    accounts: [Account]
+    cryptoCurrencies: [CryptoCurrency]
+    machines: [Machine]
+    machineLogs(deviceId: ID!): [MachineLog]
+    funding: [CoinFunds]
+    serverVersion: String!
+    uptime: [ProcessStatus]
+    serverLogs: [ServerLog]
+    transactions: [Transaction]
+    config: JSONObject
+  }
+
+  type SupportLogsResponse {
+    id: ID!
+    timestamp: Date!
+    deviceId: ID
+  }
+
+  type Mutation {
+    machineSupportLogs(deviceId: ID!): SupportLogsResponse
+    serverSupportLogs: SupportLogsResponse
+    saveConfig(config: JSONObject): JSONObject
+  }
+`
+
+const notify = () => got.post('http://localhost:3030/dbChange')
+  .catch(e => console.error('Error: lamassu-server not responding'))
+
+const resolvers = {
+  JSON: GraphQLJSON,
+  JSONObject: GraphQLJSONObject,
+  Date: GraphQLDateTime,
+  Query: {
+    countries: () => countries,
+    currencies: () => currencies,
+    languages: () => languages,
+    accounts: () => accounts,
+    cryptoCurrencies: () => coins,
+    machines: () => machineLoader.getMachineNames(),
+    funding: () => funding.getFunding(),
+    machineLogs: (...[, { deviceId }]) => logs.simpleGetMachineLogs(deviceId),
+    serverVersion: () => serverVersion,
+    uptime: () => supervisor.getAllProcessInfo(),
+    serverLogs: () => serverLogs.getServerLogs(),
+    transactions: () => transactions.batch(),
+    config: () => settingsLoader.getConfig()
+  },
+  Mutation: {
+    machineSupportLogs: (...[, { deviceId }]) => supportLogs.insert(deviceId),
+    serverSupportLogs: () => serverLogs.insert(),
+    saveConfig: (...[, { config }]) => settingsLoader.saveConfig(config)
+      .then(it => {
+        notify()
+        return it
+      })
+  }
+}
+
+module.exports = { resolvers, typeDefs }
--- a/lib/new-admin/login.js
+++ b/lib/new-admin/login.js
@ -0,0 +1,48 @@
+const crypto = require('crypto')
+
+const db = require('../db')
+
+function generateOTP (name) {
+  const otp = crypto.randomBytes(32).toString('hex')
+
+  const sql = 'insert into one_time_passes (token, name) values ($1, $2)'
+
+  return db.none(sql, [otp, name])
+    .then(() => otp)
+}
+
+function validateOTP (otp) {
+  const sql = `delete from one_time_passes
+    where token=$1
+    returning name, created < now() - interval '1 hour' as expired`
+
+  return db.one(sql, [otp])
+    .then(r => ({ success: !r.expired, expired: r.expired, name: r.name }))
+    .catch(() => ({ success: false, expired: false }))
+}
+
+function register (otp) {
+  return validateOTP(otp)
+    .then(r => {
+      if (!r.success) return r
+
+      const token = crypto.randomBytes(32).toString('hex')
+      const sql = 'insert into user_tokens (token, name) values ($1, $2)'
+
+      return db.none(sql, [token, r.name])
+        .then(() => ({ success: true, token: token }))
+    })
+    .catch(() => ({ success: false, expired: false }))
+}
+
+function authenticate (token) {
+  const sql = 'select token from user_tokens where token=$1'
+
+  return db.one(sql, [token]).then(() => true).catch(() => false)
+}
+
+module.exports = {
+  generateOTP,
+  register,
+  authenticate
+}
--- a/lib/new-admin/server-logs.js
+++ b/lib/new-admin/server-logs.js
@ -10,10 +10,8 @@ function getServerLogs (until = new Date().toISOString()) {
  order by timestamp desc
  limit $1`

-  return Promise.all([db.any(sql, [ NUM_RESULTS ])])
-    .then(([logs]) => ({
-      logs: _.map(_.mapKeys(_.camelCase), logs)
-    }))
+  return db.any(sql, [ NUM_RESULTS ])
+    .then(_.map(_.mapKeys(_.camelCase)))
 }

 function insert () {
--- a/lib/new-settings-loader.js
+++ b/lib/new-settings-loader.js
@ -18,7 +18,7 @@ function saveConfig (config) {
    .then(() => newState)
 }

-function getConfig (config) {
+function getConfig () {
  return db.getState()
 }

--- a/new-lamassu-admin/.env
+++ b/new-lamassu-admin/.env
@ -1,2 +1,5 @@
 BROWSER=none
 SKIP_PREFLIGHT_CHECK=true
+EXTEND_ESLINT=true
+HTTPS=true
+REACT_APP_TYPE_CHECK_SANCTUARY=false
--- a/new-lamassu-admin/.eslintrc
+++ b/new-lamassu-admin/.eslintrc
@ -1,3 +0,0 @@
-{
-  "extends": ["standard", "standard-react"]
-}
--- a/new-lamassu-admin/.eslintrc.js
+++ b/new-lamassu-admin/.eslintrc.js
@ -0,0 +1,26 @@
+module.exports = {
+  extends: [
+    'react-app',
+    'prettier-standard',
+    'prettier/react',
+  ],
+  plugins: ['import'],
+  settings: {
+    'import/resolver': {
+      alias: [
+        ['src', './src']
+      ]
+    }
+  },
+  rules: {
+    'import/order': ['error', {
+      groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index'],
+      // TODO 
+      // bug in this version doens't allow alphabetize with newlines-between
+      // alphabetize: {
+      //   order: 'asc',
+      // },
+      'newlines-between': 'always',
+    }]
+   }
+}
--- a/new-lamassu-admin/.storybook/addons.js
+++ b/new-lamassu-admin/.storybook/addons.js
@ -1,4 +1,4 @@
-import '@storybook/addon-actions/register';
-import '@storybook/addon-links/register';
-import '@storybook/addon-knobs/register';
-import '@storybook/addon-backgrounds/register';
+import '@storybook/addon-actions/register'
+import '@storybook/addon-links/register'
+import '@storybook/addon-knobs/register'
+import '@storybook/addon-backgrounds/register'
--- a/new-lamassu-admin/.storybook/config.js
+++ b/new-lamassu-admin/.storybook/config.js
@ -1,7 +1,7 @@
-import { configure } from '@storybook/react';
+import { configure } from '@storybook/react'

 function loadStories () {
-  require('../src/stories');
+  require('../src/stories')
 }

-configure(loadStories, module);
+configure(loadStories, module)
--- a/new-lamassu-admin/.vscode/settings.json
+++ b/new-lamassu-admin/.vscode/settings.json
@ -0,0 +1,5 @@
+{
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": true
+    }
+}
--- a/new-lamassu-admin/README.md
+++ b/new-lamassu-admin/README.md
@ -1,5 +1,25 @@
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

+## Dev Environment
+
+### formatting
+
+You can configure a eslint plugin to format code on save.
+The configuration for vscode is already on the repo, all you need to do is install the eslint plugin.
+
+This project has a husky pre commit hook to format the staged changes using our styleguide.
+To take advantage of that make sure to run `git commit` from within this folder.
+
+### Sanctuary
+
+Sanctuary has a runtime typechecker that can make be quite slow, but its turned off by default.
+
+To turn it on add the following line to a `.env.local` file.
+
+```
+REACT_APP_TYPE_CHECK_SANCTUARY=true
+```
+
 ## Available Scripts

 In the project directory, you can run:
@ -12,6 +32,14 @@ Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
 The page will reload if you make edits.<br>
 You will also see any lint errors in the console.

+### `npm fix`
+
+Runs eslint --fix on the src folder
+
+### `npm storybook`
+
+Runs the storybook server
+
 ### `npm test`

 Launches the test runner in the interactive watch mode.<br>
@ -26,43 +54,3 @@ The build is minified and the filenames include the hashes.<br>
 Your app is ready to be deployed!

 See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
-
-### Analyzing the Bundle Size
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
-
-### Making a Progressive Web App
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
-
-### Advanced Configuration
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
-
-### Deployment
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
-
-### `npm run build` fails to minify
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
--- a/new-lamassu-admin/jsconfig.json
+++ b/new-lamassu-admin/jsconfig.json
@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "baseUrl": "."
+  },
+  "include": ["src"]
+}
--- a/new-lamassu-admin/package-lock.json
+++ b/new-lamassu-admin/package-lock.json
--- a/new-lamassu-admin/package.json
+++ b/new-lamassu-admin/package.json
@ -1,42 +1,72 @@
 {
-  "name": "new-lamassu-admin",
+  "name": "lamassu-admin",
  "version": "0.1.0",
  "license": "unlicense",
  "dependencies": {
+    "@apollo/react-hooks": "^3.1.3",
    "@material-ui/core": "4.5.0",
    "@material-ui/icons": "4.4.3",
    "@use-hooks/axios": "1.3.0",
+    "apollo-boost": "^0.4.7",
    "axios": "0.19.0",
    "bignumber.js": "9.0.0",
    "classnames": "2.2.6",
    "downshift": "3.3.4",
    "file-saver": "2.0.2",
    "formik": "2.0.3",
+    "fuse.js": "^3.4.6",
+    "graphql": "^14.5.8",
    "jss-plugin-extend": "^10.0.0",
-    "lodash": "4.17.15",
    "moment": "2.24.0",
    "qrcode.react": "0.9.3",
+    "ramda": "^0.26.1",
    "react": "^16.12.0",
    "react-copy-to-clipboard": "^5.0.2",
    "react-dom": "^16.10.2",
    "react-router-dom": "5.1.2",
    "react-virtualized": "^9.21.2",
+    "sanctuary": "^2.0.1",
+    "slugify": "^1.3.6",
    "yup": "0.27.0"
  },
  "devDependencies": {
-    "@babel/core": "^7.6.4",
    "@storybook/addon-actions": "^5.2.3",
    "@storybook/addon-backgrounds": "^5.2.4",
    "@storybook/addon-knobs": "^5.2.3",
    "@storybook/addon-links": "^5.2.3",
    "@storybook/addons": "^5.2.3",
    "@storybook/react": "^5.2.3",
-    "babel-loader": "8.0.6",
-    "react-scripts": "3.2.0",
-    "standard": "14.3.1"
+    "@welldone-software/why-did-you-render": "^3.3.9",
+    "eslint-config-prettier": "^6.7.0",
+    "eslint-config-prettier-standard": "^3.0.1",
+    "eslint-config-standard": "^14.1.0",
+    "eslint-import-resolver-alias": "^1.1.2",
+    "eslint-plugin-import": "^2.19.1",
+    "eslint-plugin-node": "^10.0.0",
+    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1",
+    "husky": "^3.1.0",
+    "lint-staged": "^9.5.0",
+    "prettier": "1.19.1",
+    "prettier-config-standard": "^1.0.1",
+    "react-scripts": "^3.3.0",
+    "serve": "^11.2.0"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.{js,jsx,ts,tsx,json,css,scss,md}": [
+      "eslint --fix",
+      "git add"
+    ]
  },
  "scripts": {
    "start": "react-scripts start",
+    "fix": "eslint --fix --ext .js,.md,.json src/",
    "build": "react-scripts build",
    "test": "react-scripts test",
    "eject": "react-scripts eject",
--- a/new-lamassu-admin/public/icons/ID/cam/comet.svg
+++ b/new-lamassu-admin/public/icons/ID/cam/comet.svg
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="18px" viewBox="0 0 24 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/ID/cam/comet</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/ID/cam/comet" transform="translate(1.000000, 1.000000)" stroke="#5F668A" stroke-width="1.6">
-            <path d="M11,13 C8.7912,13 7,11.2088 7,9 C7,6.7912 8.7912,5 11,5 C13.2088,5 15,6.7912 15,9 C15,11.2088 13.2088,13 11,13 Z M15.7142857,2.4 L13.3571429,0 L8.64285714,0 L6.28571429,2.4 L0,2.4 L0,16 L22,16 L22,2.4 L15.7142857,2.4 Z" id="Stroke-1"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/ID/cam/tomato.svg
+++ b/new-lamassu-admin/public/icons/ID/cam/tomato.svg
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="18px" viewBox="0 0 24 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/ID/cam/tomato</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/ID/cam/tomato" transform="translate(1.000000, 1.000000)" stroke="#FF584A" stroke-width="1.6">
-            <path d="M11,13 C8.7912,13 7,11.2088 7,9 C7,6.7912 8.7912,5 11,5 C13.2088,5 15,6.7912 15,9 C15,11.2088 13.2088,13 11,13 Z M15.7142857,2.4 L13.3571429,0 L8.64285714,0 L6.28571429,2.4 L0,2.4 L0,16 L22,16 L22,2.4 L15.7142857,2.4 Z" id="Stroke-1"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/ID/cam/zodiac.svg
+++ b/new-lamassu-admin/public/icons/ID/cam/zodiac.svg
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="18px" viewBox="0 0 24 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/ID/cam/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/ID/cam/zodiac" transform="translate(1.000000, 1.000000)" stroke="#1B2559" stroke-width="1.6">
-            <path d="M11,13 C8.7912,13 7,11.2088 7,9 C7,6.7912 8.7912,5 11,5 C13.2088,5 15,6.7912 15,9 C15,11.2088 13.2088,13 11,13 Z M15.7142857,2.4 L13.3571429,0 L8.64285714,0 L6.28571429,2.4 L0,2.4 L0,16 L22,16 L22,2.4 L15.7142857,2.4 Z" id="Stroke-1"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/ID/card/comet.svg
+++ b/new-lamassu-admin/public/icons/ID/card/comet.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="18px" viewBox="0 0 24 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/ID/card/comet</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/ID/card/comet" transform="translate(1.000000, 1.000000)" stroke="#5F668A" stroke-width="1.6">
-            <polygon id="Stroke-1" points="0 16 22 16 22 0 0 0"></polygon>
-            <path d="M11.7857143,4 L18.8571429,4" id="Stroke-3"></path>
-            <path d="M11.7857143,7.2 L18.8571429,7.2" id="Stroke-4"></path>
-            <polygon id="Stroke-5" points="3.14285714 11.2 8.64285714 11.2 8.64285714 4 3.14285714 4"></polygon>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/ID/card/tomato.svg
+++ b/new-lamassu-admin/public/icons/ID/card/tomato.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="18px" viewBox="0 0 24 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/ID/card/tomato</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/ID/card/tomato" transform="translate(1.000000, 1.000000)" stroke="#FF584A" stroke-width="1.6">
-            <polygon id="Stroke-1" points="0 16 22 16 22 0 0 0"></polygon>
-            <path d="M11.7857143,4 L18.8571429,4" id="Stroke-3"></path>
-            <path d="M11.7857143,7.2 L18.8571429,7.2" id="Stroke-4"></path>
-            <polygon id="Stroke-5" points="3.14285714 11.2 8.64285714 11.2 8.64285714 4 3.14285714 4"></polygon>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/ID/card/zodiac.svg
+++ b/new-lamassu-admin/public/icons/ID/card/zodiac.svg
@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="18px" viewBox="0 0 24 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/ID/card/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/ID/card/zodiac" transform="translate(1.000000, 1.000000)" stroke="#1B2559">
-            <g id="Group-2">
-                <g id="id-copy" stroke-width="1.6">
-                    <polygon id="Stroke-1" points="0 16 22 16 22 0 0 0"></polygon>
-                    <path d="M11.7857143,4 L18.8571429,4" id="Stroke-3"></path>
-                    <path d="M11.7857143,7.2 L18.8571429,7.2" id="Stroke-4"></path>
-                    <polygon id="Stroke-5" points="3.14285714 11.2 8.64285714 11.2 8.64285714 4 3.14285714 4"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/ID/phone/comet.svg
+++ b/new-lamassu-admin/public/icons/ID/phone/comet.svg
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/ID/phone/comet</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/ID/phone/comet" transform="translate(-2.000000, 1.000000)" stroke="#5F668A" stroke-width="1.6">
-            <path d="M6.47150618,12.52898 C9.939556,15.9970298 13.7804112,16.1146315 15.4756355,15.9586292 C16.0220434,15.9090285 16.5308507,15.6578249 16.9188563,15.2698193 L19.0004862,13.1881894 L17.0220577,11.210561 L15.0436293,10.5505516 L13.7244104,11.8697705 C13.7244104,11.8697705 12.4059914,13.1881894 9.10914407,9.89054208 C5.81229671,6.59449473 7.13071565,5.27527578 7.13071565,5.27527578 L8.4499346,3.95605683 L7.78992512,1.97842842 L5.81229671,0 L3.73066681,2.0816299 C3.34186123,2.46963548 3.09145763,2.97844279 3.04105691,3.52485063 C2.88585468,5.22007499 3.00345637,9.06013015 6.47150618,12.52898 Z" id="Stroke-1-Copy"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/ID/phone/tomato.svg
+++ b/new-lamassu-admin/public/icons/ID/phone/tomato.svg
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/ID/phone/white</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/ID/phone/white" transform="translate(-2.000000, 1.000000)" stroke="#FF584A" stroke-width="1.6">
-            <path d="M6.47150618,12.52898 C9.939556,15.9970298 13.7804112,16.1146315 15.4756355,15.9586292 C16.0220434,15.9090285 16.5308507,15.6578249 16.9188563,15.2698193 L19.0004862,13.1881894 L17.0220577,11.210561 L15.0436293,10.5505516 L13.7244104,11.8697705 C13.7244104,11.8697705 12.4059914,13.1881894 9.10914407,9.89054208 C5.81229671,6.59449473 7.13071565,5.27527578 7.13071565,5.27527578 L8.4499346,3.95605683 L7.78992512,1.97842842 L5.81229671,0 L3.73066681,2.0816299 C3.34186123,2.46963548 3.09145763,2.97844279 3.04105691,3.52485063 C2.88585468,5.22007499 3.00345637,9.06013015 6.47150618,12.52898 Z" id="Stroke-1-Copy"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/ID/phone/zodiac.svg
+++ b/new-lamassu-admin/public/icons/ID/phone/zodiac.svg
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/ID/phone/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/ID/phone/zodiac" transform="translate(-2.000000, 1.000000)" stroke="#1B2559" stroke-width="1.6">
-            <path d="M6.47150618,12.52898 C9.939556,15.9970298 13.7804112,16.1146315 15.4756355,15.9586292 C16.0220434,15.9090285 16.5308507,15.6578249 16.9188563,15.2698193 L19.0004862,13.1881894 L17.0220577,11.210561 L15.0436293,10.5505516 L13.7244104,11.8697705 C13.7244104,11.8697705 12.4059914,13.1881894 9.10914407,9.89054208 C5.81229671,6.59449473 7.13071565,5.27527578 7.13071565,5.27527578 L8.4499346,3.95605683 L7.78992512,1.97842842 L5.81229671,0 L3.73066681,2.0816299 C3.34186123,2.46963548 3.09145763,2.97844279 3.04105691,3.52485063 C2.88585468,5.22007499 3.00345637,9.06013015 6.47150618,12.52898 Z" id="Stroke-1-Copy"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/arrow/regular.svg
+++ b/new-lamassu-admin/public/icons/action/arrow/regular.svg
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="13px" height="8px" viewBox="0 0 13 8" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/arrow/regular</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M5.3501239,7.53208616 L0.473798314,2.73082122 C-0.158421727,2.1051411 -0.158421727,1.0952488 0.476737158,0.466675069 C1.11220338,-0.155816755 2.1378971,-0.155816755 2.77494316,0.468226909 L6.49990857,4.13723769 L10.2264532,0.466675069 C10.8619195,-0.155816755 11.8876132,-0.155816755 12.5260183,0.469568675 C13.1582383,1.0952488 13.1582383,2.1051411 12.5245507,2.73226987 L7.64673876,7.53497972 C7.33802629,7.83583835 6.92590837,8 6.49990828,8 C6.0739082,8 5.66179027,7.83583835 5.3501239,7.53208616 Z" id="path-1"></path>
-    </defs>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/action/arrow/regular">
-            <mask id="mask-2" fill="white">
-                <use xlink:href="#path-1"></use>
-            </mask>
-            <use id="Mask" fill="#1B2559" fill-rule="nonzero" xlink:href="#path-1"></use>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/close.svg
+++ b/new-lamassu-admin/public/icons/action/close.svg
@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/close</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M11.10567,8.99966734 L17.5616855,15.4562245 C18.1453995,16.0371533 18.1457502,16.9810221 17.5632744,17.5635465 C17.2826878,17.8441564 16.9043531,17.9996031 16.509308,17.9996031 C16.1150437,17.9996031 15.7367759,17.8439272 15.4563692,17.5634971 L8.99995005,11.1055617 L2.54567824,17.5603569 C2.26578723,17.8430155 1.88614994,17.9996031 1.48961505,17.9996031 C1.09473832,17.9996031 0.717380733,17.844225 0.436725633,17.5635465 C-0.145575211,16.9811971 -0.145575211,16.0373273 0.436725633,15.4578096 L6.89433001,8.99966707 L0.438314479,2.54310994 C-0.145399464,1.96218116 -0.145750215,1.01831232 0.436725633,0.435787934 C1.01746304,-0.144997872 1.95893893,-0.144997872 2.54250446,0.435787934 L8.99995074,6.89377234 L15.4580075,0.434202817 C16.0398949,-0.144908147 16.9801496,-0.144559181 17.5632744,0.435787934 C18.1455752,1.0181373 18.1455752,1.96200713 17.5632744,2.54152483 L11.10567,8.99966734 Z" id="path-1"></path>
-        <rect id="path-3" x="0" y="0" width="18" height="18"></rect>
-    </defs>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/action/close">
-            <g id="color/primary/zodiac" transform="translate(-0.000000, 0.000000)">
-                <mask id="mask-2" fill="white">
-                    <use xlink:href="#path-1"></use>
-                </mask>
-                <use id="Mask" fill="#1B2559" xlink:href="#path-1"></use>
-                <g mask="url(#mask-2)">
-                    <mask id="mask-4" fill="white">
-                        <use xlink:href="#path-3"></use>
-                    </mask>
-                    <use id="Background" fill="#1B2559" fill-rule="evenodd" xlink:href="#path-3"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/copy.svg
+++ b/new-lamassu-admin/public/icons/action/copy.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/copy</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linejoin="round">
-        <g id="icon/action/copy" transform="translate(1.000000, 1.000000)" stroke="#1B2559">
-            <g id="Group-5-Copy-2">
-                <polyline id="Stroke-1" stroke-width="2" points="6 1.2 6 -0.00024 16 -0.00024 16 13.06376 12 13.06376"></polyline>
-                <polygon id="Stroke-3" stroke-width="2" stroke-linecap="round" points="0 15.9368 10 15.9368 10 2.9368 0 2.9368"></polygon>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/delete/disabled.svg
+++ b/new-lamassu-admin/public/icons/action/delete/disabled.svg
@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/delete/disabled</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="22" height="22"></rect>
-    </defs>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/action/delete/disabled">
-            <mask id="mask-2" fill="white">
-                <use xlink:href="#path-1"></use>
-            </mask>
-            <g id="Background"></g>
-            <path d="M9,9 L9,18" id="Stroke-1" stroke="#9B9B9B" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-            <path d="M13,9 L13,18" id="Stroke-2" stroke="#9B9B9B" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-            <g id="Group-9" stroke-width="1" fill-rule="evenodd" mask="url(#mask-2)" stroke="#9B9B9B" stroke-linecap="round">
-                <g transform="translate(1.000000, 1.000000)" stroke-width="2">
-                    <polyline id="Stroke-3" stroke-linejoin="round" points="2 5 4 20 16 20 18 5"></polyline>
-                    <path d="M0,4 L20,4" id="Stroke-5"></path>
-                    <path d="M13,3 C13,1.343 11.657,0 10,0 C8.343,0 7,1.343 7,3" id="Stroke-7"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/delete/enabled.svg
+++ b/new-lamassu-admin/public/icons/action/delete/enabled.svg
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/delete/enabled</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
-        <g id="icon/action/delete/enabled" stroke="#1B2559" stroke-width="2">
-            <path d="M9,9 L9,18" id="Stroke-1"></path>
-            <path d="M13,9 L13,18" id="Stroke-2"></path>
-            <polyline id="Stroke-3" stroke-linejoin="round" points="3 6 5 21 17 21 19 6"></polyline>
-            <path d="M1,5 L21,5" id="Stroke-5"></path>
-            <path d="M14,4 C14,2.343 12.657,1 11,1 C9.343,1 8,2.343 8,4" id="Stroke-7"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/delete/white.svg
+++ b/new-lamassu-admin/public/icons/action/delete/white.svg
@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/delete/white</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="22" height="22"></rect>
-    </defs>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/action/delete/white">
-            <mask id="mask-2" fill="white">
-                <use xlink:href="#path-1"></use>
-            </mask>
-            <g id="Background"></g>
-            <path d="M9,9 L9,18" id="Stroke-1" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-            <path d="M13,9 L13,18" id="Stroke-2" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-            <g id="Group-9" stroke-width="1" fill-rule="evenodd" mask="url(#mask-2)" stroke="#FFFFFF" stroke-linecap="round">
-                <g transform="translate(1.000000, 1.000000)" stroke-width="2">
-                    <polyline id="Stroke-3" stroke-linejoin="round" points="2 5 4 20 16 20 18 5"></polyline>
-                    <path d="M0,4 L20,4" id="Stroke-5"></path>
-                    <path d="M13,3 C13,1.343 11.657,0 10,0 C8.343,0 7,1.343 7,3" id="Stroke-7"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/edit/disabled.svg
+++ b/new-lamassu-admin/public/icons/action/edit/disabled.svg
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/edit/disabled</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="22" height="22"></rect>
-    </defs>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/action/edit/disabled">
-            <mask id="mask-2" fill="white">
-                <use xlink:href="#path-1"></use>
-            </mask>
-            <g id="Background"></g>
-            <path d="M1,18 L1,18 C1,19.657 2.343,21 4,21 L18,21 C19.657,21 21,19.657 21,18" id="Stroke-1" stroke="#9B9B9B" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" mask="url(#mask-2)"></path>
-            <polygon id="Stroke-3" stroke="#9B9B9B" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" mask="url(#mask-2)" points="6 12 17 1 21 5 10 16 6 16"></polygon>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/edit/enabled.svg
+++ b/new-lamassu-admin/public/icons/action/edit/enabled.svg
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/edit/enabled</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="22" height="22"></rect>
-    </defs>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/action/edit/enabled">
-            <mask id="mask-2" fill="white">
-                <use xlink:href="#path-1"></use>
-            </mask>
-            <g id="Background"></g>
-            <path d="M1,18 L1,18 C1,19.657 2.343,21 4,21 L18,21 C19.657,21 21,19.657 21,18" id="Stroke-1" stroke="#1B2559" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" mask="url(#mask-2)"></path>
-            <polygon id="Stroke-3" stroke="#1B2559" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" mask="url(#mask-2)" points="6 12 17 1 21 5 10 16 6 16"></polygon>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/edit/white.svg
+++ b/new-lamassu-admin/public/icons/action/edit/white.svg
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/edit/white</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="22" height="22"></rect>
-    </defs>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/action/edit/white">
-            <mask id="mask-2" fill="white">
-                <use xlink:href="#path-1"></use>
-            </mask>
-            <g id="Background"></g>
-            <path d="M1,18 L1,18 C1,19.657 2.343,21 4,21 L18,21 C19.657,21 21,19.657 21,18" id="Stroke-1" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" mask="url(#mask-2)"></path>
-            <polygon id="Stroke-3" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" mask="url(#mask-2)" points="6 12 17 1 21 5 10 16 6 16"></polygon>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/expand/closed.svg
+++ b/new-lamassu-admin/public/icons/action/expand/closed.svg
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="6px" viewBox="0 0 18 6" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/expand/closed</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/action/expand/closed" transform="translate(1.000000, 1.000000)" stroke="#1B2559" stroke-width="1.5">
-            <circle id="Oval-4" cx="14" cy="2" r="2"></circle>
-            <circle id="Oval-4-Copy" cx="8" cy="2" r="2"></circle>
-            <circle id="Oval-4-Copy-2" cx="2" cy="2" r="2"></circle>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/expand/open.svg
+++ b/new-lamassu-admin/public/icons/action/expand/open.svg
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="6px" viewBox="0 0 18 6" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/expand/open</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/action/expand/open" transform="translate(1.000000, 1.000000)" fill="#1B2559" stroke="#1B2559" stroke-width="1.5">
-            <circle id="Oval-4" cx="14" cy="2" r="2"></circle>
-            <circle id="Oval-4-Copy" cx="8" cy="2" r="2"></circle>
-            <circle id="Oval-4-Copy-2" cx="2" cy="2" r="2"></circle>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/external
+++ b/new-lamassu-admin/public/icons/action/external
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/external link/white</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/action/external-link/white" transform="translate(1.000000, 1.000000)" stroke="#FFFFFF">
-            <g id="Group-7">
-                <polyline id="Stroke-1" stroke-width="2" points="20 11.1113 20 20.0003 0 20.0003 0 0.0003 8.889 0.0003"></polyline>
-                <polyline id="Stroke-3" stroke-width="2" points="14.4443 0 20.0003 0 20.0003 5.556"></polyline>
-                <path d="M10,10 L20,0" id="Stroke-5" stroke-width="2"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/external
+++ b/new-lamassu-admin/public/icons/action/external
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/external link/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/action/external-link/zodiac" transform="translate(1.000000, 0.000000)" stroke="#1B2559">
-            <g id="Group-7" transform="translate(0.000000, 1.000000)">
-                <polyline id="Stroke-1" stroke-width="2" points="20 11.1113 20 20.0003 0 20.0003 0 0.0003 8.889 0.0003"></polyline>
-                <polyline id="Stroke-3" stroke-width="2" points="14.4443 0 20.0003 0 20.0003 5.556"></polyline>
-                <path d="M10,10 L20,0" id="Stroke-5" stroke-width="2"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/help/white.svg
+++ b/new-lamassu-admin/public/icons/action/help/white.svg
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/help-w</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/action/help-w" fill="#FFFFFF">
-            <path d="M20.0004,11 C20.0004,6.03028475 15.9701153,2 11.0004,2 C6.03004556,2 2.0004,6.02992391 2.0004,11 C2.0004,15.9700761 6.03004556,20 11.0004,20 C15.9701153,20 20.0004,15.9697153 20.0004,11 Z M22.0004,11 C22.0004,17.0742847 17.0746847,22 11.0004,22 C4.92544514,22 0.000400000001,17.0746147 0.000400000001,11 C0.000400000001,4.92538534 4.92544514,0 11.0004,0 C17.0746847,0 22.0004,4.92571525 22.0004,11 Z" id="Stroke-1" fill-rule="nonzero"></path>
-            <path d="M9.9164,8.9063 C9.9164,9.45858475 9.46868475,9.9063 8.9164,9.9063 C8.36411525,9.9063 7.9164,9.45858475 7.9164,8.9063 C7.9164,6.89094438 9.72972438,5.35290249 11.7463843,5.7072003 C13.0663562,5.93764844 14.1348314,7.00654285 14.3652323,8.32479116 C14.6130182,9.7312185 13.941375,11.0876584 12.732214,11.7545735 C12.370484,11.9534687 12.1664,12.2664153 12.1664,12.5913 L12.1664,12.6563 C12.1664,13.2085847 11.7186847,13.6563 11.1664,13.6563 C10.6141153,13.6563 10.1664,13.2085847 10.1664,12.6563 L10.1664,12.5913 C10.1664,11.5009567 10.7946963,10.5375141 11.7674377,10.0026589 C12.2360927,9.74417086 12.493064,9.22519581 12.3953326,8.67046887 C12.3098185,8.1811985 11.8915858,7.76280177 11.4013649,7.67721566 C10.6126181,7.53864454 9.9164,8.1291691 9.9164,8.9063 Z" id="Stroke-3" fill-rule="nonzero"></path>
-            <path d="M10.1039,15.2188 C10.1039,14.6318 10.5799,14.1568 11.1659,14.1568 C11.7529,14.1568 12.2289,14.6318 12.2289,15.2188 C12.2289,15.8058 11.7529,16.2808 11.1659,16.2808 C10.5799,16.2808 10.1039,15.8058 10.1039,15.2188" id="Fill-5" fill-rule="evenodd"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/help/zodiac.svg
+++ b/new-lamassu-admin/public/icons/action/help/zodiac.svg
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/help</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/action/help" fill="#1B2559">
-            <path d="M20.0004,11 C20.0004,6.03028475 15.9701153,2 11.0004,2 C6.03004556,2 2.0004,6.02992391 2.0004,11 C2.0004,15.9700761 6.03004556,20 11.0004,20 C15.9701153,20 20.0004,15.9697153 20.0004,11 Z M22.0004,11 C22.0004,17.0742847 17.0746847,22 11.0004,22 C4.92544514,22 0.000400000001,17.0746147 0.000400000001,11 C0.000400000001,4.92538534 4.92544514,0 11.0004,0 C17.0746847,0 22.0004,4.92571525 22.0004,11 Z" id="Stroke-1" fill-rule="nonzero"></path>
-            <path d="M9.9164,8.9063 C9.9164,9.45858475 9.46868475,9.9063 8.9164,9.9063 C8.36411525,9.9063 7.9164,9.45858475 7.9164,8.9063 C7.9164,6.89094438 9.72972438,5.35290249 11.7463843,5.7072003 C13.0663562,5.93764844 14.1348314,7.00654285 14.3652323,8.32479116 C14.6130182,9.7312185 13.941375,11.0876584 12.732214,11.7545735 C12.370484,11.9534687 12.1664,12.2664153 12.1664,12.5913 L12.1664,12.6563 C12.1664,13.2085847 11.7186847,13.6563 11.1664,13.6563 C10.6141153,13.6563 10.1664,13.2085847 10.1664,12.6563 L10.1664,12.5913 C10.1664,11.5009567 10.7946963,10.5375141 11.7674377,10.0026589 C12.2360927,9.74417086 12.493064,9.22519581 12.3953326,8.67046887 C12.3098185,8.1811985 11.8915858,7.76280177 11.4013649,7.67721566 C10.6126181,7.53864454 9.9164,8.1291691 9.9164,8.9063 Z" id="Stroke-3" fill-rule="nonzero"></path>
-            <path d="M10.1039,15.2188 C10.1039,14.6318 10.5799,14.1568 11.1659,14.1568 C11.7529,14.1568 12.2289,14.6318 12.2289,15.2188 C12.2289,15.8058 11.7529,16.2808 11.1659,16.2808 C10.5799,16.2808 10.1039,15.8058 10.1039,15.2188" id="Fill-5" fill-rule="evenodd"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/machine/reboot.svg
+++ b/new-lamassu-admin/public/icons/action/machine/reboot.svg
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/machine/reboot</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/action/machine/reboot" transform="translate(1.000000, 0.000000)" stroke="#1B2559">
-            <g id="icon/">
-                <path d="M6.0355,19.6461 C4.9225,19.1811 3.8775,18.5171 2.9635,17.6531 C-0.9605,13.9431 -0.9915,7.9571 2.8945,4.2821 C3.8005,3.4261 4.8375,2.7711 5.9465,2.3171" id="Stroke-1" stroke-width="2"></path>
-                <polyline id="Stroke-3" stroke-width="2" points="6.4076 3.9644 6.3966 1.9544 4.3916 0.9994"></polyline>
-                <path d="M13.9642,2.3541 C15.0782,2.8191 16.1222,3.4831 17.0362,4.3471 C20.9602,8.0571 20.9912,14.0431 17.1052,17.7181 C16.2002,18.5741 15.1622,19.2281 14.0532,19.6831" id="Stroke-5" stroke-width="2"></path>
-                <polyline id="Stroke-7" stroke-width="2" points="13.5922 18.0357 13.6032 20.0457 15.6082 20.9997"></polyline>
-                <path d="M10.0004,13.898 L10.0004,8.138" id="Stroke-9" stroke-width="2"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/machine/shut-down.svg
+++ b/new-lamassu-admin/public/icons/action/machine/shut-down.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="21px" height="22px" viewBox="0 0 21 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/machine/shut-down</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/action/machine/shut-down" transform="translate(1.000000, 1.000000)" stroke="#1B2559">
-            <g id="Group-5" transform="translate(-0.000000, 0.000000)">
-                <path d="M14.134,3.34427273 C16.5749091,4.97427273 18.1821818,7.75427273 18.1821818,10.9088182 C18.1821818,15.9297273 14.1121818,19.9997273 9.09127273,19.9997273 C4.07036364,19.9997273 0.000363636364,15.9297273 0.000363636364,10.9088182 C0.000363636364,7.77154545 1.59036364,5.00427273 4.00763636,3.37063636" id="Stroke-1" stroke-width="2"></path>
-                <path d="M9.09090909,0 L9.09090909,7.27272727" id="Stroke-3" stroke-width="2"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/action/machine/unpair.svg
+++ b/new-lamassu-admin/public/icons/action/machine/unpair.svg
@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/action/machine/unpair</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/action/machine/unpair" transform="translate(1.000000, 1.000000)" stroke="#1B2559">
-            <g id="Group-12">
-                <g id="Group-5" stroke-width="2">
-                    <polyline id="Stroke-1" points="6.25 10 3.75 10 0 6.25 6.25 0 11.25 5"></polyline>
-                    <polyline id="Stroke-3" points="13.75 10 16.25 10 20 13.75 13.75 20 8.75 15"></polyline>
-                </g>
-                <path d="M13.75,5 L13.75,2.5" id="Stroke-6"></path>
-                <path d="M16.25,5 L17.5,3.75" id="Stroke-7"></path>
-                <path d="M16.25,7.5 L18.75,7.5" id="Stroke-8"></path>
-                <path d="M3.75,12.5 L1.25,12.5" id="Stroke-9"></path>
-                <path d="M3.75,15 L2.5,16.25" id="Stroke-10"></path>
-                <path d="M6.25,15 L6.25,17.5" id="Stroke-11"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/add
+++ b/new-lamassu-admin/public/icons/button/add
@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/add note</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/button/add-note" transform="translate(1.000000, 1.000000)">
-            <g id="Group-2" transform="translate(3.000000, 0.000000)" stroke="#1B2559" stroke-linecap="round" stroke-linejoin="round">
-                <polygon id="Stroke-1" points="0.45 11.5384615 8.55 11.5384615 8.55 0.461538462 0.45 0.461538462"></polygon>
-                <path d="M4.5,2.53846154 L7.2,2.53846154" id="Stroke-4"></path>
-                <path d="M2.475,4.61538462 L7.2,4.61538462" id="Stroke-6"></path>
-                <path d="M2.475,6.69230769 L7.2,6.69230769" id="Stroke-8"></path>
-                <path d="M2.475,8.76923077 L7.2,8.76923077" id="Stroke-10"></path>
-            </g>
-            <g id="Group-9" transform="translate(0.000000, 4.000000)">
-                <circle id="Oval" stroke="#1B2559" fill="#EBEFFF" cx="4" cy="4" r="4"></circle>
-                <g id="Group-6" transform="translate(1.200000, 1.600000)" fill="#1B2559" fill-rule="nonzero">
-                    <polygon id="Path" points="3.2 2 5.2 2 5.2 2.8 3.2 2.8 3.2 4.8 2.4 4.8 2.4 2.8 0.4 2.8 0.4 2 2.4 2 2.4 0 3.2 0"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/add/white.svg
+++ b/new-lamassu-admin/public/icons/button/add/white.svg
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/add/white</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/add/white" transform="translate(1.000000, 1.000000)" stroke="#FFFFFF">
-            <path d="M11.5384615,6 C11.5384615,9.05815385 9.05815385,11.5384615 6,11.5384615 C2.94184615,11.5384615 0.461538462,9.05815385 0.461538462,6 C0.461538462,2.94184615 2.94184615,0.461538462 6,0.461538462 C9.05815385,0.461538462 11.5384615,2.94184615 11.5384615,6 Z" id="Stroke-1"></path>
-            <path d="M6,3.69230769 L6,8.30769231" id="Stroke-3"></path>
-            <path d="M3.69230769,6 L8.30769231,6" id="Stroke-5"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/add/zodiac.svg
+++ b/new-lamassu-admin/public/icons/button/add/zodiac.svg
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/add/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/add/zodiac" transform="translate(1.000000, 1.000000)" stroke="#1B2559">
-            <path d="M11.5384615,6 C11.5384615,9.05815385 9.05815385,11.5384615 6,11.5384615 C2.94184615,11.5384615 0.461538462,9.05815385 0.461538462,6 C0.461538462,2.94184615 2.94184615,0.461538462 6,0.461538462 C9.05815385,0.461538462 11.5384615,2.94184615 11.5384615,6 Z" id="Stroke-1"></path>
-            <path d="M6,3.69230769 L6,8.30769231" id="Stroke-3"></path>
-            <path d="M3.69230769,6 L8.30769231,6" id="Stroke-5"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/authorize/white.svg
+++ b/new-lamassu-admin/public/icons/button/authorize/white.svg
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/authorize/white</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/button/authorize/white" transform="translate(1.000000, 1.000000)" stroke="#FFFFFF">
-            <circle id="Oval" cx="6" cy="6" r="6"></circle>
-            <polyline id="Stroke-13" stroke-linecap="round" stroke-linejoin="round" points="4 6.66666667 5 8 8 4"></polyline>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/authorize/zodiac.svg
+++ b/new-lamassu-admin/public/icons/button/authorize/zodiac.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/authorize/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/button/authorize/zodiac" transform="translate(1.000000, 1.000000)" stroke="#1B2559">
-            <g id="Group-9" fill-rule="evenodd">
-                <circle id="Oval" cx="6" cy="6" r="6"></circle>
-            </g>
-            <polyline id="Stroke-13" stroke-linecap="round" stroke-linejoin="round" points="4 6.66666667 5 8 8 4"></polyline>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/blacklist.svg
+++ b/new-lamassu-admin/public/icons/button/blacklist.svg
@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/blacklist</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/button/blacklist" transform="translate(1.000000, 1.000000)">
-            <g id="Group-2" transform="translate(3.000000, 0.000000)" stroke-linecap="round" stroke-linejoin="round">
-                <polygon id="Stroke-1" stroke="#1B2559" fill="#1B2559" points="0.45 11.5384615 8.55 11.5384615 8.55 0.461538462 0.45 0.461538462"></polygon>
-                <path d="M1.97637558,2.53846154 L7.2,2.53846154" id="Stroke-4" stroke="#FFFFFF"></path>
-                <path d="M2.475,4.61538462 L7.2,4.61538462" id="Stroke-6" stroke="#FFFFFF"></path>
-                <path d="M2.475,6.69230769 L7.2,6.69230769" id="Stroke-8" stroke="#FFFFFF"></path>
-                <path d="M2.475,8.76923077 L7.2,8.76923077" id="Stroke-10" stroke="#FFFFFF"></path>
-            </g>
-            <g id="Group-9" transform="translate(0.000000, 4.000000)">
-                <circle id="Oval" stroke="#1B2559" fill="#EBEFFF" cx="4" cy="4" r="4"></circle>
-                <g id="Group-6" transform="translate(1.200000, 1.600000)" fill="#1B2559" fill-rule="nonzero">
-                    <polygon id="Path" points="3.2 2 5.2 2 5.2 2.8 3.2 2.8 3.2 4.8 2.4 4.8 2.4 2.8 0.4 2.8 0.4 2 2.4 2 2.4 0 3.2 0"></polygon>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/block/white.svg
+++ b/new-lamassu-admin/public/icons/button/block/white.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/block/white</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/block/white" transform="translate(1.000000, 1.000000)" stroke="#FFFFFF">
-            <g id="Group-5">
-                <path d="M12,6 C12,9.3138 9.3132,12 6,12 C2.6868,12 0,9.3138 0,6 C0,2.6862 2.6868,0 6,0 C9.3132,0 12,2.6862 12,6 Z" id="Stroke-1"></path>
-                <path d="M10.2,1.8 L1.8,10.2" id="Stroke-3"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/block/zodiac.svg
+++ b/new-lamassu-admin/public/icons/button/block/zodiac.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/block/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/block/zodiac" transform="translate(1.000000, 1.000000)" stroke="#1B2559">
-            <g id="Group-5">
-                <path d="M12,6 C12,9.3138 9.3132,12 6,12 C2.6868,12 0,9.3138 0,6 C0,2.6862 2.6868,0 6,0 C9.3132,0 12,2.6862 12,6 Z" id="Stroke-1"></path>
-                <path d="M10.2,1.8 L1.8,10.2" id="Stroke-3"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/cancel/white.svg
+++ b/new-lamassu-admin/public/icons/button/cancel/white.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="10px" viewBox="0 0 12 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/cancel/white</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/cancel/white" transform="translate(0.000000, -1.000000)" stroke="#FFFFFF">
-            <g id="Group-5" transform="translate(1.000000, 1.000000)">
-                <path d="M10,0 L0,10" id="Stroke-1"></path>
-                <path d="M0,0 L10,10" id="Stroke-3"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/cancel/zodiac.svg
+++ b/new-lamassu-admin/public/icons/button/cancel/zodiac.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="10px" viewBox="0 0 12 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/cancel/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/cancel/zodiac" transform="translate(0.000000, -1.000000)" stroke="#1B2559">
-            <g id="Group-5" transform="translate(1.000000, 1.000000)">
-                <path d="M10,0 L0,10" id="Stroke-1"></path>
-                <path d="M0,0 L10,10" id="Stroke-3"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/clock/white.svg
+++ b/new-lamassu-admin/public/icons/button/clock/white.svg
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/clock/white</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/button/clock/white" transform="translate(1.000000, 1.000000)" stroke="#FFFFFF">
-            <polyline id="Stroke-1" stroke-linecap="round" stroke-linejoin="round" points="8 7 6 7 6 4"></polyline>
-            <circle id="Oval" cx="6" cy="6" r="6"></circle>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/clock/zodiac.svg
+++ b/new-lamassu-admin/public/icons/button/clock/zodiac.svg
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/clock/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/button/clock/zodiac" transform="translate(1.000000, 1.000000)" stroke="#1B2559">
-            <polyline id="Stroke-1" stroke-linecap="round" stroke-linejoin="round" points="8 7 6 7 6 4"></polyline>
-            <circle id="Oval" cx="6" cy="6" r="6"></circle>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/download/white.svg
+++ b/new-lamassu-admin/public/icons/button/download/white.svg
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="13px" viewBox="0 0 14 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/download/white</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/download/white" transform="translate(1.000000, 0.000000)" stroke="#FFFFFF">
-            <g id="icon/sf-small/wizzard">
-                <polyline id="Path-3" points="3.6 5.4 6 7.8 8.4 5.4"></polyline>
-                <path d="M6,0.5 L6,7.4" id="Path-4"></path>
-                <path d="M0,10 L0,10 C0,10.9942 0.8058,11.8 1.8,11.8 L10.2,11.8 C11.1942,11.8 12,10.9942 12,10" id="Stroke-1"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/download/zodiac.svg
+++ b/new-lamassu-admin/public/icons/button/download/zodiac.svg
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="13px" viewBox="0 0 14 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/download/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/download/zodiac" transform="translate(1.000000, 0.000000)" stroke="#1B2559">
-            <g id="icon/sf-small/wizzard">
-                <polyline id="Path-3" points="3.6 5.4 6 7.8 8.4 5.4"></polyline>
-                <path d="M6,0.5 L6,7.4" id="Path-4"></path>
-                <path d="M0,10 L0,10 C0,10.9942 0.8058,11.8 1.8,11.8 L10.2,11.8 C11.1942,11.8 12,10.9942 12,10" id="Stroke-1"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/edit/zodiac.svg
+++ b/new-lamassu-admin/public/icons/button/edit/zodiac.svg
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="12px" viewBox="0 0 14 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/edit/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/edit/zodiac" transform="translate(1.000000, -1.000000)" stroke="#1B2559">
-            <path d="M0,10 L0,10 C0,10.9942 0.8058,11.8 1.8,11.8 L10.2,11.8 C11.1942,11.8 12,10.9942 12,10" id="Stroke-1"></path>
-            <polygon id="Stroke-3" points="3 6.86666667 8.86666667 1 11 3.13333333 5.13333333 9 3 9"></polygon>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/reboot/zodiac
+++ b/new-lamassu-admin/public/icons/button/reboot/zodiac
@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/reboot/zodiac copy</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/reboot/zodiac-copy" transform="translate(1.000000, 1.000000)" stroke="#FFFFFF">
-            <g id="Group-3">
-                <g id="Group-2">
-                    <path d="M3.57419317,11.1560104 C2.91506589,10.8661403 2.29620875,10.4522182 1.75493083,9.91362078 C-0.568892549,7.60089351 -0.587250991,3.86936104 1.71406849,1.57845195 C2.03057585,1.26367293 2.37407977,0.992496226 2.73740775,0.764921841" id="Stroke-1"></path>
-                    <polyline id="Stroke-3" points="3.37563213 1.84831169 3.36911784 0.595324675 2.18174122 4.15223411e-14"></polyline>
-                </g>
-                <path d="M5.92223784,7.57277922 L5.92223784,3.98212987" id="Stroke-9"></path>
-                <g id="Group-2" transform="translate(9.818105, 6.000000) scale(-1, -1) translate(-9.818105, -6.000000) translate(7.636287, 0.000000)">
-                    <path d="M3.57419317,11.1560104 C2.91506589,10.8661403 2.29620875,10.4522182 1.75493083,9.91362078 C-0.568892549,7.60089351 -0.587250991,3.86936104 1.71406849,1.57845195 C2.03057585,1.26367293 2.37407977,0.992496226 2.73740775,0.764921841" id="Stroke-1"></path>
-                    <polyline id="Stroke-3" points="3.37563213 1.84831169 3.36911784 0.595324675 2.18174122 4.15223411e-14"></polyline>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/reboot/zodiac.svg
+++ b/new-lamassu-admin/public/icons/button/reboot/zodiac.svg
@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/reboot/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/reboot/zodiac" transform="translate(1.000000, 1.000000)" stroke="#1B2559">
-            <g id="Group-3">
-                <g id="Group-2">
-                    <path d="M3.57419317,11.1560104 C2.91506589,10.8661403 2.29620875,10.4522182 1.75493083,9.91362078 C-0.568892549,7.60089351 -0.587250991,3.86936104 1.71406849,1.57845195 C2.03057585,1.26367293 2.37407977,0.992496226 2.73740775,0.764921841" id="Stroke-1"></path>
-                    <polyline id="Stroke-3" points="3.37563213 1.84831169 3.36911784 0.595324675 2.18174122 4.15223411e-14"></polyline>
-                </g>
-                <path d="M5.92223784,7.57277922 L5.92223784,3.98212987" id="Stroke-9"></path>
-                <g id="Group-2" transform="translate(9.818105, 6.000000) scale(-1, -1) translate(-9.818105, -6.000000) translate(7.636287, 0.000000)">
-                    <path d="M3.57419317,11.1560104 C2.91506589,10.8661403 2.29620875,10.4522182 1.75493083,9.91362078 C-0.568892549,7.60089351 -0.587250991,3.86936104 1.71406849,1.57845195 C2.03057585,1.26367293 2.37407977,0.992496226 2.73740775,0.764921841" id="Stroke-1"></path>
-                    <polyline id="Stroke-3" points="3.37563213 1.84831169 3.36911784 0.595324675 2.18174122 4.15223411e-14"></polyline>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/retry/white.svg
+++ b/new-lamassu-admin/public/icons/button/retry/white.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/retry/white</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/retry/white" transform="translate(1.000000, 1.000000)" stroke="#FFFFFF">
-            <g id="Group-7">
-                <path d="M7.1942452e-14,9.603 L0.002,3.598 C0.003,1.611 1.614,-5.86197757e-14 3.602,-5.86197757e-14 L8.4,-5.86197757e-14 C10.39,-5.86197757e-14 12.001,1.613 12,3.601 L11.998,7.205 C11.998,9.192 10.386,10.803 8.398,10.803 L3,10.803" id="Stroke-1"></path>
-                <polyline id="Stroke-3" points="4.2002 9.601 3.0002 10.8 4.2002 12"></polyline>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/retry/zodiac.svg
+++ b/new-lamassu-admin/public/icons/button/retry/zodiac.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/retry/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/retry/zodiac" transform="translate(1.000000, 1.000000)" stroke="#1B2559">
-            <g id="Group-7">
-                <path d="M7.1942452e-14,9.603 L0.002,3.598 C0.003,1.611 1.614,-5.86197757e-14 3.602,-5.86197757e-14 L8.4,-5.86197757e-14 C10.39,-5.86197757e-14 12.001,1.613 12,3.601 L11.998,7.205 C11.998,9.192 10.386,10.803 8.398,10.803 L3,10.803" id="Stroke-1"></path>
-                <polyline id="Stroke-3" points="4.2002 9.601 3.0002 10.8 4.2002 12"></polyline>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/shut
+++ b/new-lamassu-admin/public/icons/button/shut
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/shut down copy</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/shut-down-copy" stroke="#FFFFFF">
-            <g id="Group-5" transform="translate(1.000000, 0.000000)">
-                <path d="M7.7735,2 C9.116,2.89710351 10,4.4271328 10,6.16330077 C10,8.92665975 7.7615,11.1666667 5,11.1666667 C2.2385,11.1666667 0,8.92665975 0,6.16330077 C0,4.43663919 0.8745,2.91361461 2.204,2.01450976" id="Stroke-1"></path>
-                <path d="M5,0.75 L5,3.25" id="Stroke-3"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/shut
+++ b/new-lamassu-admin/public/icons/button/shut
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/shut down</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/shut-down" stroke="#1B2559">
-            <g id="Group-5" transform="translate(1.000000, 0.000000)">
-                <path d="M7.7735,2 C9.116,2.89710351 10,4.4271328 10,6.16330077 C10,8.92665975 7.7615,11.1666667 5,11.1666667 C2.2385,11.1666667 0,8.92665975 0,6.16330077 C0,4.43663919 0.8745,2.91361461 2.204,2.01450976" id="Stroke-1"></path>
-                <path d="M5,0.75 L5,3.25" id="Stroke-3"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/unpair/white.svg
+++ b/new-lamassu-admin/public/icons/button/unpair/white.svg
@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="12px" viewBox="0 0 14 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/unpair/white</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/unpair/white" transform="translate(1.000000, 0.000000)" stroke="#FFFFFF">
-            <g id="Group-12">
-                <g id="Group-5">
-                    <polyline id="Stroke-1" points="3.75 6 2.25 6 0 3.75 3.75 0 6.75 3"></polyline>
-                    <polyline id="Stroke-3" points="8.25 6 9.75 6 12 8.25 8.25 12 5.25 9"></polyline>
-                </g>
-                <path d="M8.25,3 L8.25,1.5" id="Stroke-6"></path>
-                <path d="M9.75,3 L10.5,2.25" id="Stroke-7"></path>
-                <path d="M9.75,4.5 L11.25,4.5" id="Stroke-8"></path>
-                <path d="M2.25,7.5 L0.75,7.5" id="Stroke-9"></path>
-                <path d="M2.25,9 L1.5,9.75" id="Stroke-10"></path>
-                <path d="M3.75,9 L3.75,10.5" id="Stroke-11"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/unpair/zodiac.svg
+++ b/new-lamassu-admin/public/icons/button/unpair/zodiac.svg
@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="12px" viewBox="0 0 14 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/unpair/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/unpair/zodiac" transform="translate(1.000000, 0.000000)" stroke="#1B2559">
-            <g id="Group-12">
-                <g id="Group-5">
-                    <polyline id="Stroke-1" points="3.75 6 2.25 6 0 3.75 3.75 0 6.75 3"></polyline>
-                    <polyline id="Stroke-3" points="8.25 6 9.75 6 12 8.25 8.25 12 5.25 9"></polyline>
-                </g>
-                <path d="M8.25,3 L8.25,1.5" id="Stroke-6"></path>
-                <path d="M9.75,3 L10.5,2.25" id="Stroke-7"></path>
-                <path d="M9.75,4.5 L11.25,4.5" id="Stroke-8"></path>
-                <path d="M2.25,7.5 L0.75,7.5" id="Stroke-9"></path>
-                <path d="M2.25,9 L1.5,9.75" id="Stroke-10"></path>
-                <path d="M3.75,9 L3.75,10.5" id="Stroke-11"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/button/upload/zodiac.svg
+++ b/new-lamassu-admin/public/icons/button/upload/zodiac.svg
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="12px" viewBox="0 0 14 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/button/upload/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/button/upload/zodiac" transform="translate(1.000000, -1.000000)" stroke="#1B2559">
-            <g id="icon/sf-small/wizzard" transform="translate(0.000000, 1.000000)">
-                <g id="Group" transform="translate(6.100000, 4.000000) scale(1, -1) translate(-6.100000, -4.000000) translate(3.600000, 0.000000)">
-                    <polyline id="Path-3" points="-3.64153152e-13 5.4 2.4 7.8 4.8 5.4"></polyline>
-                    <path d="M2.4,0.5 L2.4,7.4" id="Path-4"></path>
-                </g>
-                <path d="M0,9 L0,9 C0,9.9942 0.8058,10.8 1.8,10.8 L10.2,10.8 C11.1942,10.8 12,9.9942 12,9" id="Stroke-1"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/container/ID.svg
+++ b/new-lamassu-admin/public/icons/container/ID.svg
@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="34px" height="28px" viewBox="0 0 34 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/container/ID</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="34" height="28" rx="8"></rect>
-        <rect id="path-3" x="0" y="0" width="34" height="28"></rect>
-    </defs>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/container/ID">
-            <g id="color/secondary/zircon" stroke-width="1" fill-rule="evenodd">
-                <mask id="mask-2" fill="white">
-                    <use xlink:href="#path-1"></use>
-                </mask>
-                <use id="Mask" fill="#EBEFFF" xlink:href="#path-1"></use>
-                <g mask="url(#mask-2)">
-                    <mask id="mask-4" fill="white">
-                        <use xlink:href="#path-3"></use>
-                    </mask>
-                    <use id="Background" fill="#EBEFFF" fill-rule="evenodd" xlink:href="#path-3"></use>
-                </g>
-            </g>
-            <g id="icon/ID/phone/zodiac" transform="translate(6.000000, 6.000000)" stroke="#1B2559" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
-                <path d="M6.47150618,12.52898 C9.939556,15.9970298 13.7804112,16.1146315 15.4756355,15.9586292 C16.0220434,15.9090285 16.5308507,15.6578249 16.9188563,15.2698193 L19.0004862,13.1881894 L17.0220577,11.210561 L15.0436293,10.5505516 L13.7244104,11.8697705 C13.7244104,11.8697705 12.4059914,13.1881894 9.10914407,9.89054208 C5.81229671,6.59449473 7.13071565,5.27527578 7.13071565,5.27527578 L8.4499346,3.95605683 L7.78992512,1.97842842 L5.81229671,0 L3.73066681,2.0816299 C3.34186123,2.46963548 3.09145763,2.97844279 3.04105691,3.52485063 C2.88585468,5.22007499 3.00345637,9.06013015 6.47150618,12.52898 Z" id="Stroke-1-Copy"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/container/SF/hover.svg
+++ b/new-lamassu-admin/public/icons/container/SF/hover.svg
@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/container/SF/hover</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <circle id="path-1" cx="16" cy="16" r="16"></circle>
-    </defs>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/container/SF/hover">
-            <g id="Group-3">
-                <mask id="mask-2" fill="white">
-                    <use xlink:href="#path-1"></use>
-                </mask>
-                <use id="Mask" fill="#5F668A" fill-rule="nonzero" xlink:href="#path-1"></use>
-                <g id="icon/sf-small/download/white" mask="url(#mask-2)" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
-                    <g transform="translate(8.000000, 8.000000)">
-                        <polyline id="Path-3" points="4.8 7.2 8 10.4 11.2 7.2"></polyline>
-                        <path d="M8,1.6 L8,8.8" id="Path-4"></path>
-                        <path d="M0,12 L0,12 C0,13.3256 1.0744,14.4 2.4,14.4 L13.6,14.4 C14.9256,14.4 16,13.3256 16,12" id="Stroke-1"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/container/SF/regular.svg
+++ b/new-lamassu-admin/public/icons/container/SF/regular.svg
@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/container/SF/regular</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <circle id="path-1" cx="16" cy="16" r="16"></circle>
-    </defs>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/container/SF/regular">
-            <g id="Group-3">
-                <mask id="mask-2" fill="white">
-                    <use xlink:href="#path-1"></use>
-                </mask>
-                <use id="Mask" fill="#EBEFFF" fill-rule="nonzero" xlink:href="#path-1"></use>
-                <g id="icon/sf-small/download/regular" mask="url(#mask-2)" stroke-linecap="round" stroke-linejoin="round">
-                    <g transform="translate(8.000000, 8.000000)">
-                        <g id="Group" stroke="none" stroke-width="1" fill-rule="evenodd" transform="translate(4.800000, 1.600000)">
-                            <polyline id="Path-3" stroke="#1B2559" stroke-width="2" points="0 5.6 3.2 8.8 6.4 5.6"></polyline>
-                            <path d="M3.2,0 L3.2,7.2" id="Path-4" stroke="#1B2559" stroke-width="2"></path>
-                        </g>
-                        <path d="M0,12 L0,12 C0,13.3256 1.0744,14.4 2.4,14.4 L13.6,14.4 C14.9256,14.4 16,13.3256 16,12" id="Stroke-1" stroke="#1B2559" stroke-width="2"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/direction/cash-in.svg
+++ b/new-lamassu-admin/public/icons/direction/cash-in.svg
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="12px" viewBox="0 0 10 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/direction/cash-in</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/direction/cash-in" transform="translate(-1.000000, 0.000000)" fill="#16D6D3">
-            <path d="M3.99134364,0.321790399 L10.1430099,4.40569595 C11.0271728,4.99266501 11.2660914,6.1822461 10.6766494,7.06269968 C10.5357408,7.27317585 10.3543728,7.45378298 10.1430099,7.59410043 L3.99134364,11.678006 C3.10718075,12.264975 1.91258801,12.0270588 1.32314609,11.1466052 C1.11243854,10.8318699 1,10.4620686 1,10.0838037 L1,1.91599264 C1,0.857819122 1.86143307,0 2.92406462,0 C3.30392305,0 3.67528233,0.11196683 3.99134364,0.321790399 Z" id="Path-3"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/direction/cash-out.svg
+++ b/new-lamassu-admin/public/icons/direction/cash-out.svg
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="10px" height="12px" viewBox="0 0 10 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/direction/cash-out</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/direction/cash-out" transform="translate(-1.000000, 0.000000)" fill="#5A67FF">
-            <path d="M3.99134364,0.321790399 L10.1430099,4.40569595 C11.0271728,4.99266501 11.2660914,6.1822461 10.6766494,7.06269968 C10.5357408,7.27317585 10.3543728,7.45378298 10.1430099,7.59410043 L3.99134364,11.678006 C3.10718075,12.264975 1.91258801,12.0270588 1.32314609,11.1466052 C1.11243854,10.8318699 1,10.4620686 1,10.0838037 L1,1.91599264 C1,0.857819122 1.86143307,0 2.92406462,0 C3.30392305,0 3.67528233,0.11196683 3.99134364,0.321790399 Z" id="Path-3" transform="translate(6.000000, 6.000000) scale(-1, 1) translate(-6.000000, -6.000000) "></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/lamassu
+++ b/new-lamassu-admin/public/icons/lamassu
--- a/new-lamassu-admin/public/icons/search/comet.svg
+++ b/new-lamassu-admin/public/icons/search/comet.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/search/comet</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/search/comet" transform="translate(1.000000, 1.000000)" stroke="#5F668A">
-            <g id="Group">
-                <path d="M14.2771714,7.35325714 C14.2771714,11.1778286 11.1768857,14.2781143 7.35231429,14.2781143 C3.5286,14.2781143 0.428314286,11.1778286 0.428314286,7.35325714 C0.428314286,3.52868571 3.5286,0.4284 7.35231429,0.4284 C11.1768857,0.4284 14.2771714,3.52868571 14.2771714,7.35325714 Z" id="Stroke-1" stroke-width="2"></path>
-                <path d="M12.3331714,12.3342 L17.5360286,17.5370571" id="Stroke-3" stroke-width="2" stroke-linecap="round"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/search/dark.svg
+++ b/new-lamassu-admin/public/icons/search/dark.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/search/dark</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/search/dark" transform="translate(1.000000, 1.000000)" stroke="#1B2559">
-            <g id="Group">
-                <path d="M14.2771714,7.35325714 C14.2771714,11.1778286 11.1768857,14.2781143 7.35231429,14.2781143 C3.5286,14.2781143 0.428314286,11.1778286 0.428314286,7.35325714 C0.428314286,3.52868571 3.5286,0.4284 7.35231429,0.4284 C11.1768857,0.4284 14.2771714,3.52868571 14.2771714,7.35325714 Z" id="Stroke-1" stroke-width="2"></path>
-                <path d="M12.3331714,12.3342 L17.5360286,17.5370571" id="Stroke-3" stroke-width="2" stroke-linecap="round"></path>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/sf-small/clock/white.svg
+++ b/new-lamassu-admin/public/icons/sf-small/clock/white.svg
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/sf-small/clock-w</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/sf-small/clock-w" transform="translate(1.000000, 1.000000)" stroke="#FFFFFF">
-            <g id="Group-7">
-                <path d="M0,10 C0,15.522 4.478,20 10,20 C15.522,20 20,15.522 20,10 C20,4.478 15.522,0 10,0 C7.749,0 5.671,0.744 4,1.999" id="Stroke-1" stroke-width="2"></path>
-                <polyline id="Stroke-3" stroke-width="2" points="13 11 10 11.063 10 7"></polyline>
-                <polyline id="Stroke-5" stroke-width="2" points="3 0 3 3 5 4"></polyline>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/sf-small/clock/zodiac.svg
+++ b/new-lamassu-admin/public/icons/sf-small/clock/zodiac.svg
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/sf-small/clock</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/sf-small/clock" transform="translate(1.000000, 1.000000)" stroke="#1B2559">
-            <g id="Group-7">
-                <path d="M0,10 C0,15.522 4.478,20 10,20 C15.522,20 20,15.522 20,10 C20,4.478 15.522,0 10,0 C7.749,0 5.671,0.744 4,1.999" id="Stroke-1" stroke-width="2"></path>
-                <polyline id="Stroke-3" stroke-width="2" points="13 11 10 11.063 10 7"></polyline>
-                <polyline id="Stroke-5" stroke-width="2" points="3 0 3 3 5 4"></polyline>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/sf-small/download/hover.svg
+++ b/new-lamassu-admin/public/icons/sf-small/download/hover.svg
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="18px" viewBox="0 0 22 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/sf-small/download/hover</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/sf-small/download/hover" transform="translate(1.000000, -1.000000)" stroke="#5F668A">
-            <g id="Group" stroke-width="1" fill-rule="evenodd" transform="translate(6.000000, 2.000000)">
-                <polyline id="Path-3" stroke-width="2" points="0 7 4 11 8 7"></polyline>
-                <path d="M4,0 L4,9" id="Path-4" stroke-width="2"></path>
-            </g>
-            <path d="M0,15 L0,15 C0,16.657 1.343,18 3,18 L17,18 C18.657,18 20,16.657 20,15" id="Stroke-1" stroke-width="2"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/sf-small/download/regular.svg
+++ b/new-lamassu-admin/public/icons/sf-small/download/regular.svg
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="18px" viewBox="0 0 22 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/sf-small/download/regular</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/sf-small/download/regular" transform="translate(1.000000, -1.000000)" stroke="#1B2559">
-            <g id="Group" stroke-width="1" fill-rule="evenodd" transform="translate(6.000000, 2.000000)">
-                <polyline id="Path-3" stroke-width="2" points="0 7 4 11 8 7"></polyline>
-                <path d="M4,0 L4,9" id="Path-4" stroke-width="2"></path>
-            </g>
-            <path d="M0,15 L0,15 C0,16.657 1.343,18 3,18 L17,18 C18.657,18 20,16.657 20,15" id="Stroke-1" stroke-width="2"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/sf-small/download/white.svg
+++ b/new-lamassu-admin/public/icons/sf-small/download/white.svg
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="18px" viewBox="0 0 22 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/sf-small/download/white</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/sf-small/download/white" transform="translate(1.000000, -1.000000)" stroke="#FFFFFF" stroke-width="2">
-            <polyline id="Path-3" points="6 9 10 13 14 9"></polyline>
-            <path d="M10,2 L10,11" id="Path-4"></path>
-            <path d="M0,15 L0,15 C0,16.657 1.343,18 3,18 L17,18 C18.657,18 20,16.657 20,15" id="Stroke-1"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/sf-small/exception.svg
+++ b/new-lamassu-admin/public/icons/sf-small/exception.svg
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="18px" viewBox="0 0 22 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/sf-small/exception</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/sf-small/exception" transform="translate(1.000000, -2.000000)" stroke="#1B2559" stroke-width="2">
-            <path d="M0,3 L12,3" id="Path-4"></path>
-            <path d="M0,13 L20,13" id="Path-4-Copy-3"></path>
-            <path d="M0,19 L20,19" id="Path-4-Copy-4"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/sf-small/filter/white.svg
+++ b/new-lamassu-admin/public/icons/sf-small/filter/white.svg
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/sf-small/filter</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/sf-small/filter" transform="translate(1.000000, 1.000000)" stroke="#FFFFFF" stroke-width="2">
-            <path d="M19,2.5 C19,1.11909091 17.8809091,0 16.5,0 C15.1190909,0 14,1.11909091 14,2.5 C14,3.88090909 15.1190909,5 16.5,5 C17.8809091,5 19,3.88090909 19,2.5 Z" id="Stroke-1" stroke-linecap="round" stroke-linejoin="round"></path>
-            <path d="M5,9.5 C5,8.11909091 3.88090909,7 2.5,7 C1.11909091,7 0,8.11909091 0,9.5 C0,10.8818182 1.11909091,12 2.5,12 C3.88090909,12 5,10.8818182 5,9.5 Z" id="Stroke-7" stroke-linecap="round" stroke-linejoin="round"></path>
-            <path d="M19,17.5 C19,16.1190909 17.8809091,15 16.5,15 C15.1190909,15 14,16.1190909 14,17.5 C14,18.8809091 15.1190909,20 16.5,20 C17.8809091,20 19,18.8809091 19,17.5 Z" id="Stroke-9" stroke-linecap="round" stroke-linejoin="round"></path>
-            <path d="M14,2.5 L0.498999482,2.5" id="Line-3" stroke-linecap="square"></path>
-            <path d="M20,9.5 L6.49899948,9.5" id="Line-3-Copy" stroke-linecap="square"></path>
-            <path d="M14,17.5 L0.498999482,17.5" id="Line-3-Copy-2" stroke-linecap="square"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/sf-small/filter/zodiac.svg
+++ b/new-lamassu-admin/public/icons/sf-small/filter/zodiac.svg
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/sf-small/filter-blue</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/sf-small/filter-blue" transform="translate(1.000000, 1.000000)" stroke="#1B2559" stroke-width="2">
-            <path d="M19,2.5 C19,1.11909091 17.8809091,0 16.5,0 C15.1190909,0 14,1.11909091 14,2.5 C14,3.88090909 15.1190909,5 16.5,5 C17.8809091,5 19,3.88090909 19,2.5 Z" id="Stroke-1" stroke-linecap="round" stroke-linejoin="round"></path>
-            <path d="M5,9.5 C5,8.11909091 3.88090909,7 2.5,7 C1.11909091,7 0,8.11909091 0,9.5 C0,10.8818182 1.11909091,12 2.5,12 C3.88090909,12 5,10.8818182 5,9.5 Z" id="Stroke-7" stroke-linecap="round" stroke-linejoin="round"></path>
-            <path d="M19,17.5 C19,16.1190909 17.8809091,15 16.5,15 C15.1190909,15 14,16.1190909 14,17.5 C14,18.8809091 15.1190909,20 16.5,20 C17.8809091,20 19,18.8809091 19,17.5 Z" id="Stroke-9" stroke-linecap="round" stroke-linejoin="round"></path>
-            <path d="M14,2.5 L0.498999482,2.5" id="Line-3" stroke-linecap="square"></path>
-            <path d="M20,9.5 L6.49899948,9.5" id="Line-3-Copy" stroke-linecap="square"></path>
-            <path d="M14,17.5 L0.498999482,17.5" id="Line-3-Copy-2" stroke-linecap="square"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/sf-small/listing/white.svg
+++ b/new-lamassu-admin/public/icons/sf-small/listing/white.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="20px" viewBox="0 0 22 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/sf-small/listing copy</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/sf-small/listing-copy" transform="translate(1.000000, 0.000000)" stroke="#FFFFFF" stroke-width="2">
-            <path d="M0,1 L20,1" id="Path-4"></path>
-            <path d="M0,7 L9,7" id="Path-4-Copy"></path>
-            <path d="M0,13 L20,13" id="Path-4-Copy-2"></path>
-            <path d="M0,19 L12,19" id="Path-4-Copy-3"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/sf-small/listing/zodiac.svg
+++ b/new-lamassu-admin/public/icons/sf-small/listing/zodiac.svg
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="20px" viewBox="0 0 22 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/sf-small/listing</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="icon/sf-small/listing" transform="translate(1.000000, 0.000000)" stroke="#1B2559" stroke-width="2">
-            <path d="M0,1 L20,1" id="Path-4"></path>
-            <path d="M0,7 L9,7" id="Path-4-Copy"></path>
-            <path d="M0,13 L20,13" id="Path-4-Copy-2"></path>
-            <path d="M0,19 L12,19" id="Path-4-Copy-3"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/sf-small/save.svg
+++ b/new-lamassu-admin/public/icons/sf-small/save.svg
@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/sf-small/save</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <polygon id="path-1" points="0 21 21 21 21 0 0 0"></polygon>
-    </defs>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/sf-small/save" transform="translate(1.000000, 1.000000)">
-            <g id="Group">
-                <g id="Group-10">
-                    <g id="Group-6">
-                        <polygon id="Stroke-1" stroke="#1B2559" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" points="20.5 20.5 0.5 20.5 0.5 0.5 16.75 0.5 20.5 4.25"></polygon>
-                        <mask id="mask-2" fill="white">
-                            <use xlink:href="#path-1"></use>
-                        </mask>
-                        <g id="Clip-4"></g>
-                        <polygon id="Stroke-5" stroke="#1B2559" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" mask="url(#mask-2)" points="4.25 7.5 16.75 7.5 16.75 0.5 4.25 0.5"></polygon>
-                    </g>
-                </g>
-                <circle id="Oval" stroke="#1B2559" stroke-width="2" cx="11" cy="14" r="3"></circle>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/sf-small/search/white.svg
+++ b/new-lamassu-admin/public/icons/sf-small/search/white.svg
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/sf-small/search/white</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/sf-small/search/white" transform="translate(1.000000, 1.000000)" stroke="#FFFFFF" stroke-width="2">
-            <path d="M15.8635238,8.17028571 C15.8635238,12.4198095 12.4187619,15.8645714 8.1692381,15.8645714 C3.92066667,15.8645714 0.475904762,12.4198095 0.475904762,8.17028571 C0.475904762,3.9207619 3.92066667,0.476 8.1692381,0.476 C12.4187619,0.476 15.8635238,3.9207619 15.8635238,8.17028571 Z" id="Stroke-1"></path>
-            <path d="M13.7035238,13.7046667 L19.4844762,19.485619" id="Stroke-3" stroke-linecap="round"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/sf-small/search/zodiac.svg
+++ b/new-lamassu-admin/public/icons/sf-small/search/zodiac.svg
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/sf-small/search/zodiac</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/sf-small/search/zodiac" transform="translate(1.000000, 1.000000)" stroke="#1B2559" stroke-width="2">
-            <path d="M15.8635238,8.17028571 C15.8635238,12.4198095 12.4187619,15.8645714 8.1692381,15.8645714 C3.92066667,15.8645714 0.475904762,12.4198095 0.475904762,8.17028571 C0.475904762,3.9207619 3.92066667,0.476 8.1692381,0.476 C12.4187619,0.476 15.8635238,3.9207619 15.8635238,8.17028571 Z" id="Stroke-1"></path>
-            <path d="M13.7035238,13.7046667 L19.4844762,19.485619" id="Stroke-3" stroke-linecap="round"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/stage/complete.svg
+++ b/new-lamassu-admin/public/icons/stage/complete.svg
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/stage/complete</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/stage/complete" transform="translate(1.000000, 1.000000)">
-            <circle id="Oval" stroke="#1B2559" stroke-width="1" transform="translate(8.000000, 8.000000) rotate(-270.000000) translate(-8.000000, -8.000000) " cx="8" cy="8" r="8"></circle>
-            <path d="M6.80983711,11 C6.54819546,11 6.28655382,10.9032616 6.08725647,10.710772 L4.29971255,8.98428824 C3.90009582,8.59832189 3.90009582,7.97445811 4.29971255,7.58849175 C4.69932929,7.2025254 5.34525711,7.2025254 5.74487384,7.58849175 L6.80983711,8.61707728 L10.2551262,5.28947477 C10.6547429,4.90350841 11.3016927,4.90350841 11.7002874,5.28947477 C12.0999042,5.674454 12.0999042,6.2993049 11.7002874,6.68527125 L7.53241776,10.710772 C7.33312041,10.9032616 7.07147876,11 6.80983711,11" id="Path" fill="#1B2559" fill-rule="evenodd"></path>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/stage/current.svg
+++ b/new-lamassu-admin/public/icons/stage/current.svg
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/stage/current</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/stage/current" transform="translate(1.000000, 1.000000)">
-            <circle id="Oval-2-Copy" fill="#1B2559" fill-rule="evenodd" cx="8" cy="8" r="4"></circle>
-            <circle id="Oval-Copy-5" stroke="#1B2559" stroke-width="2" transform="translate(8.000000, 8.000000) rotate(-270.000000) translate(-8.000000, -8.000000) " cx="8" cy="8" r="8"></circle>
-        </g>
-    </g>
-</svg>
--- a/new-lamassu-admin/public/icons/stage/empty.svg
+++ b/new-lamassu-admin/public/icons/stage/empty.svg
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.3 (81716) - https://sketch.com -->
-    <title>icon/stage/empty</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon/stage/empty" transform="translate(1.000000, 1.000000)" stroke="#5F668A">
-            <circle id="Oval-Copy-6" transform="translate(8.000000, 8.000000) rotate(-270.000000) translate(-8.000000, -8.000000) " cx="8" cy="8" r="8"></circle>
-        </g>
-    </g>
-</svg>
--- a/Show more
+++ b/Show more