diff --git a/web/org.openbravo.mobile.core/assets/css/ob-standard.css b/web/org.openbravo.mobile.core/assets/css/ob-standard.css
--- a/web/org.openbravo.mobile.core/assets/css/ob-standard.css
+++ b/web/org.openbravo.mobile.core/assets/css/ob-standard.css
@@ -922,22 +922,28 @@
   background-color: transparent;
 }
 .btn-icon-switchon {
-  background-image: url('./../img/iconSwitchON.png');
+  background-image: url('./../img/iconSwitchON.svg');
+  background-size: 61px 23px;
 }
 .btn-icon-switchoff {
-  background-image: url('./../img/iconSwitchOFF.png');
+  background-image: url('./../img/iconSwitchOFF.svg');
+  background-size: 61px 23px;
 }
 .btn-icon-switchoffline {
-  background-image: url('./../img/iconSwitchOffline.png');
+  background-image: url('./../img/iconSwitchOffline.svg');
+  background-size: 61px 23px;
 }
 .btn-icon-rfidon {
-  background-image: url('./../img/iconRFIDON.png');
+  background-image: url('./../img/iconRFIDON.svg');
+  background-size: 17px 18px;
 }
 .btn-icon-rfidoff {
-  background-image: url('./../img/iconRFIDOFF.png');
+  background-image: url('./../img/iconRFIDOFF.svg');
+  background-size: 17px 18px;
 }
 .btn-icon-rfidoffline {
-  background-image: url('./../img/iconRFIDOffline.png');
+  background-image: url('./../img/iconRFIDOffline.svg');
+  background-size: 17px 18px;
 }
 .btn-icon-workspace {
   background-image: url('./../img/iconWorkspace.png');
@@ -979,7 +985,8 @@
   background-image: url('./../img/iconHome.png');
 }
 .btn-icon-add {
-  background-image: url('./../img/iconAdd.png');
+  background-image: url('./../img/iconAdd.svg');
+  background-size: 42px 42px;
 }
 .btn-icon-clear {
   background-image: url('./../img/iconClear.svg');
@@ -1019,7 +1026,8 @@
   cursor: pointer;
   vertical-align: middle;
   width: 100%;
-  background-image: url('./../img/inspectTree.png');
+  background-image: url('./../img/inspectTree.svg');
+  background-size: 31px 27px;
 }
 .btn-check-half-on {
   background-image: url('./../img/checkbox-half-on.svg');
diff --git a/web/org.openbravo.mobile.core/assets/img/iconAdd.svg b/web/org.openbravo.mobile.core/assets/img/iconAdd.svg
new file mode 100644
--- /dev/null
+++ b/web/org.openbravo.mobile.core/assets/img/iconAdd.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="OBSVG" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 373.7 373" style="enable-background:new 0 0 373.7 373;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#E2E2E2;}
+	.st1{fill:#6CB23F;}
+</style>
+<circle class="st0" cx="186.5" cy="186.5" r="186.5"/>
+<rect x="156.3" y="53.5" class="st1" width="60.5" height="266"/>
+<rect x="156.3" y="53.5" transform="matrix(6.123234e-17 -1 1 6.123234e-17 0 373)" class="st1" width="60.5" height="266"/>
+</svg>
diff --git a/web/org.openbravo.mobile.core/assets/img/iconRFIDOFF.svg b/web/org.openbravo.mobile.core/assets/img/iconRFIDOFF.svg
new file mode 100644
--- /dev/null
+++ b/web/org.openbravo.mobile.core/assets/img/iconRFIDOFF.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="OBSVG" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 320 330" style="enable-background:new 0 0 320 330;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#EE0000;}
+</style>
+<rect class="st0" width="320" height="330"/>
+<path class="st1" d="M80,26.7c-49.6,28.8-80,81.4-80,139c0,56,30.5,108.7,78.5,137.5l16-27C56.1,252.2,32,210.5,32,165.7
+	c0-46.4,24-88.1,64-110.5L80,26.7z M240,26.7l-16,27c40,24,64,65.6,64,112c0,44.8-24.1,86.5-62.5,110.5l16,27
+	c48-28.8,78.5-81.5,78.5-137.5C320,108.1,289.6,55.5,240,26.7z M112,82.7c-28.8,17.6-48,49.4-48,83s17.7,63.9,46.5,81.5l16-27
+	C107.3,209,96,188.1,96,165.7s12.8-43.2,32-56L112,82.7z M208,82.7l-16,27c19.2,12.8,32,33.6,32,56s-11.3,43.3-30.5,54.5l16,27
+	c28.8-17.6,46.5-47.9,46.5-81.5S236.8,100.4,208,82.7z M160,133.7c-17.7,0-32,14.3-32,32s14.3,32,32,32s32-14.3,32-32
+	S177.7,133.7,160,133.7z"/>
+</svg>
diff --git a/web/org.openbravo.mobile.core/assets/img/iconRFIDON.svg b/web/org.openbravo.mobile.core/assets/img/iconRFIDON.svg
new file mode 100644
--- /dev/null
+++ b/web/org.openbravo.mobile.core/assets/img/iconRFIDON.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="OBSVG" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 320 330" style="enable-background:new 0 0 320 330;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#006600;}
+</style>
+<rect class="st0" width="320" height="330"/>
+<path class="st1" d="M80,26.7c-49.6,28.8-80,81.4-80,139c0,56,30.5,108.7,78.5,137.5l16-27C56.1,252.2,32,210.5,32,165.7
+	c0-46.4,24-88.1,64-110.5L80,26.7z M240,26.7l-16,27c40,24,64,65.6,64,112c0,44.8-24.1,86.5-62.5,110.5l16,27
+	c48-28.8,78.5-81.5,78.5-137.5C320,108.1,289.6,55.5,240,26.7z M112,82.7c-28.8,17.6-48,49.4-48,83s17.7,63.9,46.5,81.5l16-27
+	C107.3,209,96,188.1,96,165.7s12.8-43.2,32-56L112,82.7z M208,82.7l-16,27c19.2,12.8,32,33.6,32,56s-11.3,43.3-30.5,54.5l16,27
+	c28.8-17.6,46.5-47.9,46.5-81.5S236.8,100.4,208,82.7z M160,133.7c-17.7,0-32,14.3-32,32s14.3,32,32,32s32-14.3,32-32
+	S177.7,133.7,160,133.7z"/>
+</svg>
diff --git a/web/org.openbravo.mobile.core/assets/img/iconRFIDOffline.svg b/web/org.openbravo.mobile.core/assets/img/iconRFIDOffline.svg
new file mode 100644
--- /dev/null
+++ b/web/org.openbravo.mobile.core/assets/img/iconRFIDOffline.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="OBSVG" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 320 330" style="enable-background:new 0 0 320 330;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#000000;}
+</style>
+<rect class="st0" width="320" height="330"/>
+<path class="st1" d="M80,26.7c-49.6,28.8-80,81.4-80,139c0,56,30.5,108.7,78.5,137.5l16-27C56.1,252.2,32,210.5,32,165.7
+	c0-46.4,24-88.1,64-110.5L80,26.7z M112,82.7c-28.8,17.6-48,49.4-48,83s17.7,63.9,46.5,81.5l16-27C107.3,209,96,188.1,96,165.7
+	s12.8-43.2,32-56L112,82.7z M160,133.7c-17.7,0-32,14.3-32,32s14.3,32,32,32s32-14.3,32-32S177.7,133.7,160,133.7z"/>
+<rect x="192.4" y="64.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 23.0093 207.9068)" class="st1" width="140.2" height="22.5"/>
+<rect x="251.2" y="6.1" transform="matrix(0.7071 -0.7071 0.7071 0.7071 23.0059 207.9151)" class="st1" width="22.5" height="140.2"/>
+</svg>
diff --git a/web/org.openbravo.mobile.core/assets/img/iconSwitchOFF.svg b/web/org.openbravo.mobile.core/assets/img/iconSwitchOFF.svg
new file mode 100644
--- /dev/null
+++ b/web/org.openbravo.mobile.core/assets/img/iconSwitchOFF.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="OBSVG" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 373.7 140.9" style="enable-background:new 0 0 373.7 140.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FF0000;}
+	.st1{fill:#E2E2E2;}
+	.st2{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M373.7,70.4c0,38.9-31.5,70.5-70.5,70.5H70.5C31.5,140.9,0,109.4,0,70.4C0,31.5,31.5,0,70.5,0h232.8
+	C342.2,0,373.7,31.5,373.7,70.4z"/>
+<path class="st1" d="M156,70.4c0,31.9-25.9,57.8-57.8,57.8H72.4c-31.9,0-57.8-25.9-57.8-57.8c0-31.9,25.9-57.8,57.8-57.8h25.8
+	C130.1,12.7,156,38.5,156,70.4z"/>
+<path class="st2" d="M180.9,70.5c0-5.5,0.8-10.1,2.5-13.8c1.2-2.7,2.9-5.2,5-7.4c2.1-2.2,4.4-3.8,6.9-4.8c3.3-1.4,7.2-2.1,11.6-2.1
+	c7.9,0,14.3,2.5,19,7.4c4.8,4.9,7.1,11.7,7.1,20.5c0,8.7-2.4,15.5-7.1,20.4c-4.7,4.9-11,7.4-18.9,7.4c-8,0-14.3-2.4-19.1-7.3
+	C183.3,85.8,180.9,79,180.9,70.5z M192.1,70.1c0,6.1,1.4,10.7,4.2,13.8s6.4,4.7,10.7,4.7s7.9-1.6,10.7-4.7c2.8-3.1,4.2-7.8,4.2-14
+	c0-6.2-1.4-10.8-4.1-13.8c-2.7-3-6.3-4.5-10.8-4.5s-8.1,1.5-10.8,4.6C193.5,59.3,192.1,63.9,192.1,70.1z"/>
+<path class="st2" d="M245.6,97V43.3h36.8v9.1h-26v12.7h22.4v9.1h-22.4V97H245.6z"/>
+<path class="st2" d="M295.5,97V43.3h36.8v9.1h-26v12.7h22.4v9.1h-22.4V97H295.5z"/>
+</svg>
diff --git a/web/org.openbravo.mobile.core/assets/img/iconSwitchON.svg b/web/org.openbravo.mobile.core/assets/img/iconSwitchON.svg
new file mode 100644
--- /dev/null
+++ b/web/org.openbravo.mobile.core/assets/img/iconSwitchON.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="OBSVG" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 373.7 140.9" style="enable-background:new 0 0 373.7 140.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#6CB23F;}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:#E2E2E2;}
+</style>
+<path class="st0" d="M373.7,70.4c0,38.9-31.5,70.5-70.5,70.5H70.5c-39,0-70.5-31.5-70.5-70.5C0,31.5,31.5,0,70.5,0h232.8
+	C342.2,0,373.7,31.5,373.7,70.4z"/>
+<path class="st1" d="M56.4,70.5c0-5.5,0.8-10.1,2.5-13.8c1.2-2.7,2.9-5.2,5-7.4s4.4-3.8,6.9-4.8c3.3-1.4,7.2-2.1,11.6-2.1
+	c7.9,0,14.3,2.5,19,7.4c4.8,4.9,7.1,11.7,7.1,20.5c0,8.7-2.4,15.5-7.1,20.4c-4.7,4.9-11,7.4-18.9,7.4c-8,0-14.3-2.4-19.1-7.3
+	C58.8,85.8,56.4,79,56.4,70.5z M67.6,70.1c0,6.1,1.4,10.7,4.2,13.8s6.4,4.7,10.7,4.7s7.9-1.6,10.7-4.7s4.2-7.8,4.2-14
+	S96,59.1,93.3,56.1c-2.7-3-6.3-4.5-10.8-4.5s-8.1,1.5-10.8,4.6C69,59.3,67.6,63.9,67.6,70.1z"/>
+<path class="st2" d="M359.1,70.5c0,31.9-25.9,57.8-57.8,57.8h-25.8c-31.9,0-57.8-25.9-57.8-57.8s25.9-57.8,57.8-57.8h25.8
+	C333.2,12.8,359.1,38.6,359.1,70.5z"/>
+<path class="st1" d="M121.6,98.2V43.4h10.8L154.8,80V43.4h10.3v54.8H154l-22.1-35.7v35.7H121.6z"/>
+</svg>
diff --git a/web/org.openbravo.mobile.core/assets/img/iconSwitchOffline.svg b/web/org.openbravo.mobile.core/assets/img/iconSwitchOffline.svg
new file mode 100644
--- /dev/null
+++ b/web/org.openbravo.mobile.core/assets/img/iconSwitchOffline.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="OBSVG" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 373.7 140.9" style="enable-background:new 0 0 373.7 140.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#A9A9A9;}
+	.st1{fill:#E2E2E2;}
+	.st2{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M373.7,70.4c0,38.9-31.5,70.5-70.5,70.5H70.5c-39,0-70.5-31.5-70.5-70.5C0,31.5,31.5,0,70.5,0h232.8
+	C342.2,0,373.7,31.5,373.7,70.4z"/>
+<path class="st1" d="M156,70.4c0,31.9-25.9,57.8-57.8,57.8H72.4c-31.9,0-57.8-25.9-57.8-57.8s25.9-57.8,57.8-57.8h25.8
+	C130.1,12.7,156,38.5,156,70.4z"/>
+<rect x="224.1" y="64.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 25.6255 202.1616)" class="st2" width="65.4" height="10.5"/>
+<rect x="251.6" y="37.4" transform="matrix(0.7071 -0.7071 0.7071 0.7071 25.6239 202.1655)" class="st2" width="10.5" height="65.4"/>
+</svg>
diff --git a/web/org.openbravo.mobile.core/assets/img/inspectTree.svg b/web/org.openbravo.mobile.core/assets/img/inspectTree.svg
new file mode 100644
--- /dev/null
+++ b/web/org.openbravo.mobile.core/assets/img/inspectTree.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="OBSVG" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 322 372.9" style="enable-background:new 0 0 322 373;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#6CB23F;}
+</style>
+<polygon class="st0" points="322,186.4 0,0 0,373 "/>
+</svg>
diff --git a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-filterbuilder.js b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-filterbuilder.js
--- a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-filterbuilder.js
+++ b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-filterbuilder.js
@@ -265,11 +265,11 @@
         renderEmpty: 'enyo.Control',
         renderLine: 'OB.UI.ModalSearchFilterBuilderRow'
       }, {
-        kind: 'Image',
-        src: '../org.openbravo.mobile.core/assets/img/iconAdd.png',
+        classes: 'btn-icon-add',
         sizing: "cover",
         width: 42,
         height: 42,
+        style: 'width: 42px; height: 42px;',
         tap: function () {
           this.owner.owner.addFilterRow('MORE_THAN', '');
         }