diff --git a/lib/src/screens/exchange/widgets/exchange_card.dart b/lib/src/screens/exchange/widgets/exchange_card.dart
index 0a5580625..4db041aa6 100644
--- a/lib/src/screens/exchange/widgets/exchange_card.dart
+++ b/lib/src/screens/exchange/widgets/exchange_card.dart
@@ -158,91 +158,96 @@ class ExchangeCardState extends State<ExchangeCard> {
         ),
         Padding(
             padding: EdgeInsets.only(top: 20),
-            child: Stack(
-              children: <Widget>[
-                BaseTextFormField(
-                    focusNode: widget.amountFocusNode,
-                    controller: amountController,
-                    enabled: _isAmountEditable,
-                    textAlign: TextAlign.left,
-                    keyboardType: TextInputType.numberWithOptions(
-                        signed: false, decimal: true),
-                    inputFormatters: [
-                      FilteringTextInputFormatter.deny(RegExp('[\\-|\\ ]'))
-                    ],
-                    hintText: '0.0000',
-                    borderColor: widget.borderColor,
-                    textStyle: TextStyle(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w600,
-                        color: Colors.white),
-                    placeholderTextStyle: TextStyle(
-                        fontSize: 16,
-                        fontWeight: FontWeight.w600,
-                        color: Theme.of(context)
-                            .accentTextTheme
-                            .display4
-                            .decorationColor),
-                    validator: _isAmountEditable
-                        ? widget.currencyValueValidator
-                        : null),
-                Positioned(
-                  top: 8,
-                  right: 0,
-                  child: Container(
-                    height: 32,
-                    padding: EdgeInsets.only(left: 10),
-                    color: widget.currencyButtonColor,
-                    child: InkWell(
-                      onTap: () => _presentPicker(context),
-                      child: Row(
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          mainAxisSize: MainAxisSize.min,
-                          children: <Widget>[
-                            Text(_selectedCurrency.toString(),
-                                style: TextStyle(
-                                    fontWeight: FontWeight.w600,
-                                    fontSize: 16,
-                                    color: Colors.white)),
-                            Padding(
-                              padding: EdgeInsets.only(left: 5),
-                              child: widget.imageArrow,
-                            )
-                          ]),
-                    ),
+            child: Row(
+              children: [
+                Container(
+                  padding: EdgeInsets.only(right: 8),
+                  height: 32,
+                  color: widget.currencyButtonColor,
+                  child: InkWell(
+                    onTap: () => _presentPicker(context),
+                    child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        mainAxisSize: MainAxisSize.min,
+                        children: <Widget>[
+                          Padding(
+                            padding: EdgeInsets.only(right: 5),
+                            child: widget.imageArrow,
+                          ),
+                          Text(_selectedCurrency.toString() + ':',
+                              style: TextStyle(
+                                  fontWeight: FontWeight.w600,
+                                  fontSize: 16,
+                                  color: Colors.white))
+                        ]),
                   ),
                 ),
-                if (widget.hasAllAmount)
-                  Positioned(
-                      top: 5,
-                      right: 55,
-                      child: Container(
-                        height: 32,
-                        width: 32,
-                        margin: EdgeInsets.only(left: 14, top: 4, bottom: 10),
-                        decoration: BoxDecoration(
-                            color: Theme.of(context)
-                                .primaryTextTheme
-                                .display1
-                                .color,
-                            borderRadius: BorderRadius.all(Radius.circular(6))),
-                        child: InkWell(
-                          onTap: () => widget.allAmount?.call(),
-                          child: Center(
-                            child: Text(S.of(context).all,
-                                textAlign: TextAlign.center,
-                                style: TextStyle(
-                                    fontSize: 12,
-                                    fontWeight: FontWeight.bold,
-                                    color: Theme.of(context)
-                                        .primaryTextTheme
-                                        .display1
-                                        .decorationColor)),
+                Expanded(
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Flexible(
+                        child: BaseTextFormField(
+                            focusNode: widget.amountFocusNode,
+                            controller: amountController,
+                            enabled: _isAmountEditable,
+                            textAlign: TextAlign.left,
+                            keyboardType: TextInputType.numberWithOptions(
+                                signed: false, decimal: true),
+                            inputFormatters: [
+                              FilteringTextInputFormatter.deny(
+                                  RegExp('[\\-|\\ ]'))
+                            ],
+                            hintText: '0.0000',
+                            borderColor: Colors.transparent,
+                            //widget.borderColor,
+                            textStyle: TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.w600,
+                                color: Colors.white),
+                            placeholderTextStyle: TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.w600,
+                                color: Theme.of(context)
+                                    .accentTextTheme
+                                    .display4
+                                    .decorationColor),
+                            validator: _isAmountEditable
+                                ? widget.currencyValueValidator
+                                : null),
+                      ),
+                      if (widget.hasAllAmount)
+                        Container(
+                          height: 32,
+                          width: 32,
+                          decoration: BoxDecoration(
+                              color: Theme.of(context)
+                                  .primaryTextTheme
+                                  .display1
+                                  .color,
+                              borderRadius:
+                              BorderRadius.all(Radius.circular(6))),
+                          child: InkWell(
+                            onTap: () => widget.allAmount?.call(),
+                            child: Center(
+                              child: Text(S.of(context).all,
+                                  textAlign: TextAlign.center,
+                                  style: TextStyle(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.bold,
+                                      color: Theme.of(context)
+                                          .primaryTextTheme
+                                          .display1
+                                          .decorationColor)),
+                            ),
                           ),
-                        ),
-                      ))
+                        )
+                    ],
+                  ),
+                ),
               ],
             )),
+        Divider(height: 1),
         Padding(
           padding: EdgeInsets.only(top: 5),
           child: Container(