diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 3ee673f02e..380d8d8b62 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -449,7 +449,7 @@ def revert_use_stmaryrd(document):
                     "sslash", "bbslash", "moo", "varotimes", "varoast", \
                     "varobar", "varodot", "varoslash", "varobslash", \
                     "varocircle", "varoplus", "varominus", "boxast", \
-                    "boxbar", "boxdot", "boxslash", "boxbslash", "boxcircle", \
+                    "boxbar", "boxslash", "boxbslash", "boxcircle", \
                     "boxbox", "boxempty", "merge", "vartimes", \
                     "fatsemi", "sswarrow", "ssearrow", "curlywedgeuparrow", \
                     "curlywedgedownarrow", "fatslash", "fatbslash", "lbag", \
@@ -475,7 +475,7 @@ def revert_use_stmaryrd(document):
                     "Mapsto", "mapsfrom", "Mapsfrom" "Longmapsto", \
                     "longmapsfrom", "Longmapsfrom"]
         # commands provided by stmaryrd.sty but LyX uses other packages:
-        # lightning, bigtriangledown, bigtriangleup
+        # boxdot lightning, bigtriangledown, bigtriangleup
 
         i = 0
         while True:
diff --git a/lib/symbols b/lib/symbols
index e84a92c8bf..2ed922c6a5 100644
--- a/lib/symbols
+++ b/lib/symbols
@@ -419,7 +419,6 @@ llcorner           msa         120   0 mathopen  ⌞
 lrcorner           msa         121   0 mathclose  ⌟
 rightleftharpoons  msa         173   0 mathrel  ⇋
 angle              msa          92 208 mathord  ∠
-hbar               msb         126   0 mathord  ℏ
 sqsubset           msa          64   0 mathrel  ⊏
 sqsupset           msa          65   0 mathrel  ⊐
 mho                msb         102   0 mathord  ℧
@@ -432,8 +431,6 @@ vartriangleleft    msa          67   0 mathrel  ◃
 trianglerighteq    msa          68   0 mathrel  ⊵
 trianglelefteq     msa          69   0 mathrel  ⊴
 rightsquigarrow    msa         195   0 mathrel  ↝
-# This may not be right, but is the closest I can find.
-leadsto            msa         195   0 mathrel  ⤳
 lhd                msa          67   0 mathbin  ◃
 unlhd              msa          69   0 mathbin  ⊴
 rhd                msa          66   0 mathbin  ▹
@@ -793,13 +790,13 @@ Thorn              wasy         106   0 x        Þ
 openo              wasy         108   0 x        ɔ
 inve               wasy          85   0 x        ə
 
-mho               wasy          48    0  mathord ℧
+#mho               wasy          48    0  mathord ℧ # already in amsfonts
 #Join              wasy          49    0  mathrel x
 #Box               wasy          50    0  mathord x
 #Diamond           wasy          51    0  mathord x
-leadsto            wasy          59    0  mathrel ⤳
-sqsubset          wasy          60    0  mathrel ⊏
-sqsupset          wasy          61    0  mathrel ⊐
+leadsto            wasy          59    0  mathrel ⤳
+#sqsubset          wasy          60    0  mathrel ⊏ # already in amsfonts
+#sqsupset          wasy          61    0  mathrel ⊐ # already in amsfonts
 #lhd               wasy           1    0  mathbin x
 #unlhd             wasy           2    0  mathbin x
 LHD                wasy          16    0  mathbin ⱐ
@@ -846,7 +843,7 @@ varoplus           stmry  22   0 mathbin    x  stmaryrd
 varominus          stmry  23   0 mathbin    x  stmaryrd
 boxast             stmry  24   0 mathbin    x  stmaryrd
 boxbar             stmry  25   0 mathbin    x  stmaryrd
-boxdot             stmry  26   0 mathbin    x  stmaryrd
+#boxdot             stmry  26   0 mathbin    x  stmaryrd # already in amssymb
 boxslash           stmry  27   0 mathbin    x  stmaryrd
 boxbslash          stmry  28   0 mathbin    x  stmaryrd
 boxcircle          stmry  29   0 mathbin    x  stmaryrd
diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index 249447e138..c11a9f4cf8 100644
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
@@ -1868,7 +1868,8 @@
 0x219a ""                         "" "" "\\nleftarrow" "amssymb" # LEFTWARDS ARROW WITH STROKE
 0x219b ""                         "" "" "\\nrightarrow" "amssymb" # RIGHTWARDS ARROW WITH STROKE
 #0x219c ""                         "" "" "" "" # LEFTWARDS WAVE ARROW
-0x219d ""                         "" "" "\\leadsto" "amssymb" # RIGHTWARDS WAVE ARROW
+# amssymb and amsfonts define leadsto as well, but wrong (looks like 0x21dd)
+0x219d ""                         "" "" "\\leadsto" "latexsym|wasysym" # RIGHTWARDS WAVE ARROW,
 0x219e ""                         "" "" "\\twoheadleftarrow" "amssymb" # LEFTWARDS TWO HEADED ARROW
 #0x219f ""                         "" "" "" "" # UPWARDS TWO HEADED ARROW
 0x21a0 ""                         "" "" "\\twoheadrightarrow" "amssymb" # RIGHTWARDS TWO HEADED ARROW