diff --git a/Graphics/drawables/ic_action_encrypt_copy.svg b/Graphics/drawables/ic_action_encrypt_copy.svg
index 473178295..229c2524b 100644
--- a/Graphics/drawables/ic_action_encrypt_copy.svg
+++ b/Graphics/drawables/ic_action_encrypt_copy.svg
@@ -36,24 +36,24 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1364"
-     inkscape:window-height="747"
+     inkscape:window-width="2558"
+     inkscape:window-height="1419"
      id="namedview6"
      showgrid="false"
      inkscape:zoom="9.8333333"
-     inkscape:cx="12"
+     inkscape:cx="12.20339"
      inkscape:cy="12"
      inkscape:window-x="0"
      inkscape:window-y="19"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <path
-     d="M 21.012732,10.422756 H 16.277674 V 4.3963182 h 4.735058 m 0,-0.8609196 h -4.735058 a 0.86091963,0.86091963 0 0 0 -0.86092,0.8609196 v 6.0264378 a 0.86091963,0.86091963 0 0 0 0.86092,0.860919 h 4.735058 a 0.86091963,0.86091963 0 0 0 0.86092,-0.860919 V 4.3963182 a 0.86091963,0.86091963 0 0 0 -0.86092,-0.8609196 m -1.29138,-1.7218393 h -5.165517 a 0.86091963,0.86091963 0 0 0 -0.86092,0.8609196 v 6.0264375 h 0.86092 V 2.6744789 h 5.165517 V 1.8135593 z"
+     d="M 14.129105,19.422026 H 6.8730841 v -9.234937 h 7.2560209 m 0,-1.3192761 H 6.8730841 A 1.3192767,1.3192767 0 0 0 5.5538069,10.187089 v 9.234937 a 1.3192767,1.3192767 0 0 0 1.3192772,1.319276 h 7.2560209 a 1.3192767,1.3192767 0 0 0 1.319278,-1.319276 V 10.187089 A 1.3192767,1.3192767 0 0 0 14.129105,8.8678129 M 12.150189,6.2292595 H 4.2345312 A 1.3192767,1.3192767 0 0 0 2.915254,7.5485361 V 16.783473 H 4.2345312 V 7.5485361 H 12.150189 V 6.2292595 z"
      id="path4"
      inkscape:connector-curvature="0" />
   <path
      id="path3076"
-     d="m 8.7487891,17.940911 a 1.679782,1.679782 0 0 0 1.6797819,-1.679783 c 0,-0.932279 -0.7559012,-1.679782 -1.6797819,-1.679782 a 1.679782,1.679782 0 0 0 -1.6797836,1.679782 1.679782,1.679782 0 0 0 1.6797836,1.679783 m 5.0393459,-7.55902 a 1.679782,1.679782 0 0 1 1.679783,1.679782 v 8.398908 a 1.679782,1.679782 0 0 1 -1.679783,1.679786 H 3.7094428 A 1.679782,1.679782 0 0 1 2.029661,20.460581 v -8.398908 c 0,-0.932279 0.7559033,-1.679782 1.6797818,-1.679782 H 4.5493346 V 8.7021096 A 4.199455,4.199455 0 0 1 8.7487891,4.5026548 4.199455,4.199455 0 0 1 12.948244,8.7021096 v 1.6797814 h 0.839891 M 8.7487891,6.182436 A 2.5196731,2.5196731 0 0 0 6.2291173,8.7021096 V 10.381891 H 11.268463 V 8.7021096 A 2.5196731,2.5196731 0 0 0 8.7487891,6.182436 z"
+     d="m 17.363197,9.8980016 a 0.84079901,0.84079901 0 0 0 0.840798,-0.8408 c 0,-0.466643 -0.378359,-0.840799 -0.840798,-0.840799 a 0.84079901,0.84079901 0 0 0 -0.8408,0.840799 0.84079901,0.84079901 0 0 0 0.8408,0.8408 m 2.522396,-3.783596 a 0.84079901,0.84079901 0 0 1 0.8408,0.840799 V 11.159199 A 0.84079901,0.84079901 0 0 1 19.885593,12 H 14.840799 A 0.84079901,0.84079901 0 0 1 14,11.159199 V 6.9552046 c 0,-0.466644 0.37836,-0.840799 0.840799,-0.840799 h 0.4204 v -0.840799 a 2.1019975,2.1019975 0 0 1 2.101998,-2.101997 2.1019975,2.1019975 0 0 1 2.101997,2.101997 v 0.840799 h 0.420399 m -2.522396,-2.101998 a 1.2611986,1.2611986 0 0 0 -1.261198,1.261199 v 0.840799 h 2.522396 v -0.840799 a 1.2611986,1.2611986 0 0 0 -1.261198,-1.261199 z"
      inkscape:connector-curvature="0"
