diff --git a/components/CheckBox.qml b/components/CheckBox.qml
index 99ea6416..4ef1aae8 100644
--- a/components/CheckBox.qml
+++ b/components/CheckBox.qml
@@ -38,6 +38,7 @@ Item {
     property alias text: label.text
     property string checkedIcon: "qrc:///images/check-white.svg"
     property string uncheckedIcon
+    property bool fontAwesomeIcons: false
     property int imgWidth: 13
     property int imgHeight: 13
     property bool toggleOnClick: true
@@ -89,9 +90,11 @@ Item {
                 width: checkBox.imgWidth
                 height: checkBox.imgHeight
                 color: MoneroComponents.Style.defaultFontColor
-                fontAwesomeFallbackIcon: FontAwesome.plus
+                fontAwesomeFallbackIcon: checkBox.fontAwesomeIcons ? getIcon() : FontAwesome.plus
                 fontAwesomeFallbackSize: 14
-                image: {
+                image: checkBox.fontAwesomeIcons ? "" : getIcon()
+
+                function getIcon() {
                     if (checkBox.checked || checkBox.uncheckedIcon == "")
                         return checkBox.checkedIcon;
                     return checkBox.uncheckedIcon;
diff --git a/components/effects/ImageMask.qml b/components/effects/ImageMask.qml
index 4ac751ff..ea6d84c4 100644
--- a/components/effects/ImageMask.qml
+++ b/components/effects/ImageMask.qml
@@ -39,7 +39,6 @@ Item {
     id: root
     property string image: ""
     property string color: ""
-    property bool fontAwesomeFallbackEnabled: true
     property var fontAwesomeFallbackIcon: ""
     property string fontAwesomeFallbackFont: FontAwesome.fontFamilySolid
     property string fontAwesomeFallbackStyle: "Solid"
@@ -69,13 +68,13 @@ Item {
         anchors.fill: root
         source: svgMask
         color: root.color
-        visible: isOpenGL
+        visible: image && isOpenGL
     }
 
     Text {
         id: fontAwesomeFallback
-        visible: !isOpenGL && root.fontAwesomeFallback
-        text: !isOpenGL ? root.fontAwesomeFallbackIcon : ""
+        visible: !imgMockColor.visible
+        text: root.fontAwesomeFallbackIcon
         font.family: root.fontAwesomeFallbackFont
         font.pixelSize: root.fontAwesomeFallbackSize
         font.styleName: root.fontAwesomeFallbackStyle
diff --git a/images/minus-white.png b/images/minus-white.png
deleted file mode 100644
index b42bee8e..00000000
Binary files a/images/minus-white.png and /dev/null differ
diff --git a/images/minus-white@2x.png b/images/minus-white@2x.png
deleted file mode 100644
index c8652959..00000000
Binary files a/images/minus-white@2x.png and /dev/null differ
diff --git a/images/plus-in-circle-medium-white.png b/images/plus-in-circle-medium-white.png
deleted file mode 100755
index ddc548fb..00000000
Binary files a/images/plus-in-circle-medium-white.png and /dev/null differ
diff --git a/images/plus-in-circle-medium-white@2x.png b/images/plus-in-circle-medium-white@2x.png
deleted file mode 100755
index c4c3af90..00000000
Binary files a/images/plus-in-circle-medium-white@2x.png and /dev/null differ
diff --git a/images/plus-white.png b/images/plus-white.png
deleted file mode 100644
index 8cc8bcfc..00000000
Binary files a/images/plus-white.png and /dev/null differ
diff --git a/images/plus-white@2x.png b/images/plus-white@2x.png
deleted file mode 100644
index 54611b87..00000000
Binary files a/images/plus-white@2x.png and /dev/null differ
diff --git a/pages/Account.qml b/pages/Account.qml
index dffc2eb8..13c2b1cf 100644
--- a/pages/Account.qml
+++ b/pages/Account.qml
@@ -31,6 +31,7 @@ import QtQuick.Controls 2.0
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.1
 import QtQuick.Dialogs 1.2
+import FontAwesome 1.0
 
 import "../components" as MoneroComponents
 import "../components/effects/" as MoneroEffects
@@ -349,8 +350,9 @@ Rectangle {
                 id: addNewAccountCheckbox 
                 visible: !selectAndSend
                 border: false
-                checkedIcon: "qrc:///images/plus-in-circle-medium-white.png" 
-                uncheckedIcon: "qrc:///images/plus-in-circle-medium-white.png" 
+                uncheckedIcon: FontAwesome.plusCircle
+                toggleOnClick: false
+                fontAwesomeIcons: true
                 fontSize: 16
                 iconOnTheLeft: true
                 Layout.fillWidth: true
diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml
index 5812dac5..6c910f4c 100644
--- a/pages/AddressBook.qml
+++ b/pages/AddressBook.qml
@@ -284,8 +284,9 @@ Rectangle {
             MoneroComponents.CheckBox {
                 id: addNewEntryCheckbox
                 border: false
-                checkedIcon: "qrc:///images/plus-in-circle-medium-white.png"
-                uncheckedIcon: "qrc:///images/plus-in-circle-medium-white.png"
+                uncheckedIcon: FontAwesome.plusCircle
+                toggleOnClick: false
+                fontAwesomeIcons: true
                 fontSize: 16
                 iconOnTheLeft: true
                 Layout.fillWidth: true
diff --git a/pages/Receive.qml b/pages/Receive.qml
index 6d3ee060..1cbfff42 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -244,8 +244,9 @@ Rectangle {
             MoneroComponents.CheckBox {
                 id: addNewAddressCheckbox
                 border: false
-                checkedIcon: "qrc:///images/plus-in-circle-medium-white.png"
-                uncheckedIcon: "qrc:///images/plus-in-circle-medium-white.png"
+                uncheckedIcon: FontAwesome.plusCircle
+                toggleOnClick: false
+                fontAwesomeIcons: true
                 fontSize: 16
                 iconOnTheLeft: true
                 Layout.fillWidth: true
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 4bb61fec..e9dfb3ff 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -343,8 +343,9 @@ Rectangle {
               CheckBox {
                   id: descriptionCheckbox
                   border: false
-                  checkedIcon: "qrc:///images/plus-in-circle-medium-white.png"
-                  uncheckedIcon: "qrc:///images/plus-in-circle-medium-white.png"
+                  checkedIcon: FontAwesome.minusCircle
+                  uncheckedIcon: FontAwesome.plusCircle
+                  fontAwesomeIcons: true
                   fontSize: descriptionLine.labelFontSize
                   iconOnTheLeft: true
                   Layout.fillWidth: true
@@ -370,8 +371,9 @@ Rectangle {
               CheckBox {
                   id: paymentIdCheckbox
                   border: false
-                  checkedIcon: "qrc:///images/plus-in-circle-medium-white.png"
-                  uncheckedIcon: "qrc:///images/plus-in-circle-medium-white.png"
+                    checkedIcon: FontAwesome.minusCircle
+                    uncheckedIcon: FontAwesome.plusCircle
+                    fontAwesomeIcons: true
                   fontSize: paymentIdLine.labelFontSize
                   iconOnTheLeft: true
                   Layout.fillWidth: true
diff --git a/qml.qrc b/qml.qrc
index 1ad92107..eb312bef 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -7,10 +7,6 @@
         <file>images/download-white@2x.png</file>
         <file>images/external-link-white.png</file>
         <file>images/external-link-white@2x.png</file>
-        <file>images/minus-white.png</file>
-        <file>images/minus-white@2x.png</file>
-        <file>images/plus-white.png</file>
-        <file>images/plus-white@2x.png</file>
         <file>components/Label.qml</file>
         <file>components/SettingsListItem.qml</file>
         <file>images/whatIsIcon.png</file>
@@ -174,8 +170,6 @@
         <file>components/WarningBox.qml</file>
         <file>images/miningxmr.png</file>
         <file>images/miningxmr@2x.png</file>
-        <file>images/plus-in-circle-medium-white.png</file>
-        <file>images/plus-in-circle-medium-white@2x.png</file>
         <file>pages/merchant/Merchant.qml</file>
         <file>pages/merchant/MerchantCheckbox.qml</file>
         <file>pages/merchant/MerchantTrackingList.qml</file>