diff --git a/xwords4/android/app/src/main/res/drawable/ic_trade.xml b/xwords4/android/app/src/main/res/drawable/ic_trade.xml
new file mode 100644
index 000000000..91fc21071
--- /dev/null
+++ b/xwords4/android/app/src/main/res/drawable/ic_trade.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="53.834dp"
+    android:height="53.58325dp"
+    android:viewportWidth="53.834"
+    android:viewportHeight="53.58325">
+  <path
+      android:pathData="M7.978,23.4768L7.978,16.0657L42.8314,16.0657l-4.8459,4.9014c-0.7536,0.7623 -0.7536,1.998 0,2.7594 0.3764,0.3807 0.8702,0.5715 1.3641,0.5715 0.4939,0 0.9868,-0.1908 1.3641,-0.5715l8.14,-8.2323c0.012,-0.0121 0.0197,-0.0269 0.0317,-0.0382 0.0746,-0.0798 0.1458,-0.1639 0.2066,-0.2558 0.0206,-0.0312 0.0343,-0.0668 0.054,-0.0997 0.0446,-0.0763 0.0892,-0.1526 0.1243,-0.235 0.0171,-0.0408 0.024,-0.0841 0.0386,-0.1249 0.0266,-0.0789 0.0549,-0.157 0.072,-0.2393 0.0249,-0.1257 0.0386,-0.255 0.0386,-0.3859 0,-0.1309 -0.0137,-0.2602 -0.0386,-0.3859 -0.0171,-0.0841 -0.0463,-0.1622 -0.0729,-0.2411 -0.0137,-0.0408 -0.0206,-0.0833 -0.0377,-0.1231 -0.0352,-0.0867 -0.0832,-0.1665 -0.1295,-0.2463 -0.0171,-0.0295 -0.0283,-0.0607 -0.048,-0.0893 -0.0703,-0.1067 -0.1509,-0.2055 -0.2392,-0.2948L40.7162,4.5042c-0.7536,-0.7623 -1.9745,-0.7623 -2.7282,0 -0.7536,0.7614 -0.7536,1.9972 0,2.7594l4.8451,4.9005L6.0489,12.1642c-1.0649,0 -1.9291,0.8733 -1.9291,1.9512v9.3623c0,1.0779 0.8642,1.9512 1.9291,1.9512 1.0649,0 1.9291,-0.8741 1.9291,-1.9521zM48.3469,28.9037c-1.0649,0 -1.9291,0.8733 -1.9291,1.9512L46.4178,38.2659L11.5644,38.2659l4.8459,-4.9014c0.7536,-0.7623 0.7536,-1.998 0,-2.7594 -0.7536,-0.7623 -1.9745,-0.7614 -2.7282,0l-8.14,8.2323c-0.012,0.0113 -0.0189,0.026 -0.03,0.0373 -0.0754,0.0798 -0.1475,0.1639 -0.2083,0.2567 -0.0197,0.0303 -0.0326,0.0642 -0.0514,0.0954 -0.0463,0.078 -0.0917,0.1552 -0.126,0.2393 -0.0171,0.0399 -0.024,0.0824 -0.0377,0.1223 -0.0266,0.0798 -0.0557,0.1587 -0.0729,0.242 -0.0249,0.1266 -0.0386,0.255 -0.0386,0.3859 0,0.1309 0.0137,0.2593 0.0386,0.3859 0.0171,0.0841 0.0463,0.1639 0.0729,0.2437 0.0137,0.0399 0.0214,0.0815 0.0377,0.1205 0.036,0.0884 0.084,0.1691 0.1312,0.2506 0.0171,0.0278 0.0283,0.0581 0.0463,0.085 0.0703,0.1067 0.15,0.2055 0.2392,0.2957l8.1374,8.2306c0.3764,0.3807 0.8702,0.5715 1.3641,0.5715 0.4939,0 0.9868,-0.1908 1.3641,-0.5715 0.7536,-0.7614 0.7536,-1.9972 0,-2.7594l-4.8451,-4.9005h36.7833c1.0649,0 1.9291,-0.8733 1.9291,-1.9512v-9.3623c0,-1.0779 -0.8642,-1.9512 -1.9291,-1.9512z"
+      android:strokeWidth="0.86227459"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/xwords4/android/app/src/main/res/menu/board_menu.xml b/xwords4/android/app/src/main/res/menu/board_menu.xml
index 262c8a65f..69d592d39 100644
--- a/xwords4/android/app/src/main/res/menu/board_menu.xml
+++ b/xwords4/android/app/src/main/res/menu/board_menu.xml
@@ -25,7 +25,7 @@
           android:title="@string/board_menu_trade"
           android:alphabeticShortcut="T"
           android:showAsAction="ifRoom"