-     style="fill:#1a1a1a" />
+     style="fill:#000000" />
 </svg>
diff --git a/Graphics/drawables/ic_action_encrypt_save.svg b/Graphics/drawables/ic_action_encrypt_save.svg
index 09af0dc88..7bb435a5d 100644
--- a/Graphics/drawables/ic_action_encrypt_save.svg
+++ b/Graphics/drawables/ic_action_encrypt_save.svg
@@ -36,24 +36,24 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1364"
-     inkscape:window-height="747"
+     inkscape:window-width="2558"
+     inkscape:window-height="1419"
      id="namedview6"
      showgrid="false"
      inkscape:zoom="9.8333333"
-     inkscape:cx="12"
+     inkscape:cx="12.20339"
      inkscape:cy="12"
      inkscape:window-x="0"
      inkscape:window-y="19"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <path
-     d="M 19.271186,4.830509 H 14.864407 V 3.067797 h 4.406779 m -1.322034,6.169491 a 1.3220339,1.3220339 0 0 1 -1.322033,-1.322034 1.3220339,1.3220339 0 0 1 1.322033,-1.322033 1.3220339,1.3220339 0 0 1 1.322034,1.322033 1.3220339,1.3220339 0 0 1 -1.322034,1.322034 m 2.20339,-7.050847 h -5.288135 c -0.489153,0 -0.881356,0.39661 -0.881356,0.881356 v 6.169491 a 0.8813559,0.8813559 0 0 0 0.881356,0.881356 h 6.169491 A 0.8813559,0.8813559 0 0 0 21.915254,9.237288 V 3.949153 L 20.152542,2.186441 z"
-     id="path4"
-     inkscape:connector-curvature="0" />
-  <path
-     id="path3076"
-     d="m 8.9903145,18.071731 a 1.679782,1.679782 0 0 0 1.6797815,-1.679783 c 0,-0.932279 -0.7559008,-1.679782 -1.6797815,-1.679782 a 1.679782,1.679782 0 0 0 -1.6797836,1.679782 1.679782,1.679782 0 0 0 1.6797836,1.679783 m 5.0393455,-7.55902 a 1.679782,1.679782 0 0 1 1.679783,1.679782 v 8.398908 A 1.679782,1.679782 0 0 1 14.02966,22.271187 H 3.9509682 A 1.679782,1.679782 0 0 1 2.2711864,20.591401 v -8.398908 c 0,-0.932279 0.7559033,-1.679782 1.6797818,-1.679782 H 4.79086 V 8.8329293 A 4.199455,4.199455 0 0 1 8.9903145,4.6334745 4.199455,4.199455 0 0 1 13.189769,8.8329293 V 10.512711 H 14.02966 M 8.9903145,6.3132557 A 2.5196731,2.5196731 0 0 0 6.4706427,8.8329293 V 10.512711 H 11.509988 V 8.8329293 A 2.5196731,2.5196731 0 0 0 8.9903145,6.3132557 z"
      inkscape:connector-curvature="0"
