diff --git a/.idea/misc.xml b/.idea/misc.xml
index 70f2c08ad..55d7f7942 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,12 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="src/main/res/drawable/ic_activity_bike_24dp.xml" value="0.1765" />
+        <entry key="src/main/res/drawable/ic_activity_sailing_24dp.xml" value="0.1935" />
+        <entry key="src/main/res/drawable/ic_activity_snowboarding_24dp.xml" value="0.1935" />
+        <entry key="src/main/res/drawable/ic_activity_swimming_24dp.xml" value="0.1935" />
+        <entry key="src/main/res/drawable/ic_activity_swimming_open_24dp.xml" value="0.1935" />
+        <entry key="src/main/res/drawable/ic_activity_workout_24dp.xml" value="0.1935" />
         <entry key="src/main/res/menu/aggregated_statistics.xml" value="0.10208333333333333" />
         <entry key="src/main/res/xml/settings_gps.xml" value="0.22604166666666667" />
         <entry key="src/main/res/xml/settings_sensors.xml" value="0.2101851851851852" />
diff --git a/drawable-svg/ic_activity_swimming.svg b/drawable-svg/ic_activity_swimming.svg
new file mode 100644
index 000000000..a9f6e8a0a
--- /dev/null
+++ b/drawable-svg/ic_activity_swimming.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="22"
+   width="22"
+   fill="#000000"
+   version="1.0"
+   x="0px"
+   y="0px"
+   viewBox="0 0 21.84952 21.99934"
+   enable-background="new 0 0 99.316 99.997"
+   xml:space="preserve"
+   id="svg10"
+   sodipodi:docname="ic_activity_swimming.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
+   inkscape:export-filename="/home/peter/StudioProjects/OpenTracks/drawable-svg/ic_activity_swimming.png"
+   inkscape:export-xdpi="1309.09"
+   inkscape:export-ydpi="1309.09"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata16"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs14" /><sodipodi:namedview
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1831"
+     inkscape:window-height="1039"
+     id="namedview12"
+     showgrid="false"
+     inkscape:pagecheckerboard="false"
+     inkscape:zoom="31.780381"
+     inkscape:cx="10.368032"
+     inkscape:cy="10.069105"
+     inkscape:window-x="33"
+     inkscape:window-y="3"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg10"
+     inkscape:document-rotation="0" /><path
+     id="path2"
+     style="fill:#ffffff;stroke-width:0.20758"
+     d="m 18.327285,15.516652 c -1.017125,-0.01824 -1.903328,0.770666 -2.945647,0.500454 -0.952298,-0.271819 -1.950516,-0.765534 -2.949277,-0.338881 -0.938402,0.492101 -2.078868,0.493759 -3.0170251,0 C 8.4157577,15.251421 7.4164572,15.744755 6.4634103,16.017106 5.261142,16.31195 4.2317908,15.256338 3.0296629,15.558611 2.2388959,15.806745 1.0534821,16.11293 1.0534821,16.11293 v 1.764949 c 1.0226762,0.01947 1.9128198,-0.776355 2.9601398,-0.498166 1.4912769,0.589492 1.7842151,0.623743 2.7777974,0.375279 0.9553792,-0.44042 2.0942104,-0.606317 3.0559286,-0.07975 0.9566571,0.429062 1.9815791,0.09313 2.8934291,-0.263824 1.038124,-0.339466 1.95525,0.382078 2.955963,0.461915 1.087184,0.105691 2.019821,-0.784126 3.121615,-0.493622 0.55673,-0.01509 1.943197,1.034046 1.977683,0.148315 v -1.471252 c -0.878739,0.05089 -1.592095,-0.588897 -2.468753,-0.540124 z"
+     sodipodi:nodetypes="scccccccccccccccss" /><path
+     id="path2-1"
+     style="fill:#ffffff;stroke-width:0.20758"
+     d="m 18.327285,12.592022 c -1.017125,-0.01824 -1.903328,0.770666 -2.945647,0.500454 -0.952298,-0.271819 -1.950516,-0.765534 -2.949277,-0.338881 -0.938402,0.492101 -2.078868,0.493759 -3.0170249,0 C 8.4157578,12.326791 7.4164573,12.820125 6.4634104,13.092476 5.2611421,13.38732 4.2317909,12.331708 3.029663,12.633981 2.238896,12.882115 1.0534822,13.1883 1.0534822,13.1883 v 1.764949 c 1.0226762,0.01947 1.9128198,-0.776355 2.9601398,-0.498166 1.4912769,0.589492 1.7842151,0.623743 2.7777974,0.375279 0.9553792,-0.44042 2.0942104,-0.606317 3.0559286,-0.07975 0.956657,0.429062 1.981579,0.09313 2.893429,-0.263824 1.038124,-0.339466 1.95525,0.382078 2.955963,0.461915 1.087184,0.105691 2.019821,-0.784126 3.121615,-0.493622 0.55673,-0.01509 1.943197,1.034046 1.977683,0.148315 v -1.471252 c -0.878739,0.05089 -1.592095,-0.588897 -2.468753,-0.540124 z"
+     sodipodi:nodetypes="scccccccccccccccss" /><path
+     id="path851"
+     style="fill:#ffffff;stroke-width:1.16861"
+     d="m 15.771645,8.3604958 c 0.05505,1.1807818 -1.406378,2.0132882 -2.394197,1.3656158 -1.044532,-0.5537235 -1.017922,-2.2353035 0.04332,-2.7559408 1.018447,-0.5919723 2.378758,0.20782 2.350877,1.390325 z" /><path
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.18448px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 4.3145569,12.014368 9.3210561,8.9478742 6.786081,6.2628496 11.908511,3.5970428 c 0.936726,-0.3746046 1.601464,0.5528762 1.096915,1.1662478 L 9.4152098,6.6598661 15.504839,12.51419 c -1.334475,-0.390685 -1.595745,-1.008768 -2.663055,-0.656789 -2.818488,0.929488 -2.219707,0.0047 -4.240291,0.02086 -2.2836952,0.01821 -1.8989609,1.154049 -4.2869361,0.136107 z"
+     id="path2791"
+     sodipodi:nodetypes="cccccccssc" /></svg>
diff --git a/drawable-svg/ic_activity_swimming_open.svg b/drawable-svg/ic_activity_swimming_open.svg
new file mode 100644
index 000000000..ce9e2a009
--- /dev/null
+++ b/drawable-svg/ic_activity_swimming_open.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="22"
+   width="22"
+   fill="#000000"
+   version="1.0"
+   x="0px"
+   y="0px"
+   viewBox="0 0 21.84952 21.99934"
+   enable-background="new 0 0 99.316 99.997"
+   xml:space="preserve"
+   id="svg10"
+   sodipodi:docname="ic_activity_swimming_open.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
+   inkscape:export-filename="/home/peter/StudioProjects/OpenTracks/drawable-svg/ic_activity_swimming_open.png"
+   inkscape:export-xdpi="1309.09"
+   inkscape:export-ydpi="1309.09"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata16"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs14" /><sodipodi:namedview
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1047"
+     id="namedview12"
+     showgrid="false"
+     inkscape:pagecheckerboard="false"
+     inkscape:zoom="15.890191"
+     inkscape:cx="10.006173"
+     inkscape:cy="13.719156"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10"
+     inkscape:document-rotation="0" /><path
+     id="path2"
+     style="fill:#ffffff;stroke-width:0.150857"
+     d="m 2.8183594,17.572266 c -0.1057708,4.65e-4 -0.2130618,0.01356 -0.3222656,0.04102 -0.5746803,0.180329 -1.4355469,0.402344 -1.4355469,0.402344 v 1.28125 c 0.7432174,0.01415 1.3912167,-0.563498 2.1523437,-0.361328 1.0837672,0.428407 1.295504,0.454005 2.0175782,0.273437 0.6943098,-0.32007 1.5217861,-0.441266 2.2207031,-0.05859 0.6952388,0.311815 1.4408397,0.06801 2.1035156,-0.191407 0.7544435,-0.246702 1.4211805,0.277917 2.1484375,0.335938 0.621051,-0.0088 1.351954,-0.399393 1.818402,-0.396552 0.536698,0.02254 1.051376,0.234242 1.498081,0.382763 0.357762,0.07663 0.717881,0.02104 0.970698,-0.07223 0.717277,-0.264623 1.521787,-0.441266 2.220704,-0.05859 0.695237,0.311815 1.440839,0.06801 2.103515,-0.191407 0.229629,-0.07509 0.450663,-0.07784 0.667969,-0.04492 v -1.314453 c -0.295925,-0.04096 -0.594072,-0.02791 -0.892578,0.09961 -0.681973,0.357628 -1.511565,0.358833 -2.19336,0 -0.726431,-0.310175 -1.451915,0.04817 -2.144531,0.246093 -0.116646,0.02861 -0.230986,0.0388 -0.34375,0.03711 v -0.0078 c -0.304634,0.02335 -0.610512,-0.122847 -0.878909,-0.189453 -1.061726,-0.598921 -2.285933,0.148857 -3.056646,0.16011 -0.510364,-0.111475 -1.41674,-0.556159 -2.1425779,-0.246093 -0.6819724,0.357628 -1.5115649,0.358833 -2.1933593,0 C 6.410287,17.389044 5.6848033,17.747388 4.9921875,17.945312 4.2276707,18.132803 3.558755,17.569011 2.8183594,17.572266 Z"
+     transform="matrix(0.99997,0,0,0.99997,-0.07491,0)"
+     sodipodi:nodetypes="sccccccccccsccccccccccccccs" /><path
+     id="path2-1-1"
+     style="fill:#ffffff;stroke-width:0.150857"
+     d="m 10.229667,15.445213 c -0.2340521,-0.01177 -0.6643302,0.02851 -0.8995889,0.129006 -0.6819724,0.357628 -1.5115649,0.358834 -2.1933593,0 C 6.410287,15.264044 5.6848033,15.622386 4.9921875,15.820312 4.1184541,16.034604 3.3697256,15.266655 2.4960938,15.486328 1.9214135,15.666657 1.0605469,15.890625 1.0605469,15.890625 v 1.28125 c 0.7432175,0.01415 1.3912167,-0.563498 2.1523437,-0.361328 1.0837672,0.428406 1.2955041,0.454006 2.0175782,0.273437 0.6943098,-0.320069 1.5217861,-0.441275 2.2207031,-0.05859 0.3325161,0.149133 0.6767832,0.169105 1.0175781,0.123047 1.1763193,-0.377141 1.78456,-0.510947 3.130219,0.05666 0.64547,0.05184 1.34431,-0.445591 2.223297,-0.423842 0.264657,-0.01332 1.092167,0.246652 1.478515,0.365234 h 0.002 c 0.560757,0.08029 1.135035,-0.115511 1.658204,-0.320312 0.754443,-0.246704 1.42118,0.277917 2.148437,0.335937 0.679991,0.06611 1.277834,-0.402757 1.941406,-0.40039 v -1.3125 c -0.0096,3.1e-4 -0.01967,-5.36e-4 -0.0293,0 -0.739183,-0.01326 -1.383132,0.559654 -2.140625,0.363281 -0.69207,-0.197542 -1.41674,-0.556158 -2.142578,-0.246094 -1.655465,0.798879 -2.131536,-0.136064 -3.123047,-0.109375 -0.566651,-0.01017 -1.078155,0.324314 -1.626953,0.392578 -0.768304,0.02005 -1.124822,-0.242268 -1.758614,-0.404396 z"
+     transform="matrix(0.99997,0,0,0.99997,-0.07491,0)"
+     sodipodi:nodetypes="cccccccccccccccccccccccccc" /><path
+     id="path851"
+     style="fill:#ffffff;stroke-width:0.849248"
+     d="m 11.681761,12.380821 c 0.04001,0.858093 -1.022037,1.463089 -1.7399012,0.992415 -0.759078,-0.4024 -0.73974,-1.624431 0.03148,-2.002787 0.7401222,-0.430195 1.7286822,0.151027 1.7084202,1.010372 z" /><path
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.860781px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 3.355712,15.036148 3.6383028,-2.22847 -1.842207,-1.95125 3.722552,-1.9372846 c 0.680734,-0.2722312 1.1638102,0.4017839 0.797146,0.8475309 l -2.609068,1.3782717 4.4254312,4.254431 c -0.969784,-0.283917 -1.159653,-0.733088 -1.9352852,-0.477299 -2.04824,0.675474 -1.613096,0.0034 -3.081487,0.01516 -1.659598,0.01323 -1.380005,0.838666 -3.1153848,0.09891 z"
+     id="path2791"
+     sodipodi:nodetypes="cccccccssc" /><path
+     id="rect4320"
+     style="fill:#ffffff;stroke-width:1.00154;stroke-linecap:square;paint-order:markers fill stroke"
+     d="m 21.108524,13.306347 c -0.260342,0.07218 -0.504886,-0.363252 -0.886457,-0.333843 -0.682913,0.05263 -0.688525,0.273741 -1.170401,0.333103 -0.56376,-0.01179 -0.705141,-0.39106 -1.323093,-0.385461 -0.797244,0.05005 -0.816589,0.344784 -1.506419,0.327831 -0.635156,-0.006 -0.584758,-0.400757 -1.137589,-0.37363 -0.445887,0 -0.423469,0.363096 -1.030167,0.33682 0.804394,-1.992062 7.313411,-2.472785 7.054126,0.09518 z"
+     sodipodi:nodetypes="cscccccc" /><path
+     id="rect4573"
+     style="fill:#ffffff;stroke-width:1.00154;stroke-linecap:square;paint-order:markers fill stroke"
+     d="m 15.952342,6.3416747 0.804782,0.00553 c 0.791609,0.9558102 1.568049,2.3417023 2.288114,5.3258424 l -1.791332,0.368162 c 0.0085,-1.595974 -0.327662,-3.5171502 -1.301564,-5.6995303 z"
+     sodipodi:nodetypes="ccccc" /><path
+     id="rect5178"
+     style="fill:#ffffff;stroke-width:1.00154;stroke-linecap:square;paint-order:markers fill stroke"
+     d="M 15.714534,5.7993213 16.460602,5.694421 C 17.892566,5.5299173 18.930384,6.2178215 19.826278,7.1622728 18.315795,6.5191329 17.758674,6.2722082 16.194793,6.4666796 14.820535,6.8297473 13.804944,7.2159692 13.25106,7.9257197 13.396619,7.3313592 13.938011,6.4826988 15.714534,5.7993213 Z"
+     sodipodi:nodetypes="cccccc" /><path
+     id="rect5178-8"
+     style="fill:#ffffff;stroke-width:0.961457;stroke-linecap:square;paint-order:markers fill stroke"
+     d="m 16.165622,5.4722594 c -0.08973,0.080465 -0.17851,0.1681115 -0.26532,0.2648771 l -0.0964,0.1131325 0.390891,0.6164106 C 17.150623,5.4034465 17.686156,5.2561052 19.060064,4.8593949 18.032481,4.6520987 17.033002,4.6944293 16.165622,5.4722594 Z" /><path
+     id="rect5178-5"
+     style="fill:#ffffff;stroke-width:0.928756;stroke-linecap:square;paint-order:markers fill stroke"
+     d="M 16.314771,5.73079 C 16.294181,5.717361 16.273991,5.703711 16.252891,5.690635 L 15.674258,5.3521611 c -1.591186,-0.4463567 -2.388606,-0.054483 -2.781886,0.3520817 0.738652,-0.2696642 1.645743,-0.011014 2.795776,0.4705547 0.09419,0.057052 0.180726,0.1118664 0.264194,0.1668772 z" /></svg>
diff --git a/drawable-svg/ic_activity_workout.svg b/drawable-svg/ic_activity_workout.svg
new file mode 100644
index 000000000..247e1acdc
--- /dev/null
+++ b/drawable-svg/ic_activity_workout.svg
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   sodipodi:docname="ic_activity_workout.01.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 5.8208333 5.8208333"
+   height="22"
+   width="22"
+   inkscape:export-filename="/home/peter/StudioProjects/OpenTracks/drawable-svg/ic_activity_workout.01.png"
+   inkscape:export-xdpi="1309.09"
+   inkscape:export-ydpi="1309.09"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect3162"
+       effect="spiro" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.9999999,0,1 @ F,0,0,1,0,2.0000001,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect3149"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect2514"
+       is_visible="true"
+       lpeversion="1"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,4,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.97014234,0,1 @ F,0,0,1,0,0,0,1"
+       unit="px"
+       method="auto"
+       mode="F"
+       radius="0"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,0.51887107,0,1 @ F,0,0,1,0,0.22687835,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect950"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.34892149,0,1 @ F,0,0,1,0,0.18398697,0,1 @ F,0,1,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect946"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,2.00309,0,1 @ F,0,0,1,0,2.00309,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect918"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,7.0000002,0,1 @ F,0,0,1,0,0,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect912"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="false"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="true"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,0.49832891,0,1 @ F,0,0,1,0,0.49832891,0,1 @ F,0,1,1,0,0.5316463,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.49999976,0,1 @ F,0,0,1,0,0.50000024,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0000001,0,1 @ F,0,0,1,0,0.99999982,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,1.0295214,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0.5316463,0,1"
+       lpeversion="1"
+       is_visible="true"
+       id="path-effect894"
+       effect="fillet_chamfer" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:window-height="1047"
+     inkscape:window-width="1920"
+     inkscape:guide-bbox="true"
+     showguides="false"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox="true"
+     units="px"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="mm"
+     inkscape:cy="10.326952"
+     inkscape:cx="15.790447"
+     inkscape:zoom="31.664715"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#232629"
+     id="base"
+     inkscape:pagecheckerboard="0"
+     inkscape:snap-grids="false">
+    <inkscape:grid
+       dotted="true"
+       empspacing="22"
+       id="grid833"
+       type="xygrid" />
+    <inkscape:grid
+       originy="0.26458333"
+       originx="0.26458333"
+       spacingx="1.0583333"
+       spacingy="1.0583333"
+       empspacing="1"
+       id="grid835"
+       type="xygrid" />
+    <sodipodi:guide
+       inkscape:color="rgb(0,0,255)"
+       inkscape:locked="false"
+       inkscape:label=""
+       id="guide887"
+       orientation="0.96592583,0.25881905"
+       position="4.195,4.2333333" />
+    <sodipodi:guide
+       id="guide900"
+       orientation="0,-1"
+       position="0.26458333,1.9843751" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <g
+       transform="matrix(0.38576851,0,0,0.38576851,152.56385,-12.494408)"
+       id="g954">
+      <rect
+         style="fill:#cacaca;fill-opacity:1;stroke-width:14.6855;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect919"
+         width="68.791664"
+         height="79.375"
+         x="-357.1875"
+         y="-7.9375" />
+      <rect
+         style="fill:#e74c3c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect851"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect853"
+         style="fill:#ed1515;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f47750;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect855"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="-5.2916665" />
+      <rect
+         y="-5.2916665"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect857"
+         style="fill:#fdbc4b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#c9ce3b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect859"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="-5.2916665" />
+      <rect
+         y="5.291667"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect861"
+         style="fill:#da4453;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#c0392b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect863"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect865"
+         style="fill:#d35400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#f67400;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect867"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="5.291667" />
+      <rect
+         y="5.291667"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect869"
+         style="fill:#f39c1f;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         y="21.166666"
+         x="-354.54169"
+         height="10.583333"
+         width="10.583333"
+         id="rect871"
+         style="fill:#1cdc9a;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#2ecc71;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect873"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95834"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-333.375"
+         height="10.583333"
+         width="10.583333"
+         id="rect875"
+         style="fill:#1abc9c;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#3498db;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect877"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79169"
+         y="21.166666" />
+      <rect
+         y="21.166666"
+         x="-312.20834"
+         height="10.583333"
+         width="10.583333"
+         id="rect879"
+         style="fill:#3daee9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#10d116;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect881"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54169"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-343.95834"
+         height="10.583333"
+         width="10.583333"
+         id="rect883"
+         style="fill:#27ae60;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#16a085;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect885"
+         width="10.583333"
+         height="10.583333"
+         x="-333.375"
+         y="31.75" />
+      <rect
+         y="31.75"
+         x="-322.79169"
+         height="10.583333"
+         width="10.583333"
+         id="rect887"
+         style="fill:#2980b9;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#1d99f3;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect889"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20834"
+         y="31.75" />
+      <rect
+         style="fill:#9b59b6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect891"
+         width="10.583333"
+         height="10.583333"
+         x="-301.625"
+         y="21.166666" />
+      <rect
+         y="31.75"
+         x="-301.625"
+         height="10.583333"
+         width="10.583333"
+         id="rect893"
+         style="fill:#8e44ad;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#34495e;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect895"
+         width="10.583333"
+         height="10.583333"
+         x="-354.54166"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-343.95831"
+         height="10.583333"
+         width="10.583333"
+         id="rect897"
+         style="fill:#31363b;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#7f8c8d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect899"
+         width="10.583333"
+         height="10.583333"
+         x="-333.37497"
+         y="47.625" />
+      <rect
+         y="47.625"
+         x="-322.79166"
+         height="10.583333"
+         width="10.583333"
+         id="rect901"
+         style="fill:#bdc3c7;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#fcfcfc;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect903"
+         width="10.583333"
+         height="10.583333"
+         x="-312.20831"
+         y="47.625" />
+      <rect
+         y="58.208336"
+         x="-354.54166"
+         height="10.583333"
+         width="10.583333"
+         id="rect905"
+         style="fill:#2c3e50;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#232629;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect907"
+         width="10.583333"
+         height="10.583333"
+         x="-343.95831"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-333.37497"
+         height="10.583333"
+         width="10.583333"
+         id="rect909"
+         style="fill:#4d4d4d;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+      <rect
+         style="fill:#95a5a6;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552"
+         id="rect911"
+         width="10.583333"
+         height="10.583333"
+         x="-322.79166"
+         y="58.208336" />
+      <rect
+         y="58.208336"
+         x="-312.20831"
+         height="10.583333"
+         width="10.583333"
+         id="rect913"
+         style="fill:#eff0f1;fill-opacity:1;stroke-width:14.955;stroke-linecap:square;stroke-linejoin:round;stroke-dashoffset:531.552" />
+    </g>
+    <path
+       id="path17"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.730205;stroke-opacity:1"
+       d="m 12.521484,5.0957031 c -0.795342,0 -1.447265,0.6634257 -1.447265,1.4746094 0,0.811183 0.651923,1.4746094 1.447265,1.4746094 0.795342,0 1.445313,-0.663426 1.445313,-1.4746094 0,-0.8111837 -0.649971,-1.4746094 -1.445313,-1.4746094 z m 5.697266,2.2871094 c -1.005293,9.03e-5 -1.820222,0.8150191 -1.820312,1.8203125 0.001,0.2581612 0.02839,0.6283924 0.303378,0.93547 L 15.712713,10.886411 13.488221,8.9477292 10.263672,8.5957031 7.5078513,10.338038 5.7695312,12.576172 c -0.3754732,0.661347 0.1816517,1.249724 0.7773438,0.966797 l 1.7128929,-2.075723 1.9003931,-1.220112 -0.5761766,4.110288 -2.5878906,5.929687 1.484375,-0.0293 c 0.4801983,-0.907334 2.5996092,-5.441406 2.5996092,-5.441406 l 2.054688,0.941406 v 4.423829 h 1.445312 v -5.53125 L 12.75,13.876953 l 0.650391,-3.398437 2.285156,2.103515 1.747452,-1.734477 c 0.31097,0.238627 0.542791,0.17537 0.785751,0.175884 1.005294,-9e-5 1.820222,-0.815019 1.820312,-1.820313 -9e-5,-1.0052934 -0.815019,-1.8202222 -1.820312,-1.8203125 z m 0.0059,1.3535156 c 0.274357,9.402e-4 0.496232,0.2236881 0.496094,0.4980469 1.38e-4,0.2743588 -0.221737,0.4971067 -0.496094,0.4980469 C 17.94953,9.7325585 17.726466,9.5094953 17.726603,9.234375 17.726466,8.9592547 17.94953,8.7361915 18.22465,8.7363281 Z"
+       transform="scale(0.26458333)"
+       sodipodi:nodetypes="sssssccccccccccccccccccccccccccccccc" />
+    <path
+       id="path9403"
+       style="fill:#ffffff;stroke:none;stroke-width:0.264999;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers fill stroke"
+       d="M 1.0131059,0.53415337 C 0.73729957,0.54114168 0.64785326,0.76400686 0.64775351,1.04575 c 0.001003,0.049428 0.006811,0.095893 0.0170532,0.1405599 H 1.1996578 L 1.3303992,1.4400412 1.6714636,0.85558076 1.9071081,1.1801088 2.1840938,1.1826926 C 2.1968962,1.1377378 2.2034247,1.0922518 2.2032141,1.04575 2.2031128,0.75953474 2.1266608,0.53477144 1.8404456,0.53467013 1.540136,0.53761574 1.5284374,0.67900891 1.4327185,0.76204643 1.3421819,0.69057893 1.2614053,0.53055962 1.0265417,0.53415337 c -0.00447,1.59e-6 -0.00906,-1.1091e-4 -0.013436,0 z M 2.1840938,1.1826926 c -0.016723,0.058723 -0.044375,0.116296 -0.079582,0.173116 l 0.4873088,-0.00258 V 1.1863099 Z M 2.1045121,1.3558086 1.7965206,1.3573589 1.6740474,1.16874 1.3009436,1.7361472 1.0828691,1.3532248 H 0.7273352 C 0.8490025,1.5865985 1.0981629,1.7800149 1.3903438,2.0580913 1.669028,1.8167708 1.9577231,1.5927143 2.1045121,1.3558086 Z M 0.7273352,1.3532248 C 0.69965645,1.3001334 0.67827264,1.2450376 0.66480673,1.1863099 H 0.25914674 v 0.1669149 z" />
+  </g>
+</svg>
diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
index 954314472..f5f663725 100644
--- a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
@@ -52,6 +52,9 @@ public class TrackIconUtils {
     private static final String INLINE_SKATING = "INLINES_SKATING";
     private static final String SKATE_BOARDING = "SKATE_BOARDING";
     private static final String CLIMBING = "CLIMBING";
+    private static final String SWIMMING = "SWIMMING";
+    private static final String SWIMMING_OPEN = "SWIMMING_OPEN";
+    private static final String WORKOUT = "WORKOUT";
 
     private static final int ACTIVITY_UNKNOWN_LOGO = R.drawable.ic_logo_24dp;
 
@@ -71,6 +74,8 @@ public class TrackIconUtils {
     private static final int[] SKATE_BOARDING_LIST = new int[]{R.string.activity_type_skate_boarding};
     private static final int[] KAYAKING_LIST = new int[]{R.string.activity_type_kayaking};
     private static final int[] WALK_LIST = new int[]{R.string.activity_type_hiking, R.string.activity_type_off_trail_hiking, R.string.activity_type_speed_walking, R.string.activity_type_trail_hiking, R.string.activity_type_walking};
+    private static final int[] SWIM_LIST = new int[]{R.string.activity_type_swimming, R.string.activity_type_swimming_open};
+    private static final int[] WORKOUT_LIST = new int[]{R.string.activity_type_workout};
 
     // List of icons whose sports associated use speed (in km/h or mi/h).
     private static final int[] SPEED_ICON = {
@@ -110,6 +115,9 @@ public class TrackIconUtils {
         MAP.put(KAYAK, new Pair<>(R.string.activity_type_kayaking, R.drawable.ic_activity_kayaking_24dp));
         MAP.put(BOAT, new Pair<>(R.string.activity_type_boat, R.drawable.ic_activity_boat_24dp));
         MAP.put(SAILING, new Pair<>(R.string.activity_type_sailing, R.drawable.ic_activity_sailing_24dp));
+        MAP.put(SWIMMING, new Pair<>(R.string.activity_type_swimming, R.drawable.ic_activity_swimming_24dp));
+        MAP.put(SWIMMING_OPEN, new Pair<>(R.string.activity_type_swimming_open, R.drawable.ic_activity_swimming_open_24dp));
+        MAP.put(WORKOUT, new Pair<>(R.string.activity_type_workout, R.drawable.ic_activity_workout_24dp));
     }
 
     private TrackIconUtils() {
@@ -208,6 +216,12 @@ public class TrackIconUtils {
         if (inList(resources, activityType, WALK_LIST)) {
             return WALK;
         }
+        if (inList(resources, activityType, SWIM_LIST)) {
+            return SWIMMING;
+        }
+        if (inList(resources, activityType, WORKOUT_LIST)) {
+            return WORKOUT;
+        }
         return UNKNOWN;
     }
 
diff --git a/src/main/res/drawable/ic_activity_swimming_24dp.xml b/src/main/res/drawable/ic_activity_swimming_24dp.xml
new file mode 100644
index 000000000..821b2993f
--- /dev/null
+++ b/src/main/res/drawable/ic_activity_swimming_24dp.xml
@@ -0,0 +1,14 @@
+<vector android:height="24dp" android:viewportHeight="21.99934"
+    android:viewportWidth="21.84952" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="#ffffff"
+        android:pathData="m18.3273,15.5167c-1.0171,-0.0182 -1.9033,0.7707 -2.9456,0.5005 -0.9523,-0.2718 -1.9505,-0.7655 -2.9493,-0.3389 -0.9384,0.4921 -2.0789,0.4938 -3.017,0C8.4158,15.2514 7.4165,15.7448 6.4634,16.0171 5.2611,16.312 4.2318,15.2563 3.0297,15.5586 2.2389,15.8067 1.0535,16.1129 1.0535,16.1129v1.7649c1.0227,0.0195 1.9128,-0.7764 2.9601,-0.4982 1.4913,0.5895 1.7842,0.6237 2.7778,0.3753 0.9554,-0.4404 2.0942,-0.6063 3.0559,-0.0798 0.9567,0.4291 1.9816,0.0931 2.8934,-0.2638 1.0381,-0.3395 1.9553,0.3821 2.956,0.4619 1.0872,0.1057 2.0198,-0.7841 3.1216,-0.4936 0.5567,-0.0151 1.9432,1.034 1.9777,0.1483v-1.4713c-0.8787,0.0509 -1.5921,-0.5889 -2.4688,-0.5401z" android:strokeWidth="0.20758"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m18.3273,12.592c-1.0171,-0.0182 -1.9033,0.7707 -2.9456,0.5005 -0.9523,-0.2718 -1.9505,-0.7655 -2.9493,-0.3389 -0.9384,0.4921 -2.0789,0.4938 -3.017,0C8.4158,12.3268 7.4165,12.8201 6.4634,13.0925 5.2611,13.3873 4.2318,12.3317 3.0297,12.634 2.2389,12.8821 1.0535,13.1883 1.0535,13.1883v1.7649c1.0227,0.0195 1.9128,-0.7764 2.9601,-0.4982 1.4913,0.5895 1.7842,0.6237 2.7778,0.3753 0.9554,-0.4404 2.0942,-0.6063 3.0559,-0.0798 0.9567,0.4291 1.9816,0.0931 2.8934,-0.2638 1.0381,-0.3395 1.9553,0.3821 2.956,0.4619 1.0872,0.1057 2.0198,-0.7841 3.1216,-0.4936 0.5567,-0.0151 1.9432,1.034 1.9777,0.1483v-1.4713c-0.8787,0.0509 -1.5921,-0.5889 -2.4688,-0.5401z" android:strokeWidth="0.20758"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m15.7716,8.3605c0.0551,1.1808 -1.4064,2.0133 -2.3942,1.3656 -1.0445,-0.5537 -1.0179,-2.2353 0.0433,-2.7559 1.0184,-0.592 2.3788,0.2078 2.3509,1.3903z" android:strokeWidth="1.16861"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M4.3146,12.0144 L9.3211,8.9479 6.7861,6.2628 11.9085,3.597c0.9367,-0.3746 1.6015,0.5529 1.0969,1.1662L9.4152,6.6599 15.5048,12.5142c-1.3345,-0.3907 -1.5957,-1.0088 -2.6631,-0.6568 -2.8185,0.9295 -2.2197,0.0047 -4.2403,0.0209 -2.2837,0.0182 -1.899,1.154 -4.2869,0.1361z"
+        android:strokeColor="#00000000" android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" android:strokeWidth="1.18448"/>
+</vector>
diff --git a/src/main/res/drawable/ic_activity_swimming_open_24dp.xml b/src/main/res/drawable/ic_activity_swimming_open_24dp.xml
new file mode 100644
index 000000000..006af46cb
--- /dev/null
+++ b/src/main/res/drawable/ic_activity_swimming_open_24dp.xml
@@ -0,0 +1,29 @@
+<vector android:height="24dp" android:viewportHeight="21.99934"
+    android:viewportWidth="21.84952" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="#ffffff"
+        android:pathData="m2.7434,17.5717c-0.1058,0.0005 -0.2131,0.0136 -0.3223,0.041 -0.5747,0.1803 -1.4355,0.4023 -1.4355,0.4023l0,1.2812c0.7432,0.0141 1.3912,-0.5635 2.1523,-0.3613 1.0837,0.4284 1.2955,0.454 2.0175,0.2734 0.6943,-0.3201 1.5217,-0.4413 2.2206,-0.0586 0.6952,0.3118 1.4408,0.068 2.1035,-0.1914 0.7544,-0.2467 1.4211,0.2779 2.1484,0.3359 0.621,-0.0088 1.3519,-0.3994 1.8183,-0.3965 0.5367,0.0225 1.0513,0.2342 1.498,0.3828 0.3578,0.0766 0.7179,0.021 0.9707,-0.0722 0.7173,-0.2646 1.5217,-0.4413 2.2206,-0.0586 0.6952,0.3118 1.4408,0.068 2.1035,-0.1914 0.2296,-0.0751 0.4506,-0.0778 0.6679,-0.0449l0,-1.3144c-0.2959,-0.041 -0.5941,-0.0279 -0.8926,0.0996 -0.682,0.3576 -1.5115,0.3588 -2.1933,0 -0.7264,-0.3102 -1.4519,0.0482 -2.1445,0.2461 -0.1166,0.0286 -0.231,0.0388 -0.3437,0.0371l0,-0.0078c-0.3046,0.0233 -0.6105,-0.1228 -0.8789,-0.1894 -1.0617,-0.5989 -2.2859,0.1489 -3.0566,0.1601 -0.5103,-0.1115 -1.4167,-0.5561 -2.1425,-0.2461 -0.682,0.3576 -1.5115,0.3588 -2.1933,0C6.3352,17.3885 5.6097,17.7469 4.9171,17.9448 4.1526,18.1323 3.4837,17.5685 2.7434,17.5717Z" android:strokeWidth="0.15085247"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m10.1545,15.4447c-0.234,-0.0118 -0.6643,0.0285 -0.8996,0.129 -0.682,0.3576 -1.5115,0.3588 -2.1933,0C6.3352,15.2636 5.6097,15.6219 4.9171,15.8198 4.0434,16.0341 3.2947,15.2662 2.4211,15.4859 1.8464,15.6662 0.9856,15.8901 0.9856,15.8901l0,1.2812c0.7432,0.0141 1.3912,-0.5635 2.1523,-0.3613 1.0837,0.4284 1.2955,0.454 2.0175,0.2734 0.6943,-0.3201 1.5217,-0.4413 2.2206,-0.0586 0.3325,0.1491 0.6768,0.1691 1.0175,0.123 1.1763,-0.3771 1.7845,-0.5109 3.1301,0.0567 0.6455,0.0518 1.3443,-0.4456 2.2232,-0.4238 0.2646,-0.0133 1.0921,0.2466 1.4785,0.3652l0.002,0c0.5607,0.0803 1.135,-0.1155 1.6582,-0.3203 0.7544,-0.2467 1.4211,0.2779 2.1484,0.3359 0.68,0.0661 1.2778,-0.4027 1.9413,-0.4004l0,-1.3125c-0.0096,0.0003 -0.0197,-0.0005 -0.0293,0 -0.7392,-0.0133 -1.3831,0.5596 -2.1406,0.3633 -0.692,-0.1975 -1.4167,-0.5561 -2.1425,-0.2461 -1.6554,0.7989 -2.1315,-0.1361 -3.123,-0.1094 -0.5666,-0.0102 -1.0781,0.3243 -1.6269,0.3926 -0.7683,0.02 -1.1248,-0.2423 -1.7586,-0.4044z" android:strokeWidth="0.15085247"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m11.6818,12.3808c0.04,0.8581 -1.022,1.4631 -1.7399,0.9924 -0.7591,-0.4024 -0.7397,-1.6244 0.0315,-2.0028 0.7401,-0.4302 1.7287,0.151 1.7084,1.0104z" android:strokeWidth="0.849248"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m3.3557,15.0361 l3.6383,-2.2285 -1.8422,-1.9512 3.7226,-1.9373c0.6807,-0.2722 1.1638,0.4018 0.7971,0.8475l-2.6091,1.3783 4.4254,4.2544c-0.9698,-0.2839 -1.1597,-0.7331 -1.9353,-0.4773 -2.0482,0.6755 -1.6131,0.0034 -3.0815,0.0152 -1.6596,0.0132 -1.38,0.8387 -3.1154,0.0989z"
+        android:strokeColor="#00000000" android:strokeLineCap="butt"
+        android:strokeLineJoin="miter" android:strokeWidth="0.860781"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m21.1085,13.3063c-0.2603,0.0722 -0.5049,-0.3633 -0.8865,-0.3338 -0.6829,0.0526 -0.6885,0.2737 -1.1704,0.3331 -0.5638,-0.0118 -0.7051,-0.3911 -1.3231,-0.3855 -0.7972,0.0501 -0.8166,0.3448 -1.5064,0.3278 -0.6352,-0.006 -0.5848,-0.4008 -1.1376,-0.3736 -0.4459,0 -0.4235,0.3631 -1.0302,0.3368 0.8044,-1.9921 7.3134,-2.4728 7.0541,0.0952z"
+        android:strokeLineCap="square" android:strokeWidth="1.00154"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m15.9523,6.3417 l0.8048,0.0055c0.7916,0.9558 1.568,2.3417 2.2881,5.3258l-1.7913,0.3682c0.0085,-1.596 -0.3277,-3.5172 -1.3016,-5.6995z"
+        android:strokeLineCap="square" android:strokeWidth="1.00154"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M15.7145,5.7993 L16.4606,5.6944C17.8926,5.5299 18.9304,6.2178 19.8263,7.1623 18.3158,6.5191 17.7587,6.2722 16.1948,6.4667 14.8205,6.8297 13.8049,7.216 13.2511,7.9257 13.3966,7.3314 13.938,6.4827 15.7145,5.7993Z"
+        android:strokeLineCap="square" android:strokeWidth="1.00154"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m16.1656,5.4723c-0.0897,0.0805 -0.1785,0.1681 -0.2653,0.2649l-0.0964,0.1131 0.3909,0.6164C17.1506,5.4034 17.6862,5.2561 19.0601,4.8594 18.0325,4.6521 17.033,4.6944 16.1656,5.4723Z"
+        android:strokeLineCap="square" android:strokeWidth="0.961457"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M16.3148,5.7308C16.2942,5.7174 16.274,5.7037 16.2529,5.6906L15.6743,5.3522c-1.5912,-0.4464 -2.3886,-0.0545 -2.7819,0.3521 0.7387,-0.2697 1.6457,-0.011 2.7958,0.4706 0.0942,0.0571 0.1807,0.1119 0.2642,0.1669z"
+        android:strokeLineCap="square" android:strokeWidth="0.928756"/>
+</vector>
diff --git a/src/main/res/drawable/ic_activity_workout_24dp.xml b/src/main/res/drawable/ic_activity_workout_24dp.xml
new file mode 100644
index 000000000..7ef6e4015
--- /dev/null
+++ b/src/main/res/drawable/ic_activity_workout_24dp.xml
@@ -0,0 +1,109 @@
+<vector android:height="24dp" android:viewportHeight="5.820833"
+    android:viewportWidth="5.820833" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="?attr/colorControlNormal">
+    <path android:fillColor="#cacaca"
+        android:pathData="M14.77216,-15.55645l26.53766,0l0,30.62037l-26.53766,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.6652036"/>
+    <path android:fillColor="#e74c3c"
+        android:pathData="M15.79283,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#ed1515"
+        android:pathData="M19.87555,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#f47750"
+        android:pathData="M23.95827,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#fdbc4b"
+        android:pathData="M28.04098,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#c9ce3b"
+        android:pathData="M32.1237,-14.53577l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#da4453"
+        android:pathData="M15.79283,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#c0392b"
+        android:pathData="M19.87555,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#d35400"
+        android:pathData="M23.95827,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#f67400"
+        android:pathData="M28.04098,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#f39c1f"
+        android:pathData="M32.1237,-10.45305l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#1cdc9a"
+        android:pathData="M15.79283,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#2ecc71"
+        android:pathData="M19.87555,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#1abc9c"
+        android:pathData="M23.95827,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#3498db"
+        android:pathData="M28.04098,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#3daee9"
+        android:pathData="M32.1237,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#10d116"
+        android:pathData="M15.79283,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#27ae60"
+        android:pathData="M19.87555,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#16a085"
+        android:pathData="M23.95827,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#2980b9"
+        android:pathData="M28.04098,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#1d99f3"
+        android:pathData="M32.1237,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#9b59b6"
+        android:pathData="M36.20642,-4.32897l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#8e44ad"
+        android:pathData="M36.20642,-0.24626l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#34495e"
+        android:pathData="M15.79284,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#31363b"
+        android:pathData="M19.87556,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#7f8c8d"
+        android:pathData="M23.95828,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#bdc3c7"
+        android:pathData="M28.04099,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#fcfcfc"
+        android:pathData="M32.12371,5.87782l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#2c3e50"
+        android:pathData="M15.79284,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#232629"
+        android:pathData="M19.87556,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#4d4d4d"
+        android:pathData="M23.95828,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#95a5a6"
+        android:pathData="M28.04099,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#eff0f1"
+        android:pathData="M32.12371,9.96054l4.08272,0l0,4.08272l-4.08272,0z"
+        android:strokeLineCap="square" android:strokeLineJoin="round" android:strokeWidth="5.769168"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="m3.31298,1.34824c-0.21043,0 -0.38292,0.17553 -0.38292,0.39016 0,0.21463 0.17249,0.39016 0.38292,0.39016 0.21043,0 0.38241,-0.17553 0.38241,-0.39016 0,-0.21463 -0.17197,-0.39016 -0.38241,-0.39016zM4.82038,1.95337c-0.26598,0.00002 -0.4816,0.21564 -0.48162,0.48162 0.00026,0.06831 0.00751,0.16626 0.08027,0.24751L4.15732,2.88036 3.56876,2.36742 2.7156,2.27428 1.98645,2.73527 1.52652,3.32745c-0.09934,0.17498 0.04806,0.33066 0.20567,0.2558l0.4532,-0.5492 0.50281,-0.32282 -0.15245,1.08751 -0.68471,1.5689 0.39274,-0.00775c0.12705,-0.24007 0.68781,-1.43971 0.68781,-1.43971l0.54364,0.24908l0,1.17047l0.38241,0l0,-1.46348L3.37344,3.67161l0.17208,-0.89917 0.60461,0.55655 0.46235,-0.45891c0.08228,0.06314 0.14361,0.0464 0.2079,0.04654 0.26598,-0.00002 0.4816,-0.21564 0.48162,-0.48162 -0.00002,-0.26598 -0.21564,-0.4816 -0.48162,-0.48162zM4.82194,2.31149c0.07259,0.00025 0.13129,0.05918 0.13126,0.13177 0.00004,0.07259 -0.05867,0.13153 -0.13126,0.13177C4.74915,2.57507 4.69013,2.51605 4.69016,2.44326 4.69013,2.37047 4.74915,2.31145 4.82194,2.31149Z"
+        android:strokeColor="#00000000" android:strokeWidth="0.19320007"/>
+    <path android:fillColor="#ffffff"
+        android:pathData="M1.01311,0.53415C0.7373,0.54114 0.64785,0.76401 0.64775,1.04575c0.001,0.04943 0.00681,0.09589 0.01705,0.14056H1.19966L1.3304,1.44004 1.67146,0.85558 1.90711,1.18011 2.18409,1.18269C2.1969,1.13774 2.20342,1.09225 2.20321,1.04575 2.20311,0.75953 2.12666,0.53477 1.84045,0.53467 1.54014,0.53762 1.52844,0.67901 1.43272,0.76205 1.34218,0.69058 1.26141,0.53056 1.02654,0.53415c-0.00447,0 -0.00906,-0.00011 -0.01344,0zM2.18409,1.18269c-0.01672,0.05872 -0.04437,0.1163 -0.07958,0.17312l0.48731,-0.00258V1.18631ZM2.10451,1.35581 L1.79652,1.35736 1.67405,1.16874 1.30094,1.73615 1.08287,1.35322H0.72734C0.849,1.5866 1.09816,1.78001 1.39034,2.05809 1.66903,1.81677 1.95772,1.59271 2.10451,1.35581ZM0.72734,1.35322C0.69966,1.30013 0.67827,1.24504 0.66481,1.18631H0.25915v0.16691z"
+        android:strokeColor="#00000000" android:strokeLineCap="square" android:strokeWidth="0.264999"/>
+</vector>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 31efe0759..c7be296bc 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -168,6 +168,9 @@ limitations under the License.
     <string name="activity_type_walking">walking</string>
     <string name="activity_type_water_skiing">water skiing</string>
     <string name="activity_type_wind_surfing">wind surfing</string>
+    <string name="activity_type_swimming">swimming</string>
+    <string name="activity_type_swimming_open">swimming in open water</string>
+    <string name="activity_type_workout">workout</string>
     <!-- Description -->
     <string name="description_activity_type">Activity type: %1$s</string>
     <string name="description_average_moving_pace_in_minute">Average moving pace: %1$s min/km (%2$s min/mi)</string>