-          android:icon="@drawable/trade__gen"
+          android:icon="@drawable/ic_trade"
           />
   </group>
 
diff --git a/xwords4/android/img_src/trade.svg b/xwords4/android/img_src/trade.svg
index 7d1752d97..0a017290b 100644
--- a/xwords4/android/img_src/trade.svg
+++ b/xwords4/android/img_src/trade.svg
@@ -14,13 +14,13 @@
    enable-background="new 0 0 100 100"
    xml:space="preserve"
    id="svg3590"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="trade.svg"
    width="53.834"
    height="53.583248"><metadata
      id="metadata3602"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs3600" /><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -30,8 +30,8 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1016"
+     inkscape:window-width="1655"
+     inkscape:window-height="923"
      id="namedview3598"
      showgrid="false"
      fit-margin-top="0"
@@ -39,12 +39,13 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:zoom="5.3400704"
-     inkscape:cx="46.514458"
+     inkscape:cx="-25.769234"
      inkscape:cy="14.292"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
+     inkscape:window-x="45"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0"
      inkscape:current-layer="svg3590" /><path
-     d="m 4.5,22.53725 0,-8.546 40.651,0 -5.652,5.652 c -0.879,0.879 -0.879,2.304 0,3.182 0.439,0.439 1.015,0.659 1.591,0.659 0.576,0 1.151,-0.22 1.591,-0.659 l 9.494,-9.493 c 0.014,-0.014 0.023,-0.031 0.037,-0.044 0.087,-0.092 0.17,-0.189 0.241,-0.295 0.024,-0.036 0.04,-0.077 0.063,-0.115 0.052,-0.088 0.104,-0.176 0.145,-0.271 0.02,-0.047 0.028,-0.097 0.045,-0.144 0.031,-0.091 0.064,-0.181 0.084,-0.276 0.029,-0.145 0.045,-0.294 0.045,-0.445 0,-0.151 -0.016,-0.3 -0.045,-0.445 -0.02,-0.097 -0.054,-0.187 -0.085,-0.278 -0.016,-0.047 -0.024,-0.096 -0.044,-0.142 -0.041,-0.1 -0.097,-0.192 -0.151,-0.284 -0.02,-0.034 -0.033,-0.07 -0.056,-0.103 -0.082,-0.123 -0.176,-0.237 -0.279,-0.34 l -9.491,-9.491 c -0.879,-0.879 -2.303,-0.879 -3.182,0 -0.879,0.878 -0.879,2.303 0,3.182 l 5.651,5.651 -42.903,0 c -1.242,0 -2.25,1.007 -2.25,2.25 l 0,10.796 c 0,1.243 1.008,2.25 2.25,2.25 1.242,0 2.25,-1.008 2.25,-2.251 z m 47.084,6.258 c -1.242,0 -2.25,1.007 -2.25,2.25 l 0,8.546 -40.651,0 5.652,-5.652 c 0.879,-0.879 0.879,-2.304 0,-3.182 -0.879,-0.879 -2.303,-0.878 -3.182,0 l -9.494,9.493 c -0.014,0.013 -0.022,0.03 -0.035,0.043 -0.088,0.092 -0.172,0.189 -0.243,0.296 -0.023,0.035 -0.038,0.074 -0.06,0.11 -0.054,0.09 -0.107,0.179 -0.147,0.276 -0.02,0.046 -0.028,0.095 -0.044,0.141 -0.031,0.092 -0.065,0.183 -0.085,0.279 -0.029,0.146 -0.045,0.294 -0.045,0.445 0,0.151 0.016,0.299 0.045,0.445 0.02,0.097 0.054,0.189 0.085,0.281 0.016,0.046 0.025,0.094 0.044,0.139 0.042,0.102 0.098,0.195 0.153,0.289 0.02,0.032 0.033,0.067 0.054,0.098 0.082,0.123 0.175,0.237 0.279,0.341 l 9.491,9.491 c 0.439,0.439 1.015,0.659 1.591,0.659 0.576,0 1.151,-0.22 1.591,-0.659 0.879,-0.878 0.879,-2.303 0,-3.182 l -5.651,-5.651 42.902,0 c 1.242,0 2.25,-1.007 2.25,-2.25 l 0,-10.796 c 0,-1.243 -1.008,-2.25 -2.25,-2.25 z"
+     d="M 7.9780061,23.47677 V 16.065704 H 42.831364 l -4.845914,4.901398 c -0.753635,0.762266 -0.753635,1.998022 0,2.759421 0.376391,0.3807 0.870242,0.571483 1.364093,0.571483 0.493851,0 0.986845,-0.190783 1.364092,-0.571483 l 8.139967,-8.232302 c 0.012,-0.01214 0.01972,-0.02689 0.03172,-0.03816 0.0746,-0.07978 0.145755,-0.1639 0.206629,-0.255823 0.02058,-0.03122 0.0343,-0.06677 0.05402,-0.09973 0.04458,-0.07631 0.08917,-0.152627 0.124321,-0.235011 0.01715,-0.04076 0.024,-0.08412 0.03857,-0.124876 0.02658,-0.07891 0.05488,-0.156963 0.07202,-0.239347 0.02486,-0.125743 0.03857,-0.254956 0.03857,-0.385903 0,-0.130946 -0.01372,-0.260159 -0.03857,-0.385902 -0.01715,-0.08412 -0.0463,-0.162166 -0.07288,-0.241081 -0.01372,-0.04076 -0.02058,-0.08326 -0.03773,-0.123142 -0.03516,-0.08672 -0.08316,-0.166502 -0.129465,-0.246284 -0.01715,-0.02948 -0.0283,-0.0607 -0.04802,-0.08932 -0.0703,-0.106665 -0.150899,-0.205526 -0.239209,-0.294847 L 40.716207,4.5042322 c -0.753637,-0.7622664 -1.974546,-0.7622664 -2.728184,0 -0.753637,0.761399 -0.753637,1.9971548 0,2.7594211 l 4.845054,4.9005307 H 6.048901 c -1.064866,0 -1.9291052,0.873267 -1.9291052,1.951194 v 9.36226 c 0,1.077926 0.8642392,1.951193 1.9291052,1.951193 1.064866,0 1.9291051,-0.874135 1.9291051,-1.952061 z m 40.3688829,5.42692 c -1.064866,0 -1.929105,0.873267 -1.929105,1.951193 V 38.26595 H 11.564427 l 4.845912,-4.901399 c 0.753637,-0.762266 0.753637,-1.998022 0,-2.75942 -0.753636,-0.762267 -1.974547,-0.7614 -2.728182,0 l -8.1399677,8.232301 c -0.012004,0.01128 -0.018862,0.02602 -0.030008,0.03729 -0.075449,0.07978 -0.1474694,0.1639 -0.2083434,0.256691 -0.01972,0.03035 -0.032581,0.06417 -0.051444,0.09539 -0.046298,0.07804 -0.091739,0.155228 -0.1260349,0.239346 -0.017148,0.03989 -0.024006,0.08239 -0.037725,0.122275 -0.026578,0.07979 -0.055729,0.1587 -0.072877,0.241951 -0.024864,0.126609 -0.038582,0.254954 -0.038582,0.385901 0,0.130946 0.013717,0.259291 0.038582,0.385902 0.017148,0.08412 0.046298,0.1639 0.072877,0.243683 0.013717,0.03989 0.021434,0.08152 0.037725,0.12054 0.03601,0.08845 0.084023,0.169104 0.1311792,0.25062 0.017148,0.02775 0.028294,0.0581 0.046298,0.08499 0.070305,0.106665 0.1500415,0.205525 0.2392091,0.295713 l 8.1373947,8.230569 c 0.376389,0.380699 0.870239,0.571482 1.36409,0.571482 0.493852,0 0.986844,-0.190783 1.364092,-0.571482 0.753638,-0.7614 0.753638,-1.997156 0,-2.759422 l -4.845054,-4.900534 h 36.783319 c 1.064866,0 1.929105,-0.873268 1.929105,-1.951194 v -9.36226 c 0,-1.077926 -0.864239,-1.951193 -1.929103,-1.951193 z"
      id="path3592"