-     style="fill:#1a1a1a" />
+     d="M 12.355932,11.847458 H 4.7288135 V 8.7966102 H 12.355932 M 10.067797,19.474576 a 2.2881356,2.2881356 0 0 1 -2.288136,-2.288135 2.2881356,2.2881356 0 0 1 2.288136,-2.288136 2.2881356,2.2881356 0 0 1 2.288135,2.288136 2.2881356,2.2881356 0 0 1 -2.288135,2.288135 M 13.881356,7.2711864 H 4.7288135 c -0.8466101,0 -1.5254237,0.6864407 -1.5254237,1.5254238 V 19.474576 A 1.5254237,1.5254237 0 0 0 4.7288135,21 H 15.40678 a 1.5254237,1.5254237 0 0 0 1.525424,-1.525424 V 10.322034 L 13.881356,7.2711864 z"
+     id="path4-7" />
+  <path
+     id="path3076-1"
+     d="m 17.363197,9.8980016 a 0.84079901,0.84079901 0 0 0 0.840798,-0.8408 c 0,-0.466643 -0.378359,-0.840799 -0.840798,-0.840799 a 0.84079901,0.84079901 0 0 0 -0.8408,0.840799 0.84079901,0.84079901 0 0 0 0.8408,0.8408 m 2.522396,-3.783596 a 0.84079901,0.84079901 0 0 1 0.8408,0.840799 V 11.159199 A 0.84079901,0.84079901 0 0 1 19.885593,12 H 14.840799 A 0.84079901,0.84079901 0 0 1 14,11.159199 V 6.9552046 c 0,-0.466644 0.37836,-0.840799 0.840799,-0.840799 h 0.4204 v -0.840799 a 2.1019975,2.1019975 0 0 1 2.101998,-2.101997 2.1019975,2.1019975 0 0 1 2.101997,2.101997 v 0.840799 h 0.420399 m -2.522396,-2.101998 a 1.2611986,1.2611986 0 0 0 -1.261198,1.261199 v 0.840799 h 2.522396 v -0.840799 a 1.2611986,1.2611986 0 0 0 -1.261198,-1.261199 z"
+     inkscape:connector-curvature="0"
+     style="fill:#000000" />
 </svg>
diff --git a/Graphics/drawables/ic_action_encrypt_share.svg b/Graphics/drawables/ic_action_encrypt_share.svg
index 6509675e6..35d0d3960 100644
--- a/Graphics/drawables/ic_action_encrypt_share.svg
+++ b/Graphics/drawables/ic_action_encrypt_share.svg
@@ -36,24 +36,24 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1364"
-     inkscape:window-height="747"
+     inkscape:window-width="2558"
+     inkscape:window-height="1419"
      id="namedview6"
      showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
+     inkscape:zoom="13.906433"
+     inkscape:cx="16.307191"
+     inkscape:cy="17.104487"
      inkscape:window-x="0"
      inkscape:window-y="19"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <path
-     d="m 20.61017,8.8414128 c -0.382148,0 -0.724068,0.1508467 -0.985538,0.3871748 l -3.58514,-2.086723 c 0.02514,-0.1156503 0.04526,-0.2312996 0.04526,-0.3519774 0,-0.1206778 -0.02012,-0.2363281 -0.04526,-0.3519774 l 3.544914,-2.06661 c 0.271526,0.2514116 0.628532,0.4072878 1.025764,0.4072878 A 1.5084746,1.5084746 0 0 0 22.118644,3.2701132 1.5084746,1.5084746 0 0 0 20.61017,1.7616387 1.5084746,1.5084746 0 0 0 19.101695,3.2701132 c 0,0.1206777 0.02012,0.236327 0.04526,0.3519774 l -3.544916,2.06661 C 15.330509,5.437288 14.973504,5.2814128 14.576272,5.2814128 a 1.5084746,1.5084746 0 0 0 -1.508475,1.5084744 1.5084746,1.5084746 0 0 0 1.508475,1.5084745 c 0.397232,0 0.754237,-0.1558763 1.025763,-0.4072878 l 3.580113,2.086723 c -0.02514,0.1055931 -0.04023,0.2162141 -0.04023,0.3318651 0,0.809548 0.6587,1.46322 1.468249,1.46322 0.809548,0 1.468248,-0.653672 1.468248,-1.46322 A 1.4682486,1.4682486 0 0 0 20.610171,8.8414128 z"
-     id="path4"
-     inkscape:connector-curvature="0" />
-  <path
-     id="path3076"
-     d="m 8.8970941,17.842917 a 1.679782,1.679782 0 0 0 1.6797819,-1.679783 c 0,-0.932279 -0.7559012,-1.679782 -1.6797819,-1.679782 a 1.679782,1.679782 0 0 0 -1.6797836,1.679782 1.679782,1.679782 0 0 0 1.6797836,1.679783 m 5.0393459,-7.55902 a 1.679782,1.679782 0 0 1 1.679783,1.679782 v 8.398908 A 1.679782,1.679782 0 0 1 13.93644,22.042373 H 3.8577478 A 1.679782,1.679782 0 0 1 2.177966,20.362587 v -8.398908 c 0,-0.932279 0.7559033,-1.679782 1.6797818,-1.679782 H 4.6976396 V 8.6041153 A 4.199455,4.199455 0 0 1 8.8970941,4.4046605 4.199455,4.199455 0 0 1 13.096549,8.6041153 V 10.283897 H 13.93644 M 8.8970941,6.0844417 A 2.5196731,2.5196731 0 0 0 6.3774223,8.6041153 V 10.283897 H 11.416768 V 8.6041153 A 2.5196731,2.5196731 0 0 0 8.8970941,6.0844417 z"
      inkscape:connector-curvature="0"
