diff --git a/.env-sample b/.env-sample
index 3417a7ff..62c445ab 100644
--- a/.env-sample
+++ b/.env-sample
@@ -70,7 +70,7 @@ MAX_PUBLIC_ORDERS = 100
 
 # Trade limits in satoshis
 MIN_TRADE = 20000 
-MAX_TRADE = 1500000
+MAX_TRADE = 2200000
 MAX_TRADE_BONDLESS_TAKER = 50000
 
 # Expiration (CLTV_expiry) time for HODL invoices in HOURS // 7 min/block assumed
diff --git a/docs/_config.yml b/docs/_config.yml
index 80263847..b3648aa7 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -35,7 +35,7 @@ robosats:
   maker_fee              : 0.025        # In percent (%)
   taker_fee              : 0.175        # In percent (%)
   total_fee              : 0.2          # In percent (%)
-  max_trade_limit        : "1,500,000"  # In Satoshis
+  max_trade_limit        : "2,200,000"  # In Satoshis
   min_trade_limit        : "20,000"     # In Satoshis
   hours_public_default   : 24           # In hours
   hours_fiat_exchange    : 24           # In hours
diff --git a/frontend/src/components/BookPage.js b/frontend/src/components/BookPage.js
index 90e0c4f6..744f0bc1 100644
--- a/frontend/src/components/BookPage.js
+++ b/frontend/src/components/BookPage.js
@@ -108,7 +108,7 @@ class BookPage extends Component {
                 <ListItemAvatar>
                 <Tooltip placement="right" enterTouchDelay={0} title={t(params.row.robot_status)}>
                   <Badge variant="dot" overlap="circular" badgeContent="" color={this.statusBadgeColor(params.row.robot_status)}>
-                  <Badge overlap="circular" anchorOrigin={{horizontal: 'right', vertical: 'bottom'}} badgeContent={<div style={{position:"relative", left:"11px", top:"2px"}}> {params.row.type == t("Buyer") ? <SendReceiveIcon sx={{transform: "scaleX(-1)",height:"20px",width:"20px"}} color="secondary"/> : <SendReceiveIcon sx={{height:"20px",width:"20px"}} color="primary"/>}</div>}>
+                  <Badge overlap="circular" anchorOrigin={{horizontal: 'right', vertical: 'bottom'}} badgeContent={<div style={{position:"relative", left:"6px", top:"1px"}}> {params.row.type == t("Buyer") ? <SendReceiveIcon sx={{transform: "scaleX(-1)",height:"18px",width:"18px"}} color="secondary"/> : <SendReceiveIcon sx={{height:"20px",width:"20px"}} color="primary"/>}</div>}>
                     <div style={{ width: 45, height: 45 }}>
                       <Image className='bookAvatar'
                           disableError={true}
@@ -208,7 +208,7 @@ class BookPage extends Component {
               <div style={{ position: "relative", left: "-5px" }}>
                 <Tooltip placement="right" enterTouchDelay={0} title={params.row.robot+" ("+t(params.row.robot_status)+")"}>
                   <Badge variant="dot" overlap="circular" badgeContent="" color={this.statusBadgeColor(params.row.robot_status)}>
-                  <Badge overlap="circular" anchorOrigin={{horizontal: 'right', vertical: 'bottom'}} badgeContent={<div style={{position:"relative", left:"11px", top:"2px"}}> {params.row.type == t("Buyer") ? <SendReceiveIcon sx={{transform: "scaleX(-1)",height:"20px",width:"20px"}} color="secondary"/> : <SendReceiveIcon sx={{height:"20px",width:"20px"}} color="primary"/>}</div>}>
+                  <Badge overlap="circular" anchorOrigin={{horizontal: 'right', vertical: 'bottom'}} badgeContent={<div style={{position:"relative", left:"6px", top:"1px"}}> {params.row.type == t("Buyer") ? <SendReceiveIcon sx={{transform: "scaleX(-1)",height:"18px",width:"18px"}} color="secondary"/> : <SendReceiveIcon sx={{height:"20px",width:"20px"}} color="primary"/>}</div>}>
                     <div style={{ width: 45, height: 45 }}>
                       <Image className='bookAvatar'
                           disableError={true}
diff --git a/frontend/src/components/Icons/SendReceive.tsx b/frontend/src/components/Icons/SendReceive.tsx
index bab11e03..9f88a841 100644
--- a/frontend/src/components/Icons/SendReceive.tsx
+++ b/frontend/src/components/Icons/SendReceive.tsx
@@ -5,18 +5,15 @@ export default function SendReceiveIcon(props) {
     return (
       <SvgIcon sx={props.sx} color={props.color} x="0px" y="0px" viewBox="0 0 300 300">
         <g>
-            <path fill={props.color} d="M285.126,63.456c-0.487,0-0.985,0.028-1.485,0.083c-10.938,0.583-176.959,7.455-264.56,11.065
-                c-3.533,0.137-8.809-0.708-12.036,0.666c-2.834,1.197-5.051,4.151-6.195,7.491c-0.035,0.102-0.071,0.201-0.104,0.304
-                c-1.189,3.708-1.048,7.837,1.094,10.571c6.926,8.827,18.948,15.991,27.521,23.321c4.17,3.566,8.384,7.093,12.568,10.648
-                c0.758,0.653,5.504,3.664,5.562,4.706c0,0.014,4.656,90.229,4.656,90.229s-1.983,8.246,6.614,13.467c0,0,4.854,2.437,12.953-3.08
-                c0.083,0.017,0.169,0.019,0.25,0.039c9.155-5.648,32.594-17.686,55.964-29.039l13.985,11.104
-                c5.275,1.931,10.294,5.525,15.817,2.649c0.695-0.358,1.375-0.747,2.056-1.139l2.165-2.107
-                c55.693-54.32,119.135-114.93,129.685-122.854c5.136-2.498,8.55-7.759,8.356-13.785C299.729,69.757,293.189,63.456,285.126,63.456z
-                M71.998,158.047l-3.396,12.34c0,0-0.064-0.094-0.168-0.241l-6.912,23.467l0.432-54.431l1.194-0.17l40.068-5.826l-19.093,7.634
-                l-1.275,0.511c0.064,0.09,0.109,0.156,0.109,0.156C71.858,144.358,71.998,158.047,71.998,158.047z M89.62,154.562l135.104-54.043
-                L61.011,124.368L19.684,89.386c0,0,257.502-10.591,265.317-11.104c-6.442,1.75-133.392,125.547-133.392,125.547L89.62,154.562z
-                M95.61,203.455c-10.354,5.246-18.698,9.647-24.793,13.076c-1.116,0.624-2.151,1.221-3.109,1.775l16.075-49.475l31.317,24.89
-                C109.292,196.582,102.446,199.983,95.61,203.455z"/>
+          <path fill={props.color} d="M150.021,2.579C68.341,2.579,2.127,68.793,2.127,150.472c0,81.682,66.214,147.895,147.895,147.895
+            c81.676,0,147.89-66.213,147.89-147.895C297.911,68.793,231.697,2.579,150.021,2.579z M99.195,73.557
+            c0,0,60.301,60.307,60.306,60.309c4.899,4.895,11.188,13.849,8.663,21.061c-1.835,5.236-6.053,9.546-9.893,13.383
+            c-0.091,0.093-59.076,59.078-59.076,59.078c-6.26,6.26-16.406,6.26-22.665,0c-6.261-6.256-6.261-16.406,0-22.665l54.247-54.25
+            L76.53,96.224c-6.261-6.259-6.261-16.407,0-22.667c3.128-3.128,7.23-4.693,11.329-4.693C91.965,68.864,96.065,70.429,99.195,73.557
+            z M146.365,73.557c3.125-3.128,7.23-4.693,11.33-4.693c4.101,0,8.204,1.565,11.335,4.693c0,0,60.303,60.307,60.308,60.309
+            c4.895,4.894,11.188,13.849,8.659,21.061c-1.832,5.236-6.05,9.546-9.889,13.383c-0.092,0.094-59.078,59.078-59.078,59.078
+            c-6.256,6.26-16.405,6.26-22.665,0c-6.258-6.256-6.258-16.406,0-22.665l54.246-54.25l-54.246-54.25
+            C140.107,89.966,140.107,79.818,146.365,73.557z"/>
         </g>
       </SvgIcon>
     );
diff --git a/frontend/src/components/OrderPage.js b/frontend/src/components/OrderPage.js
index 1112ea8d..370563f8 100644
--- a/frontend/src/components/OrderPage.js
+++ b/frontend/src/components/OrderPage.js
@@ -492,7 +492,7 @@ class OrderPage extends Component {
               <ListItemAvatar sx={{ width: 56, height: 56 }}>
               <Tooltip placement="top" enterTouchDelay={0} title={t(this.state.maker_status)} >
                 <Badge variant="dot" overlap="circular" badgeContent="" color={this.statusBadgeColor(this.state.maker_status)}>
-                <Badge overlap="circular" anchorOrigin={{horizontal: 'right', vertical: 'bottom'}} badgeContent={<div style={{position:"relative", left:"12px", top:"4px"}}> {!this.state.type ? <SendReceiveIcon sx={{transform: "scaleX(-1)"}} color="secondary"/> : <SendReceiveIcon color="primary"/>}</div>}>
+                <Badge overlap="circular" anchorOrigin={{horizontal: 'right', vertical: 'bottom'}} badgeContent={<div style={{position:"relative", left:"5px", top:"2px"}}> {!this.state.type ? <SendReceiveIcon sx={{transform: "scaleX(-1)",height:"18px",width:"18px"}} color="secondary"/> : <SendReceiveIcon sx={{height:"18px",width:"18px"}} color="primary"/>}</div>}>
                   <Avatar className="flippedSmallAvatar"
                     alt={this.state.maker_nick}
                     src={window.location.origin +'/static/assets/avatars/' + this.state.maker_nick + '.png'}
@@ -514,7 +514,7 @@ class OrderPage extends Component {
                       <ListItemAvatar >
                         <Tooltip enterTouchDelay={0} title={t(this.state.taker_status)} >
                           <Badge variant="dot" overlap="circular" badgeContent="" color={this.statusBadgeColor(this.state.taker_status)}>
-                          <Badge overlap="circular" anchorOrigin={{horizontal: 'left', vertical: 'bottom'}} badgeContent={<div style={{position:"relative", right:"12px", top:"4px"}}> {this.state.type ? <SendReceiveIcon color="secondary"/> : <SendReceiveIcon sx={{transform: "scaleX(-1)"}} color="primary"/> }</div>}>
+                          <Badge overlap="circular" anchorOrigin={{horizontal: 'left', vertical: 'bottom'}} badgeContent={<div style={{position:"relative", right:"5px", top:"2px"}}> {this.state.type ? <SendReceiveIcon sx={{height:"18px",width:"18px"}} color="secondary"/> : <SendReceiveIcon sx={{transform: "scaleX(-1)",height:"18px",width:"18px"}} color="primary"/> }</div>}>
                             <Avatar className="smallAvatar"
                               alt={this.state.taker_nick}
                               src={window.location.origin +'/static/assets/avatars/' + this.state.taker_nick + '.png'}
diff --git a/frontend/src/components/UserGenPage.js b/frontend/src/components/UserGenPage.js
index 62bf0113..876d3119 100644
--- a/frontend/src/components/UserGenPage.js
+++ b/frontend/src/components/UserGenPage.js
@@ -277,7 +277,7 @@ class UserGenPage extends Component {
             <ButtonGroup variant="contained" aria-label="outlined primary button group">
               <Button disabled={this.state.loadingRobot || !(this.props.token ? getCookie('robot_token')==this.props.token : true )} color='primary' to='/make/' component={Link}>{t("Make Order")}</Button>
               <Button color='inherit' style={{color: '#111111'}} onClick={this.handleClickOpenInfo}>{t("Info")}</Button>
-              <InfoDialog open={Boolean(this.state.openInfo)} maxAmount='1,500,000' onClose = {this.handleCloseInfo}/>
+              <InfoDialog open={Boolean(this.state.openInfo)} maxAmount='2,200,000' onClose = {this.handleCloseInfo}/>
               <Button disabled={this.state.loadingRobot || !(this.props.token ? getCookie('robot_token')==this.props.token : true )} color='secondary' to='/book/' component={Link}>{t("View Book")}</Button>
             </ButtonGroup>
           </Grid>