-     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
+     inkscape:connector-curvature="0"
+     style="stroke-width:0.86227459;fill:#ffffff" /></svg>
\ No newline at end of file
diff --git a/xwords4/android/img_src/untrade.svg b/xwords4/android/img_src/untrade.svg
index c4d051c1f..1944937de 100644
--- a/xwords4/android/img_src/untrade.svg
+++ b/xwords4/android/img_src/untrade.svg
@@ -10,17 +10,17 @@
    version="1.1"
    x="0px"
    y="0px"
-   viewBox="0 0 70 70"
+   viewBox="0 0 50 50"
    enable-background="new 0 0 100 100"
    xml:space="preserve"
    id="svg3590"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="untrade.svg"
-   width="70"
-   height="70"><metadata
+   width="50"
+   height="50"><metadata
      id="metadata3602"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs3600" /><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -30,8 +30,8 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1163"
+     inkscape:window-width="1312"
+     inkscape:window-height="898"
      id="namedview3598"
      showgrid="false"
      fit-margin-top="0"
@@ -39,21 +39,23 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:zoom="5.3400704"
-     inkscape:cx="-12.866321"
-     inkscape:cy="22.385961"
-     inkscape:window-x="1920"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
+     inkscape:cx="25.433316"
+     inkscape:cy="10.403976"
+     inkscape:window-x="45"
+     inkscape:window-y="72"
+     inkscape:window-maximized="0"
      inkscape:current-layer="svg3590" /><path