-     style="fill:#1a1a1a" />
+     d="m 13.957374,17.775285 c -0.544868,0 -1.032382,0.215079 -1.405187,0.552038 L 7.4404597,15.352054 c 0.035847,-0.164895 0.064524,-0.329789 0.064524,-0.501853 0,-0.172063 -0.028677,-0.336958 -0.064524,-0.501852 l 5.0543733,-2.946592 c 0.387142,0.358465 0.896165,0.580715 1.462541,0.580715 a 2.1507969,2.1507969 0 0 0 2.150798,-2.1507972 2.1507969,2.1507969 0 0 0 -2.150798,-2.150797 2.1507969,2.1507969 0 0 0 -2.150796,2.150797 c 0,0.1720642 0.02868,0.3369582 0.06452,0.5018532 l -5.0543685,2.94659 C 6.4295852,12.921653 5.9205632,12.699404 5.3541867,12.699404 a 2.1507969,2.1507969 0 0 0 -2.1507969,2.150797 2.1507969,2.1507969 0 0 0 2.1507969,2.150796 c 0.5663765,0 1.0753985,-0.222248 1.4625419,-0.580715 l 5.1045584,2.975269 c -0.03585,0.150556 -0.05735,0.308281 -0.05735,0.473176 0,1.154261 0.939182,2.086273 2.093442,2.086273 1.154262,0 2.093443,-0.932012 2.093443,-2.086273 a 2.0934423,2.0934423 0 0 0 -2.093443,-2.093442 z"
+     id="path4-9" />
+  <path
+     id="path3076-1"
+     d="m 17.363197,9.898002 a 0.84079901,0.84079901 0 0 0 0.840798,-0.8408 c 0,-0.466643 -0.378359,-0.840799 -0.840798,-0.840799 a 0.84079901,0.84079901 0 0 0 -0.8408,0.840799 0.84079901,0.84079901 0 0 0 0.8408,0.8408 m 2.522396,-3.783596 a 0.84079901,0.84079901 0 0 1 0.8408,0.840799 v 4.203994 A 0.84079901,0.84079901 0 0 1 19.885593,12 H 14.840799 A 0.84079901,0.84079901 0 0 1 14,11.159199 V 6.955205 c 0,-0.466644 0.37836,-0.840799 0.840799,-0.840799 h 0.4204 V 5.2736068 a 2.1019975,2.1019975 0 0 1 2.101998,-2.101997 2.1019975,2.1019975 0 0 1 2.101997,2.101997 V 6.114406 h 0.420399 M 17.363197,4.0124078 a 1.2611986,1.2611986 0 0 0 -1.261198,1.261199 V 6.114406 h 2.522396 V 5.2736068 a 1.2611986,1.2611986 0 0 0 -1.261198,-1.261199 z"
+     inkscape:connector-curvature="0"
+     style="fill:#000000" />
 </svg>
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_copy_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_copy_24dp.png
index f079dce18..25a7ed445 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_copy_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_copy_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_save_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_save_24dp.png
index 102a54006..ef17796fb 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_save_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_save_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_share_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_share_24dp.png
index 1060be81b..402d792c0 100644
Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_share_24dp.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_share_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_copy_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_copy_24dp.png
index 0759d63cd..9517e1fec 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_copy_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_copy_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_save_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_save_24dp.png
index a72a7775a..162981140 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_save_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_save_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_share_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_share_24dp.png
index 9497d6445..779ba94d3 100644
Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_share_24dp.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_share_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_copy_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_copy_24dp.png
index ed110c7b2..9df8ff01a 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_copy_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_copy_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_save_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_save_24dp.png
index ee0c3aa1b..eef0635b7 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_save_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_save_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_share_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_share_24dp.png
index e9872e275..d359cd6ab 100644
Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_share_24dp.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_share_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_copy_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_copy_24dp.png
index 438b2a9e6..cf184c78d 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_copy_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_copy_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_save_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_save_24dp.png
index 24e3da727..5620e2595 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_save_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_save_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_share_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_share_24dp.png
index 7c0309114..b364c7603 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_share_24dp.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_share_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_copy_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_copy_24dp.png
index 560648d52..c3078ee92 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_copy_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_copy_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_save_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_save_24dp.png
index c4e7e8a6d..4146f9262 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_save_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_save_24dp.png differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_share_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_share_24dp.png
index f93079dfc..925cb2d9e 100644
Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_share_24dp.png and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_share_24dp.png differ
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index a53558532..39af9ca28 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -25,7 +25,7 @@
     <string name="title_share_fingerprint_with">"Share fingerprint with…"</string>
     <string name="title_share_key">"Share key with…"</string>
     <string name="title_share_file">"Share file with…"</string>
