diff --git a/website/client/src/components/shared/numberIncrement.vue b/website/client/src/components/shared/numberIncrement.vue
index 91ad8670e0..594728f523 100644
--- a/website/client/src/components/shared/numberIncrement.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -1,37 +1,91 @@
 <template>
   <div class="d-flex flex-row align-items-center justify-content-center">
+    <!-- negative -->
     <div
+      v-if="buy-modal"
       class="gray-circle"
-      @click="gems.amount <= 0
-        ? gems.amount = 0
-        : gems.amount--"
+      @click="selectedAmountToBuy <= 0
+        ? selectedAmountToBuy = 0
+        : selectedAmountToBuy--"
     >
       <div
         class="icon-negative"
-        v-html="icons.negativeIcon"
+        v-html="icons.negative"
       ></div>
     </div>
+    <div
+      v-else-if="sell-modal"
+      class="gray-circle"
+      @click="selectedAmountToSell <= 0
+        ? selectedAmountToSell = 0
+        : selectedAmountToSell--"
+    >
+      <div
+        class="icon-negative"
+        v-html="icons.negative"
+      ></div>
+    </div>
+    <div
+      v-else
+      class="gray-circle"
+      @click="gift.gems.amount <= 0
+        ? gift.gems.amount = 0
+        : gift.gems.amount--"
+    >
+      <div
+        class="icon-negative"
+        v-html="icons.negative"
+      ></div>
+    </div>
+    <!-- quantity -->
     <div class="input-group">
       <div class="input-group-prepend input-group-icon align-items-center">
         <div
+          v-if="send-gift"
           class="icon-gem"
-          v-html="icons.gemIcon"
+          v-html="icons.gem"
         ></div>
+        <div
+          v-else
+        >
+        </div>
       </div>
       <input
         id="gemsForm"
-        v-model.number="gems.amount"
+        v-model.number="variable"
         class="form-control"
-        :max="itemContextToSell.itemCount"
+        min="1"
       >
     </div>
+    <!-- positive -->
     <div
+      v-if="buy-modal"
       class="gray-circle"
-      @click="gems.amount++"
+      @click="selectedAmountToBuy++"
     >
       <div
         class="icon-positive"
-        v-html="icons.positiveIcon"
+        v-html="icons.positive"
+      ></div>
+    </div>
+    <div
+      v-else-if="sell-modal"
+      class="gray-circle"
+      @click="selectedAmountToSell++"
+    >
+      <div
+        class="icon-positive"
+        v-html="icons.positive"
+      ></div>
+    </div>
+    <div
+      v-else
+      class="gray-circle"
+      @click="gift.gems.amount++"
+    >
+      <div
+        class="icon-positive"
+        v-html="icons.positive"
       ></div>
     </div>
   </div>
@@ -98,11 +152,17 @@
 </style>
 
 <script>
+// icons
 import gemIcon from '@/assets/svg/gem.svg';
 import goldIcon from '@/assets/svg/gold.svg';
 import positiveIcon from '@/assets/svg/positive.svg';
 import negativeIcon from '@/assets/svg/negative.svg';
 
+// modules
+// import keys from 'lodash/keys';
+
+import { mapState } from '@/libs/store';
+
 export default {
   data () {
     return {
@@ -112,8 +172,45 @@ export default {
         plus: positiveIcon,
         minus: negativeIcon,
       }),
+      selectedAmountToBuy: 1,
+      selectedAmountToSell: 1,
+      gift: {
+        type: 'gems',
+        gems: {
+          amount: 0,
+          fromBalance: true,
+        },
+      },
+      gemCost: 1,
     };
   },
+  computed: {
+    ...mapState({ user: 'user.data' }), // might not need this?
+    notEnoughCurrency () {
+      const notEnoughCurrency = !this.enoughCurrency(this.getPriceClass(),
+        this.item.value * this.selectedAmountToBuy);
+      return notEnoughCurrency;
+    },
+    userGold () {
+      const userGold = this.user.currency;
+      return userGold;
+    },
+    maxItemsToBuy () {
+      const maxItemsToBuy = this.userGold
+        ? this.userGold / this.item.currency
+        : this.notEnoughCurrency;
+      return maxItemsToBuy;
+    },
+
+    getPriceClass () {
+      if (this.priceType && this.icons[this.priceType]) {
+        return this.priceType;
+      } if (this.item.currency && this.icons[this.item.currency]) {
+        return this.item.currency;
+      }
+      return 'gold';
+    },
+  },
 };
 
 </script>
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 013c291d55..479868d519 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -78,6 +78,9 @@
           >
             <strong>{{ $t('howManyToBuy') }}</strong>
           </div>
+          <div>
+            <number-increment />
+          </div>
           <div v-if="showAmountToBuy(item)">
             <div class="box">
               <input
@@ -377,6 +380,7 @@ import CountdownBanner from './countdownBanner';
 import currencyMixin from './_currencyMixin';
 import notifications from '@/mixins/notifications';
 import buyMixin from '@/mixins/buy';
+import numberIncrement from '@/components/shared/numberIncrement';
 
 import { mapState } from '@/libs/store';
 
@@ -408,6 +412,7 @@ export default {
     Avatar,
     PinBadge,
     CountdownBanner,
+    numberIncrement,
   },
   mixins: [buyMixin, currencyMixin, notifications, numberInvalid, spellsMixin],
   props: {
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index fa6822dfb2..af37984dde 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -46,6 +46,9 @@
             <div>
               <b class="how-many-to-sell">{{ $t('howManyToSell') }}</b>
             </div>
+            <div>
+              <number-increment />
+            </div>
             <div>
               <b-input
                 v-model="selectedAmountToSell"