-     d="m 12.159535,30.485512 0,-8.546 40.651,0 -5.652,5.652 c -0.879,0.879 -0.879,2.304 0,3.182 0.439,0.439 1.015,0.659 1.591,0.659 0.576,0 1.151,-0.22 1.591,-0.659 l 9.494,-9.493 c 0.014,-0.014 0.023,-0.031 0.037,-0.044 0.087,-0.092 0.17,-0.189 0.241,-0.295 0.024,-0.036 0.04,-0.077 0.063,-0.115 0.052,-0.088 0.104,-0.176 0.145,-0.271 0.02,-0.047 0.028,-0.097 0.045,-0.144 0.031,-0.091 0.064,-0.181 0.084,-0.276 0.029,-0.145 0.045,-0.294 0.045,-0.445 0,-0.151 -0.016,-0.3 -0.045,-0.445 -0.02,-0.097 -0.054,-0.187 -0.085,-0.278 -0.016,-0.047 -0.024,-0.096 -0.044,-0.142 -0.041,-0.1 -0.097,-0.192 -0.151,-0.284 -0.02,-0.034 -0.033,-0.07 -0.056,-0.103 -0.082,-0.123 -0.176,-0.237 -0.279,-0.34 l -9.491,-9.4909998 c -0.879,-0.879 -2.303,-0.879 -3.182,0 -0.879,0.878 -0.879,2.3029998 0,3.1819998 l 5.651,5.651 -42.9029996,0 c -1.242,0 -2.25,1.007 -2.25,2.25 l 0,10.796 c 0,1.243 1.008,2.25 2.25,2.25 1.2419996,0 2.2499996,-1.008 2.2499996,-2.251 z m 47.084,6.258 c -1.242,0 -2.25,1.007 -2.25,2.25 l 0,8.546 -40.651,0 5.652,-5.652 c 0.879,-0.879 0.879,-2.304 0,-3.182 -0.879,-0.879 -2.303,-0.878 -3.182,0 l -9.4939996,9.493 c -0.014,0.013 -0.022,0.03 -0.035,0.043 -0.088,0.092 -0.172,0.189 -0.243,0.296 -0.023,0.035 -0.038,0.074 -0.06,0.11 -0.054,0.09 -0.107,0.179 -0.147,0.276 -0.02,0.046 -0.028,0.095 -0.044,0.141 -0.031,0.092 -0.065,0.183 -0.085,0.279 -0.029,0.146 -0.045,0.294 -0.045,0.445 0,0.151 0.016,0.299 0.045,0.445 0.02,0.097 0.054,0.189 0.085,0.281 0.016,0.046 0.025,0.094 0.044,0.139 0.042,0.102 0.098,0.195 0.153,0.289 0.02,0.032 0.033,0.067 0.054,0.098 0.082,0.123 0.175,0.237 0.279,0.341 l 9.4909996,9.491 c 0.439,0.439 1.015,0.659 1.591,0.659 0.576,0 1.151,-0.22 1.591,-0.659 0.879,-0.878 0.879,-2.303 0,-3.182 l -5.651,-5.651 42.902,0 c 1.242,0 2.25,-1.007 2.25,-2.25 l 0,-10.796 c 0,-1.243 -1.008,-2.25 -2.25,-2.25 z"
+     d="m 11.535853,22.257005 v -5.19253 h 24.12986 l -3.354947,3.434144 c -0.521762,0.534078 -0.521762,1.399905 0,1.933376 0.260585,0.266735 0.60249,0.400406 0.944395,0.400406 0.341906,0 0.683218,-0.133671 0.944395,-0.400406 l 5.635505,-5.767928 c 0.0083,-0.0085 0.01365,-0.01884 0.02197,-0.02673 0.05164,-0.0559 0.100909,-0.114835 0.143053,-0.179241 0.01424,-0.02188 0.02374,-0.04678 0.03739,-0.06987 0.03087,-0.05347 0.06174,-0.106938 0.08607,-0.164659 0.01187,-0.02855 0.01662,-0.05894 0.02672,-0.08749 0.0184,-0.05529 0.03799,-0.109975 0.04987,-0.167696 0.01721,-0.0881 0.02672,-0.178634 0.02672,-0.270382 0,-0.09175 -0.0095,-0.182279 -0.02672,-0.27038 -0.01187,-0.05894 -0.03205,-0.113621 -0.05046,-0.168913 -0.0095,-0.02855 -0.01424,-0.05833 -0.02612,-0.08628 -0.02434,-0.06076 -0.05757,-0.116658 -0.08963,-0.172557 -0.01187,-0.02067 -0.01958,-0.04253 -0.03324,-0.06258 -0.04867,-0.07473 -0.104472,-0.144001 -0.165612,-0.206583 l -5.63372,-5.7667179 c -0.521762,-0.5340784 -1.367028,-0.5340784 -1.888789,0 -0.521763,0.5334723 -0.521763,1.3992979 0,1.9333769 l 3.354351,3.433527 H 10.200286 c -0.7372342,0 -1.3355686,0.611851 -1.3355686,1.367096 v 6.559626 c 0,0.755245 0.5983344,1.367096 1.3355686,1.367096 0.737233,0 1.335567,-0.612459 1.335567,-1.367705 z m 27.948398,3.802348 c -0.737232,0 -1.335568,0.611852 -1.335568,1.367096 v 5.192533 h -24.12986 l 3.354948,-3.434145 c 0.521762,-0.534077 0.521762,-1.399905 0,-1.933376 -0.521763,-0.534078 -1.367028,-0.533471 -1.888791,0 l -5.6355037,5.767927 c -0.00832,0.0079 -0.013058,0.01824 -0.020776,0.02612 -0.052236,0.0559 -0.1020966,0.114837 -0.1442412,0.17985 -0.013652,0.02127 -0.022557,0.04496 -0.035615,0.06685 -0.032054,0.05469 -0.063514,0.108759 -0.087257,0.167696 -0.011872,0.02795 -0.016621,0.05773 -0.026118,0.08567 -0.018402,0.05591 -0.038583,0.111191 -0.050456,0.16952 -0.017214,0.08871 -0.026712,0.178634 -0.026712,0.270381 0,0.09175 0.0095,0.181672 0.026712,0.270381 0.011872,0.05894 0.032054,0.114837 0.050456,0.170734 0.0095,0.02796 0.014839,0.05712 0.026118,0.08446 0.024931,0.06198 0.058172,0.11848 0.090819,0.175596 0.011872,0.01944 0.019589,0.04071 0.032054,0.05954 0.048675,0.07473 0.1038775,0.144 0.1656105,0.207191 l 5.6337244,5.766712 c 0.260584,0.266735 0.602488,0.400407 0.944393,0.400407 0.341906,0 0.683217,-0.133672 0.944397,-0.400407 0.521761,-0.533471 0.521761,-1.399299 0,-1.933378 L 14.01823,35.353174 h 25.466021 c 0.737234,0 1.335568,-0.611851 1.335568,-1.367095 v -6.559628 c 0,-0.755244 -0.598334,-1.367096 -1.335568,-1.367096 z"
      id="path3592"
-     inkscape:connector-curvature="0" /><circle
-     style="fill:none;stroke:#000000;stroke-width:3.17759514;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0"
+     style="stroke-width:0.60055107" /><ellipse
+     style="fill:none;stroke:#000000;stroke-width:1.90830779;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path4159"
-     cx="35"
-     cy="35"
-     r="33.411201" /><path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.00030446;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 13.380987,12.086444 44.81032,48.282085"
+     cx="25.093632"
+     cy="25"
+     rx="19.832418"
+     ry="20.300577" /><path
+     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.80183601;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 12.26089,11.077771 38.859664,40.413865"
      id="path4171"
      inkscape:connector-curvature="0" /></svg>
\ No newline at end of file