-    <string name="title_share_message">"Share message with…"</string>
+    <string name="title_share_message">"Share text with…"</string>
     <string name="title_encrypt_to_file">"Encrypt To File"</string>
     <string name="title_decrypt_to_file">"Decrypt To File"</string>
     <string name="title_import_keys">"Import Keys"</string>
@@ -72,7 +72,7 @@
 
     <!-- button -->
     <string name="btn_decrypt_verify_file">"Decrypt, verify, and save file"</string>
-    <string name="btn_decrypt_verify_message">"Decrypt and verify message"</string>
+    <string name="btn_decrypt_verify_message">"Decrypt and verify text"</string>
     <string name="btn_encrypt_file">"Encrypt and save file"</string>
     <string name="btn_encrypt_share_file">"Encrypt and share file"</string>
     <string name="btn_encrypt_save_file">"Encrypt and save file"</string>
@@ -87,8 +87,8 @@
     <string name="btn_no">"No"</string>
     <string name="btn_match">"Fingerprints match"</string>
     <string name="btn_lookup_key">"Lookup key"</string>
-    <string name="btn_share_encrypted_signed">"Encrypt and share message"</string>
-    <string name="btn_copy_encrypted_signed">"Encrypt and copy message"</string>
+    <string name="btn_share_encrypted_signed">"Encrypt and share text"</string>
+    <string name="btn_copy_encrypted_signed">"Encrypt and copy text"</string>
     <string name="btn_view_cert_key">"View certification key"</string>
     <string name="btn_create_key">"Create key"</string>
     <string name="btn_add_files">"Add file(s)"</string>
@@ -120,7 +120,7 @@
     <string name="menu_export_log">"Export Log"</string>
 
     <!-- label -->
-    <string name="label_message">"Message"</string>
+    <string name="label_message">"Text"</string>
     <string name="label_file">"File"</string>
     <string name="label_files">"File(s)"</string>
     <string name="label_file_colon">"File:"</string>
@@ -145,7 +145,7 @@
     <string name="label_symmetric">"Encrypt with passphrase"</string>
     <string name="label_passphrase_cache_ttl">"Cache time"</string>
     <string name="label_passphrase_cache_subs">"Cache passphrases by subkey"</string>
-    <string name="label_message_compression">"Message compression"</string>
+    <string name="label_message_compression">"Text compression"</string>
     <string name="label_file_compression">"File compression"</string>
     <string name="label_keyservers">"Keyservers"</string>
     <string name="label_key_id">"Key ID"</string>
@@ -558,7 +558,7 @@
     <string name="key_trust_maybe">"This key is neither revoked nor expired.\nYou haven’t confirmed it, but you may choose to trust it."</string>
     <string name="key_trust_revoked">"This key has been revoked by its owner. You should not trust it."</string>
     <string name="key_trust_expired">"This key has expired. You should not trust it."</string>
-    <string name="key_trust_old_keys">" It may be OK to use this to decrypt an old message dating from the time when this key was valid."</string>
+    <string name="key_trust_old_keys">"It may be OK to use this to decrypt an old message dating from the time when this key was valid."</string>
     <string name="key_trust_no_cloud_evidence">"No proof from the cloud on this key’s trustworthiness."</string>
     <string name="key_trust_start_cloud_search">"Start search"</string>
     <string name="key_trust_results_prefix">"Keybase.io offers “proofs” which assert that the owner of this key: "</string>