Noumerous bugfixes pointed in Rocket Chat

8 files changed, 364 insertions, 215 deletions

diff --git a/share/icons/Tango/scalable/actions/dialog-selectors.svg b/share/icons/Tango/scalable/actions/dialog-selectors.svg
index 52fe28e6f..259b91c88 100644
--- a/share/icons/Tango/scalable/actions/dialog-selectors.svg
+++ b/share/icons/Tango/scalable/actions/dialog-selectors.svg
@@ -5,19 +5,19 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (f852c7108f, 2019-08-28)"
+   inkscape:version="1.0alpha2 (6b3f07e86c, 2019-08-28, custom)"
    sodipodi:docname="dialog-selectors.svg"
-   viewBox="0 0 16 16"
-   height="16"
-   width="16"
-   id="svg1"
-   version="1.1">
+   version="1.1"
+   height="16.001566"
+   width="16.000858"
+   id="svg1">
   <style
-     id="style3245"></style>
+     id="style4923"></style>
   <metadata
-     id="metadata1679">
+     id="metadata3345">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -28,78 +28,134 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs
-     id="defs1677" />
   <sodipodi:namedview
-     inkscape:current-layer="layercompo"
+     inkscape:current-layer="dialog-xml-editor"
      inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
      inkscape:window-height="1376"
      inkscape:window-width="2560"
+     inkscape:cy="6.3247212"
+     inkscape:cx="13.818616"
+     inkscape:zoom="32.59056"
      inkscape:document-rotation="0"
-     inkscape:window-y="27"
-     inkscape:window-x="0"
-     inkscape:cy="7.1678536"
-     inkscape:cx="4.8770631"
-     inkscape:zoom="31.678384"
      showgrid="true"
-     id="namedview"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10">
+     id="base">
     <inkscape:grid
-       id="grid"
-       type="xygrid" />
+       empspacing="5"
+       empopacity="0.38"
+       opacity="0.15"
+       empcolor="#3f3fff"
+       color="#3f3fff"
+       spacingy="1pt"
+       spacingx="1pt"
+       originy="0pt"
+       originx="0pt"
+       type="xygrid"
+       id="GridFromPre046Settings" />
   </sodipodi:namedview>
+  <defs
+     id="defs3">
+    <linearGradient
+       y2="350.1636"
+       y1="343.258"
+       xlink:href="#linearGradient1887"
+       x2="130.3522"
+       x1="121.1177"
+       inkscape:collect="always"
+       id="linearGradient5684"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient1887">
+      <stop
+         style="stop-color:#fffdf8;stop-opacity:1"
+         offset="0"
+         id="stop1888" />
+      <stop
+         style="stop-color:#cdccc7;stop-opacity:1"
+         offset="1"
+         id="stop1889" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5704">
+      <stop
+         style="stop-color:#5a5a5a;stop-opacity:1"
+         offset="0"
+         id="stop5706" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop5708" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5740">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop5742" />
+      <stop
+         style="stop-color:#98b6d3;stop-opacity:1"
+         offset="1"
+         id="stop5744" />
+    </linearGradient>
+    <linearGradient
+       y2="46.339"
+       y1="46.33899"
+       xlink:href="#linearGradient5740"
+       x2="414.2602"
+       x1="404.6787"
+       inkscape:collect="always"
+       id="linearGradient5686"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.001797,0,0,0.906445,-290.1978,295.2598)" />
+    <linearGradient
+       gradientTransform="translate(-162.16667,-210.6)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5696-3"
+       inkscape:collect="always"
+       x1="160"
+       x2="175.2934"
+       xlink:href="#linearGradient5704"
+       y1="213"
+       y2="213.07851" />
+  </defs>
   <g
-     inkscape:label="dialogselector"
-     id="layercompo"
-     inkscape:groupmode="layer">
-    <path
-       style="opacity:0;fill:none"
-       d="M 0,0 H 16 V 16 H 0 Z"
-       id="rect22048" />
-    <path
-       style="opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.045781;stop-opacity:1"
-       inkscape:connector-curvature="0"
-       d="M 2.4305525,14.178131 1.1912137,0.2780881 H 14.808787 L 13.568304,14.175887 7.9916682,15.721913 Z m 0,0"
-       id="path3339"
-       fill="#1572B6" />
-    <path
-       style="opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.045781;stop-opacity:1"
-       inkscape:connector-curvature="0"
-       d="M 8.0000919,14.540213 12.506183,13.29094 13.566335,1.4146485 H 8.0000919 Z m 0,0"
-       id="path3341"
-       fill="#33A9DC" />
+     transform="translate(-54.999196,-189.99763)"
+     inkscape:label="#xml_editor"
+     id="dialog-xml-editor">
     <g
-       style="opacity:1;fill:none;fill-rule:evenodd;stroke:none;stroke-width:1;stop-opacity:1"
-       id="Group"
-       transform="matrix(0.04578105,0,0,0.04578105,3.705921,2.9942778)">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 93.797,75.496 h 49.275 l 3.403,-38.132 H 93.797 V 0.125 h 0.129 93.246 l -0.893,9.991 -9.152,102.616 h -83.33 z m 0,0"
-         id="path3343"
-         fill="#FFFFFF" />
-      <path
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 94.02,172.204 -0.163,0.046 -41.472,-11.199 c 0,0 -2.275206,0.042 -2.275206,-15.79682 h -20.151 -17.228 L 17.57,189.82 l 76.278,21.176 0.172,-0.048 z"
-         id="path3345"
-         fill="#EBEBEB" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 139.907,111.156 -4.484,49.87 -41.532,11.21 v 38.742 l 76.339,-21.158 0.56,-6.29 6.478,-72.374 z m 0,0"
-         id="path3347"
-         fill="#FFFFFF" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 93.926,0.125 v 23.128 14.019 0.092 H 4.098 3.979 L 3.232,28.994 1.535,10.116 0.645,0.125 Z m 0,0"
-         id="path3349"
-         fill="#EBEBEB" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 93.797,75.5 v 23.129 14.017 0.092 H 52.969 52.85 L 52.104,104.369 50.406,85.491 49.516,75.5 Z m 0,0"
-         id="path3351"
-         fill="#EBEBEB" />
+       transform="matrix(1,0,0,0.996869,-60.05772,-144.2098)"
+       id="g5620">
+      <rect
+         y="338.8083"
+         x="115.5577"
+         width="14.99917"
+         style="color:#000000;fill:url(#linearGradient5684);fill-rule:evenodd;stroke:#000000;stroke-width:1.0015693;stroke-linecap:round;stroke-linejoin:round"
+         id="rect5622"
+         height="11.99987" />
+      <rect
+         y="335.7579"
+         x="115.5588"
+         width="14.99819"
+         style="color:#000000;fill:url(#linearGradient5686);fill-rule:evenodd;stroke:#000000;stroke-width:1.0015692;stroke-linecap:round;stroke-linejoin:round"
+         id="rect5624"
+         height="3.011261" />
+      <g
+         style="color:#000000;font-size:11.1186px;line-height:1;font-family:Lato;-inkscape-font-specification:Lato;font-variation-settings:normal;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;overflow:visible;opacity:1;vector-effect:none;fill:#1a1a1a;fill-opacity:1;stroke:url(#linearGradient5696);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill;stop-color:#000000;stop-opacity:1"
+         id="text4986"
+         transform="matrix(1.1220439,0,0,0.89402995,114.9747,335.25712)"
+         aria-label="{ }">
+        <path
+           inkscape:connector-curvature="0"
+           id="path5021"
+           style="font-variation-settings:normal;vector-effect:none;fill:#1a1a1a;fill-opacity:1;stroke:url(#linearGradient5696);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+           d="m 5.0818471,6.0673442 q -0.4336254,0 -0.6782346,0.2835243 -0.2446092,0.277965 -0.2446092,0.7560648 0,0.3113208 0.038915,0.6004044 0.038915,0.2890836 0.088949,0.5670486 0.050034,0.2724057 0.088949,0.5448114 0.038915,0.2724057 0.038915,0.5503707 0,0.2056941 -0.061152,0.389151 -0.061152,0.1778976 -0.1778976,0.3224396 -0.111186,0.144542 -0.2668464,0.250168 -0.1501011,0.100068 -0.333558,0.150101 0.1834569,0.05003 0.333558,0.150101 0.1556604,0.100068 0.2668464,0.24461 0.1167453,0.144541 0.1778976,0.327998 0.061152,0.177898 0.061152,0.383592 0,0.277965 -0.038915,0.550371 -0.038915,0.272405 -0.088949,0.55037 -0.050034,0.272406 -0.088949,0.56149 -0.038915,0.289083 -0.038915,0.600404 0,0.483659 0.2446092,0.761624 0.2446092,0.277965 0.6782346,0.277965 h 0.111186 q 0.066712,0 0.1445418,0.05003 0.07783,0.05003 0.07783,0.16122 v 0.444744 h -0.300202 q -0.4503033,0 -0.7949799,-0.133424 Q 3.9811057,15.28466 3.7476151,15.051169 3.5196838,14.817678 3.4029385,14.495239 3.2917525,14.1728 3.2917525,13.789208 q 0,-0.289084 0.044474,-0.561489 0.044474,-0.277965 0.094508,-0.550371 0.050034,-0.277965 0.094508,-0.550371 0.044474,-0.272406 0.044474,-0.550371 0,-0.350235 -0.1945755,-0.572607 -0.1945755,-0.227932 -0.5614893,-0.227932 v -0.594845 q 0.3669138,0 0.5614893,-0.2223718 0.1945755,-0.222372 0.1945755,-0.5781672 0,-0.277965 -0.044474,-0.5503707 Q 3.4807687,8.5579106 3.430735,8.2855049 3.3807013,8.0130992 3.3362269,7.7351342 3.2917525,7.4571692 3.2917525,7.1680856 q 0,-0.3835917 0.111186,-0.7060311 Q 3.5196838,6.1396151 3.7476151,5.9061245 3.9811057,5.6726339 4.320223,5.54477 4.6648996,5.4169061 5.1152029,5.4169061 h 0.3002022 v 0.4391847 q 0,0.111186 -0.07783,0.1612197 -0.07783,0.050034 -0.1445418,0.050034 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5023"
+           style="font-variation-settings:normal;vector-effect:none;fill:#1a1a1a;fill-opacity:1;stroke:url(#linearGradient5696);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+           d="m 11.593351,10.776071 q -0.366914,0 -0.561489,0.227932 -0.194576,0.222372 -0.194576,0.572607 0,0.277965 0.04447,0.550371 0.04447,0.272406 0.09451,0.550371 0.05003,0.272406 0.09451,0.550371 0.04447,0.272405 0.04447,0.561489 0,0.383592 -0.116745,0.706031 -0.111186,0.322439 -0.344677,0.55593 -0.227931,0.233491 -0.572608,0.361354 -0.3391169,0.133424 -0.7894202,0.133424 H 8.9915986 v -0.444744 q 0,-0.111186 0.07783,-0.16122 0.083389,-0.05003 0.1445418,-0.05003 h 0.111186 q 0.4336254,0 0.6782346,-0.277965 0.244609,-0.277965 0.244609,-0.761624 0,-0.311321 -0.03891,-0.600404 -0.03891,-0.289084 -0.08895,-0.56149 -0.05003,-0.277965 -0.08895,-0.55037 -0.038915,-0.272406 -0.038915,-0.550371 0,-0.205694 0.061152,-0.383592 0.06115,-0.183457 0.172338,-0.327998 0.116745,-0.144542 0.266847,-0.24461 0.15566,-0.100067 0.339117,-0.150101 -0.183457,-0.05003 -0.339117,-0.150101 Q 10.34251,10.225705 10.225765,10.081163 10.114579,9.936621 10.053427,9.7587234 9.992275,9.5752665 9.992275,9.3695724 q 0,-0.277965 0.038915,-0.5503707 Q 10.0701,8.546796 10.12014,8.2743903 10.17017,7.9964253 10.20909,7.7073417 10.248,7.4182541 10.248,7.1069333 10.248,6.6288335 10.003391,6.3508685 9.758782,6.0673442 9.3251566,6.0673442 h -0.111186 q -0.061152,0 -0.1445418,-0.050034 -0.07783,-0.050034 -0.07783,-0.1612197 V 5.4169061 H 9.291801 q 0.4503033,0 0.78942,0.1278639 0.344677,0.1278639 0.572608,0.3613545 0.233491,0.2334906 0.344677,0.55593 0.116745,0.3224394 0.116745,0.7060311 0,0.2890836 -0.04447,0.5670486 -0.04448,0.277965 -0.09451,0.5503707 -0.05003,0.2724057 -0.09451,0.5448114 -0.04447,0.2724057 -0.04447,0.5503707 0,0.3557952 0.194576,0.5781672 0.194575,0.2223718 0.561489,0.2223718 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/share/icons/hicolor/scalable/actions/dialog-selectors.svg b/share/icons/hicolor/scalable/actions/dialog-selectors.svg
index 648503940..da8c115a8 100644
--- a/share/icons/hicolor/scalable/actions/dialog-selectors.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-selectors.svg
@@ -5,101 +5,157 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0alpha2 (f852c7108f, 2019-08-28)"
+   inkscape:version="1.0alpha2 (6b3f07e86c, 2019-08-28, custom)"
    sodipodi:docname="dialog-selectors.svg"
-   viewBox="0 0 16 16"
-   height="16"
-   width="16"
-   id="svg1"
-   version="1.1">
+   version="1.1"
+   height="16.001566"
+   width="16.000858"
+   id="svg1">
   <style
-     id="style3245"></style>
+     id="style4923"></style>
   <metadata
-     id="metadata1679">
+     id="metadata3345">
     <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></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs
-     id="defs1677" />
   <sodipodi:namedview
-     inkscape:current-layer="layercompo"
+     inkscape:current-layer="dialog-xml-editor"
      inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
      inkscape:window-height="1376"
      inkscape:window-width="2560"
+     inkscape:cy="6.2005007"
+     inkscape:cx="13.514692"
+     inkscape:zoom="32.59056"
      inkscape:document-rotation="0"
-     inkscape:window-y="27"
-     inkscape:window-x="0"
-     inkscape:cy="7.1678536"
-     inkscape:cx="4.8770631"
-     inkscape:zoom="31.678384"
      showgrid="true"
-     id="namedview"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10">
+     id="base">
     <inkscape:grid
-       id="grid"
-       type="xygrid" />
+       empspacing="5"
+       empopacity="0.38"
+       opacity="0.15"
+       empcolor="#3f3fff"
+       color="#3f3fff"
+       spacingy="1pt"
+       spacingx="1pt"
+       originy="0pt"
+       originx="0pt"
+       type="xygrid"
+       id="GridFromPre046Settings" />
   </sodipodi:namedview>
+  <defs
+     id="defs3">
+    <linearGradient
+       y2="350.1636"
+       y1="343.258"
+       xlink:href="#linearGradient1887"
+       x2="130.3522"
+       x1="121.1177"
+       inkscape:collect="always"
+       id="linearGradient5684"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient1887">
+      <stop
+         style="stop-color:#fffdf8;stop-opacity:1"
+         offset="0"
+         id="stop1888" />
+      <stop
+         style="stop-color:#cdccc7;stop-opacity:1"
+         offset="1"
+         id="stop1889" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5704">
+      <stop
+         style="stop-color:#5a5a5a;stop-opacity:1"
+         offset="0"
+         id="stop5706" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop5708" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5740">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop5742" />
+      <stop
+         style="stop-color:#98b6d3;stop-opacity:1"
+         offset="1"
+         id="stop5744" />
+    </linearGradient>
+    <linearGradient
+       y2="46.339"
+       y1="46.33899"
+       xlink:href="#linearGradient5740"
+       x2="414.2602"
+       x1="404.6787"
+       inkscape:collect="always"
+       id="linearGradient5686"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.001797,0,0,0.906445,-290.1978,295.2598)" />
+    <linearGradient
+       gradientTransform="translate(-162.16667,-210.6)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5696-3"
+       inkscape:collect="always"
+       x1="160"
+       x2="175.2934"
+       xlink:href="#linearGradient5704"
+       y1="213"
+       y2="213.07851" />
+  </defs>
   <g
-     inkscape:label="dialogselector"
-     id="layercompo"
-     inkscape:groupmode="layer">
-    <path
-       style="opacity:0;fill:none"
-       d="M 0,0 H 16 V 16 H 0 Z"
-       id="rect22048" />
-    <path
-       style="opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.045781;stop-opacity:1"
-       inkscape:connector-curvature="0"
-       d="M 2.4305525,14.178131 1.1912137,0.2780881 H 14.808787 L 13.568304,14.175887 7.9916682,15.721913 Z m 0,0"
-       id="path3339"
-       fill="#1572B6" />
-    <path
-       style="opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.045781;stop-opacity:1"
-       inkscape:connector-curvature="0"
-       d="M 8.0000919,14.540213 12.506183,13.29094 13.566335,1.4146485 H 8.0000919 Z m 0,0"
-       id="path3341"
-       fill="#33A9DC" />
+     transform="translate(-54.999196,-189.99763)"
+     inkscape:label="#xml_editor"
+     id="dialog-xml-editor">
     <g
-       style="opacity:1;fill:none;fill-rule:evenodd;stroke:none;stroke-width:1;stop-opacity:1"
-       id="Group"
-       transform="matrix(0.04578105,0,0,0.04578105,3.705921,2.9942778)">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 93.797,75.496 h 49.275 l 3.403,-38.132 H 93.797 V 0.125 h 0.129 93.246 l -0.893,9.991 -9.152,102.616 h -83.33 z m 0,0"
-         id="path3343"
-         fill="#FFFFFF" />
-      <path
-         sodipodi:nodetypes="cccccccccc"
-         inkscape:connector-curvature="0"
-         d="m 94.02,172.204 -0.163,0.046 -41.472,-11.199 c 0,0 -2.275206,0.042 -2.275206,-15.79682 h -20.151 -17.228 L 17.57,189.82 l 76.278,21.176 0.172,-0.048 z"
-         id="path3345"
-         fill="#EBEBEB" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 139.907,111.156 -4.484,49.87 -41.532,11.21 v 38.742 l 76.339,-21.158 0.56,-6.29 6.478,-72.374 z m 0,0"
-         id="path3347"
-         fill="#FFFFFF" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 93.926,0.125 v 23.128 14.019 0.092 H 4.098 3.979 L 3.232,28.994 1.535,10.116 0.645,0.125 Z m 0,0"
-         id="path3349"
-         fill="#EBEBEB" />
-      <path
-         inkscape:connector-curvature="0"
-         d="m 93.797,75.5 v 23.129 14.017 0.092 H 52.969 52.85 L 52.104,104.369 50.406,85.491 49.516,75.5 Z m 0,0"
-         id="path3351"
-         fill="#EBEBEB" />
+       transform="matrix(1,0,0,0.996869,-60.05772,-144.2098)"
+       id="g5620">
+      <rect
+         y="338.8083"
+         x="115.5577"
+         width="14.99917"
+         style="color:#000000;fill:url(#linearGradient5684);fill-rule:evenodd;stroke:#000000;stroke-width:1.0015693;stroke-linecap:round;stroke-linejoin:round"
+         id="rect5622"
+         height="11.99987" />
+      <rect
+         y="335.7579"
+         x="115.5588"
+         width="14.99819"
+         style="color:#000000;fill:url(#linearGradient5686);fill-rule:evenodd;stroke:#000000;stroke-width:1.0015692;stroke-linecap:round;stroke-linejoin:round"
+         id="rect5624"
+         height="3.011261" />
+      <g
+         style="color:#000000;font-size:11.1186px;line-height:1;font-family:Lato;-inkscape-font-specification:Lato;font-variation-settings:normal;text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;overflow:visible;opacity:1;vector-effect:none;fill:#1a1a1a;fill-opacity:1;stroke:url(#linearGradient5696);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill;stop-color:#000000;stop-opacity:1"
+         id="text4986"
+         transform="matrix(1.1220439,0,0,0.89402995,114.9747,335.25712)"
+         aria-label="{ }">
+        <path
+           inkscape:connector-curvature="0"
+           id="path5021"
+           style="font-variation-settings:normal;vector-effect:none;fill:#1a1a1a;fill-opacity:1;stroke:url(#linearGradient5696);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+           d="m 5.0818471,6.0673442 q -0.4336254,0 -0.6782346,0.2835243 -0.2446092,0.277965 -0.2446092,0.7560648 0,0.3113208 0.038915,0.6004044 0.038915,0.2890836 0.088949,0.5670486 0.050034,0.2724057 0.088949,0.5448114 0.038915,0.2724057 0.038915,0.5503707 0,0.2056941 -0.061152,0.389151 -0.061152,0.1778976 -0.1778976,0.3224396 -0.111186,0.144542 -0.2668464,0.250168 -0.1501011,0.100068 -0.333558,0.150101 0.1834569,0.05003 0.333558,0.150101 0.1556604,0.100068 0.2668464,0.24461 0.1167453,0.144541 0.1778976,0.327998 0.061152,0.177898 0.061152,0.383592 0,0.277965 -0.038915,0.550371 -0.038915,0.272405 -0.088949,0.55037 -0.050034,0.272406 -0.088949,0.56149 -0.038915,0.289083 -0.038915,0.600404 0,0.483659 0.2446092,0.761624 0.2446092,0.277965 0.6782346,0.277965 h 0.111186 q 0.066712,0 0.1445418,0.05003 0.07783,0.05003 0.07783,0.16122 v 0.444744 h -0.300202 q -0.4503033,0 -0.7949799,-0.133424 Q 3.9811057,15.28466 3.7476151,15.051169 3.5196838,14.817678 3.4029385,14.495239 3.2917525,14.1728 3.2917525,13.789208 q 0,-0.289084 0.044474,-0.561489 0.044474,-0.277965 0.094508,-0.550371 0.050034,-0.277965 0.094508,-0.550371 0.044474,-0.272406 0.044474,-0.550371 0,-0.350235 -0.1945755,-0.572607 -0.1945755,-0.227932 -0.5614893,-0.227932 v -0.594845 q 0.3669138,0 0.5614893,-0.2223718 0.1945755,-0.222372 0.1945755,-0.5781672 0,-0.277965 -0.044474,-0.5503707 Q 3.4807687,8.5579106 3.430735,8.2855049 3.3807013,8.0130992 3.3362269,7.7351342 3.2917525,7.4571692 3.2917525,7.1680856 q 0,-0.3835917 0.111186,-0.7060311 Q 3.5196838,6.1396151 3.7476151,5.9061245 3.9811057,5.6726339 4.320223,5.54477 4.6648996,5.4169061 5.1152029,5.4169061 h 0.3002022 v 0.4391847 q 0,0.111186 -0.07783,0.1612197 -0.07783,0.050034 -0.1445418,0.050034 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5023"
+           style="font-variation-settings:normal;vector-effect:none;fill:#1a1a1a;fill-opacity:1;stroke:url(#linearGradient5696);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+           d="m 11.593351,10.776071 q -0.366914,0 -0.561489,0.227932 -0.194576,0.222372 -0.194576,0.572607 0,0.277965 0.04447,0.550371 0.04447,0.272406 0.09451,0.550371 0.05003,0.272406 0.09451,0.550371 0.04447,0.272405 0.04447,0.561489 0,0.383592 -0.116745,0.706031 -0.111186,0.322439 -0.344677,0.55593 -0.227931,0.233491 -0.572608,0.361354 -0.3391169,0.133424 -0.7894202,0.133424 H 8.9915986 v -0.444744 q 0,-0.111186 0.07783,-0.16122 0.083389,-0.05003 0.1445418,-0.05003 h 0.111186 q 0.4336254,0 0.6782346,-0.277965 0.244609,-0.277965 0.244609,-0.761624 0,-0.311321 -0.03891,-0.600404 -0.03891,-0.289084 -0.08895,-0.56149 -0.05003,-0.277965 -0.08895,-0.55037 -0.038915,-0.272406 -0.038915,-0.550371 0,-0.205694 0.061152,-0.383592 0.06115,-0.183457 0.172338,-0.327998 0.116745,-0.144542 0.266847,-0.24461 0.15566,-0.100067 0.339117,-0.150101 -0.183457,-0.05003 -0.339117,-0.150101 Q 10.34251,10.225705 10.225765,10.081163 10.114579,9.936621 10.053427,9.7587234 9.992275,9.5752665 9.992275,9.3695724 q 0,-0.277965 0.038915,-0.5503707 Q 10.0701,8.546796 10.12014,8.2743903 10.17017,7.9964253 10.20909,7.7073417 10.248,7.4182541 10.248,7.1069333 10.248,6.6288335 10.003391,6.3508685 9.758782,6.0673442 9.3251566,6.0673442 h -0.111186 q -0.061152,0 -0.1445418,-0.050034 -0.07783,-0.050034 -0.07783,-0.1612197 V 5.4169061 H 9.291801 q 0.4503033,0 0.78942,0.1278639 0.344677,0.1278639 0.572608,0.3613545 0.233491,0.2334906 0.344677,0.55593 0.116745,0.3224394 0.116745,0.7060311 0,0.2890836 -0.04447,0.5670486 -0.04448,0.277965 -0.09451,0.5503707 -0.05003,0.2724057 -0.09451,0.5448114 -0.04447,0.2724057 -0.04447,0.5503707 0,0.3557952 0.194576,0.5781672 0.194575,0.2223718 0.561489,0.2223718 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/share/icons/hicolor/symbolic/actions/dialog-selectors-symbolic.svg b/share/icons/hicolor/symbolic/actions/dialog-selectors-symbolic.svg
index 3aef41591..ea69f203a 100644
--- a/share/icons/hicolor/symbolic/actions/dialog-selectors-symbolic.svg
+++ b/share/icons/hicolor/symbolic/actions/dialog-selectors-symbolic.svg
@@ -7,63 +7,90 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg1"
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
+   inkscape:version="1.0alpha2 (6b3f07e86c, 2019-08-28, custom)"
    sodipodi:docname="dialog-selectors-symbolic.svg"
-   inkscape:version="1.0alpha2 (f852c7108f, 2019-08-28)">
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1">
   <style
-     id="style3245"></style>
+     id="style8468"></style>
   <metadata
-     id="metadata1679">
+     id="metadata6901">
     <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></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs1677" />
+     id="defs6899" />
   <sodipodi:namedview
-     inkscape:snap-global="false"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     id="namedview"
-     showgrid="true"
-     inkscape:zoom="31.678384"
-     inkscape:cx="15.23293"
-     inkscape:cy="2.43449"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
      inkscape:document-rotation="0"
-     inkscape:window-width="2560"
-     inkscape:window-height="1376"
+     inkscape:current-layer="dialog-xml-editor"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layercompo">
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1376"
+     inkscape:window-width="2560"
+     inkscape:cy="7.5733863"
+     inkscape:cx="25.886647"
+     inkscape:zoom="19.209395"
+     showgrid="true"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10">
     <inkscape:grid
-       type="xygrid"
-       id="grid" />
+       id="grid"
+       type="xygrid" />
   </sodipodi:namedview>
   <g
-     inkscape:groupmode="layer"
-     id="layercompo"
-     inkscape:label="dialogselector">
-    <path
-       id="rect22048"
-       d="M 0,0 H 16 V 16 H 0 Z"
-       style="opacity:0;fill:none" />
+     id="dialog-xml-editor"
+     inkscape:label="00016"
+     transform="translate(-44.976438,-667.36216)">
+    <g
+       transform="matrix(0.9985297,0,0,1,30.02202,59.99998)"
+       id="g2966">
+      <path
+         style="opacity:0;fill:none"
+         d="m 14.97644,607.36218 h 16 v 16 h -16 z"
+         id="rect10285-1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:1"
+         d="m 17,609.3622 h 12 v 2 H 17 Z"
+         id="path10291-8"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:1"
+         d="m 15,607.36218 h 1 v 16 h -1 z"
+         id="rect10298-7"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:1"
+         d="m 15,607.36218 h 16 v 1 H 15 Z"
+         id="rect10300-4"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:1"
+         d="m 30,607.36218 h 1 v 16 h -1 z"
+         id="rect10302-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:1"
+         d="m 15,622.36218 h 16 v 1 H 15 Z"
+         id="rect10304-6"
+         inkscape:connector-curvature="0" />
+    </g>
     <path
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccc"
-       inkscape:connector-curvature="0"
-       id="path3339"
-       style="stroke-width:1.21781"
-       d="M 1.2871094,0.38671875 2.5078125,14.091797 7.9921875,15.613281 13.498047,13.976562 14.712891,0.38671875 Z M 3.7949219,3.0683594 H 8 h 0.00391 4.2109378 l -0.04102,0.453125 -0.40625,4.7497641 -0.0078,0.072266 -0.285157,3.0060948 -0.02539,0.283203 -3.4394534,0.953126 -0.00586,0.002 H 8.0019531 8 L 4.5585938,11.632812 4.3222656,9.5449219 H 5.0996094 6.0117188 L 6.1308594,10.333984 8,10.839844 h 0.00195 l 0.00781,-0.002 1.8691406,-0.503907 0.1953128,-1.9904698 H 8 7.2335716 7.2296654 l -0.033203,-0.375 L 7.1202904,7.1130454 7.0792747,6.6638266 H 8 10.224609 L 10.378906,4.75 H 8.0039062 8 3.9511719 3.9472656 L 3.9121094,4.3730469 3.8359375,3.5214844 Z" />
+       id="path8483"
+       d="m 50.754864,672.36216 c -0.398968,0 -0.752305,0.0391 -1.057688,0.11729 -0.300457,0.0782 -0.553473,0.18853 -0.760346,0.33133 -0.201946,0.1428 -0.355319,0.31299 -0.458756,0.51019 -0.09851,0.1972 -0.146547,0.41341 -0.146547,0.64801 0,0.1768 0.02006,0.35046 0.05947,0.52046 0.0394,0.17 0.08098,0.33773 0.125309,0.50433 0.04433,0.1666 0.0859,0.33333 0.125308,0.49993 0.03941,0.1666 0.05947,0.33433 0.05947,0.50433 0,0.2176 -0.08672,0.39472 -0.259113,0.53072 -0.172393,0.136 -0.420394,0.20378 -0.745479,0.20378 v 0.54538 c 0.325085,0 0.573085,0.0702 0.745479,0.20965 0.172393,0.136 0.259113,0.31066 0.259113,0.52486 0,0.17 -0.02006,0.33919 -0.05947,0.5058 -0.0394,0.1666 -0.08098,0.33432 -0.125308,0.50433 -0.04433,0.1666 -0.0859,0.33579 -0.125309,0.50579 -0.03941,0.1666 -0.05947,0.33779 -0.05947,0.51459 0,0.23461 0.04804,0.45081 0.146547,0.64801 0.103436,0.1972 0.25681,0.36739 0.458756,0.5102 0.206873,0.1428 0.459889,0.25313 0.760346,0.33133 0.305383,0.0816 0.65872,0.12168 1.057688,0.12168 h 0.399287 v -0.40757 c 0,-0.068 -0.03511,-0.11747 -0.104069,-0.14807 -0.06896,-0.0306 -0.132042,-0.0455 -0.191148,-0.0455 h -0.148672 c -0.384191,0 -0.683797,-0.0851 -0.900521,-0.2551 -0.216723,-0.17 -0.324952,-0.40351 -0.324952,-0.69932 0,-0.1904 0.01649,-0.37444 0.05097,-0.55124 0.03448,-0.1768 0.07461,-0.34799 0.118937,-0.51459 0.04433,-0.17001 0.08233,-0.33773 0.116813,-0.50433 0.03448,-0.1666 0.0531,-0.3358 0.0531,-0.5058 0,-0.1258 -0.02865,-0.24306 -0.08283,-0.35186 -0.05418,-0.1122 -0.132313,-0.21214 -0.235749,-0.30054 -0.09851,-0.0884 -0.216772,-0.16311 -0.354687,-0.22431 -0.132989,-0.0612 -0.281346,-0.10721 -0.443889,-0.13781 0.162543,-0.0306 0.3109,-0.0766 0.443889,-0.13781 0.137915,-0.0646 0.256176,-0.14031 0.354687,-0.22871 0.103435,-0.0884 0.181568,-0.18735 0.235749,-0.29615 0.05418,-0.1122 0.08283,-0.23192 0.08283,-0.35772 0,-0.17 -0.01862,-0.33773 -0.0531,-0.50433 -0.03448,-0.1666 -0.07248,-0.33333 -0.116813,-0.49994 -0.04433,-0.17 -0.08446,-0.34365 -0.118937,-0.52045 -0.03448,-0.1768 -0.05097,-0.35938 -0.05097,-0.54978 0,-0.2924 0.108229,-0.52492 0.324952,-0.69492 0.216724,-0.1734 0.51633,-0.2595 0.900521,-0.2595 h 0.148671 c 0.05911,0 0.122191,-0.0148 0.191149,-0.0454 0.06896,-0.0306 0.104069,-0.0801 0.104069,-0.14807 v -0.40317 z m 4.04385,0 v 0.40317 c 0,0.068 0.03299,0.11747 0.101948,0.14807 0.07388,0.0306 0.139091,0.0454 0.193272,0.0454 h 0.146547 c 0.384191,0 0.685923,0.0861 0.902645,0.2595 0.216724,0.17 0.324952,0.40252 0.324952,0.69492 0,0.1904 -0.01862,0.37298 -0.05309,0.54978 -0.03447,0.1768 -0.07248,0.35045 -0.116812,0.52046 -0.04434,0.1666 -0.08445,0.33333 -0.118937,0.49993 -0.03448,0.1666 -0.05097,0.33433 -0.05097,0.50433 0,0.1258 0.02652,0.24552 0.08071,0.35772 0.05418,0.1088 0.130867,0.20775 0.229377,0.29615 0.103437,0.0884 0.221697,0.1641 0.354687,0.22871 0.137914,0.0612 0.287717,0.10721 0.450259,0.13781 -0.162542,0.0306 -0.312345,0.0766 -0.450259,0.13781 -0.13299,0.0612 -0.251252,0.13591 -0.354687,0.22431 -0.09851,0.0884 -0.175195,0.18834 -0.229377,0.30054 -0.05418,0.1088 -0.08071,0.22606 -0.08071,0.35186 0,0.17 0.0165,0.3392 0.05097,0.5058 0.03448,0.1666 0.0746,0.33433 0.118937,0.50433 0.04433,0.1666 0.08233,0.33779 0.116812,0.51459 0.03448,0.1768 0.05309,0.36084 0.05309,0.55125 0,0.2958 -0.108228,0.52931 -0.324952,0.69931 -0.216723,0.17001 -0.518453,0.2551 -0.902645,0.2551 h -0.146549 c -0.05418,0 -0.119391,0.0149 -0.193273,0.0455 -0.06896,0.0306 -0.101945,0.0801 -0.101945,0.14807 v 0.40757 h 0.397163 c 0.398968,0 0.748735,-0.0401 1.049193,-0.12168 0.305383,-0.0782 0.560522,-0.18853 0.76247,-0.33133 0.206871,-0.14281 0.358121,-0.313 0.456632,-0.5102 0.103437,-0.1972 0.155042,-0.4134 0.155042,-0.64801 0,-0.1768 -0.01794,-0.34799 -0.05734,-0.51459 -0.0394,-0.17 -0.08098,-0.33919 -0.125307,-0.50579 -0.04434,-0.17001 -0.08803,-0.33773 -0.127434,-0.50433 -0.03941,-0.16661 -0.05734,-0.3358 -0.05734,-0.5058 0,-0.2142 0.0846,-0.38886 0.256988,-0.52486 0.172393,-0.1394 0.422517,-0.20965 0.747603,-0.20965 v -0.54538 c -0.325086,0 -0.57521,-0.0678 -0.747603,-0.20378 -0.172393,-0.136 -0.256988,-0.31312 -0.256988,-0.53072 0,-0.17 0.01795,-0.33773 0.05734,-0.50433 0.03941,-0.1666 0.0831,-0.33333 0.127434,-0.49993 0.04433,-0.1666 0.08591,-0.33433 0.125307,-0.50433 0.03941,-0.17 0.05734,-0.34366 0.05734,-0.52046 0,-0.2346 -0.0516,-0.45081 -0.155042,-0.64801 -0.09851,-0.1972 -0.249762,-0.36739 -0.456632,-0.51019 -0.201948,-0.1428 -0.457087,-0.25313 -0.76247,-0.33133 -0.300457,-0.0782 -0.650225,-0.11729 -1.049193,-0.11729 z"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index 5ea806b89..6c66e44b6 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -2847,7 +2847,11 @@ const Glib::ustring SPIVectorEffect::get_value() const
     if (this->size)   ret += " non-scaling-size";
     if (this->rotate) ret += " non-rotation";
     if (this->fixed)  ret += " fixed-position";
-    if (ret.empty())  ret += "none";
+    if (ret.empty()) {
+        ret += "none";
+    } else {
+        ret.erase(0,1);
+    }
     return ret;
 }
 
diff --git a/src/ui/dialog/selectorsdialog.cpp b/src/ui/dialog/selectorsdialog.cpp
index 3cc0a1739..bbe0576dc 100644
--- a/src/ui/dialog/selectorsdialog.cpp
+++ b/src/ui/dialog/selectorsdialog.cpp
@@ -34,9 +34,9 @@
 #include <regex>
 #include <utility>
 
-// G_MESSAGES_DEBUG=DEBUG_STYLEDIALOG  gdb ./inkscape
-//#define DEBUG_SELECTORSDIALOG
-//#define G_LOG_DOMAIN "SELECTORSDIALOG"
+// G_MESSAGES_DEBUG=DEBUG_SELECTORSDIALOG  gdb ./inkscape
+// #define DEBUG_SELECTORSDIALOG
+// #define G_LOG_DOMAIN "SELECTORSDIALOG"
 
 using Inkscape::DocumentUndo;
 using Inkscape::Util::List;
@@ -380,6 +380,7 @@ void SelectorsDialog::_showWidgets()
     int panedpos = prefs->getInt("/dialogs/selectors/panedpos", widthpos / 2);
     _paned.property_position().signal_changed().connect(sigc::mem_fun(*this, &SelectorsDialog::_childresized));
     _paned.signal_size_allocate().connect(sigc::mem_fun(*this, &SelectorsDialog::_panedresized));
+    _paned.signal_realize().connect(sigc::mem_fun(*this, &SelectorsDialog::_panedrealized));
     _updating = true;
     _paned.property_position() = panedpos;
     _updating = false;
@@ -393,6 +394,11 @@ void SelectorsDialog::_panedresized(Gtk::Allocation allocation)
     _resized();
 }
 
+void SelectorsDialog::_panedrealized()
+{
+    _style_dialog->readStyleElement();
+}
+
 void SelectorsDialog::_childresized()
 {
     g_debug("SelectorsDialog::_childresized");
@@ -417,6 +423,7 @@ void SelectorsDialog::_resized()
     if (_paned.property_position() < min) {
         _paned.property_position() = min;
     }
+
     prefs->setInt("/dialogs/selectors/panedpos", _paned.property_position());
     _updating = false;
 }
@@ -504,14 +511,14 @@ Inkscape::XML::Node *SelectorsDialog::_getStyleTextNode()
  */
 void SelectorsDialog::_readStyleElement()
 {
-    g_debug("SelectorsDialog::_readStyleElement: updating %s", (_updating ? "true" : "false"));
+    g_debug("SelectorsDialog::_readStyleElement(): updating %s", (_updating ? "true" : "false"));
 
     if (_updating) return; // Don't read if we wrote style element.
     _updating = true;
     _scroollock = true;
     Inkscape::XML::Node * textNode = _getStyleTextNode();
     if (textNode == nullptr) {
-        std::cerr << "SelectorsDialog::_readStyleElement: No text node!" << std::endl;
+        std::cerr << "SelectorsDialog::_readStyleElement(): No text node!" << std::endl;
     }
 
     // Get content from style text node.
@@ -583,7 +590,7 @@ void SelectorsDialog::_readStyleElement()
         if ((i+1) < tokens.size()) {
             properties = tokens[i+1];
         } else {
-            std::cerr << "SelectorsDialog::_readStyleElement: Missing values "
+            std::cerr << "SelectorsDialog::_readStyleElement(): Missing values "
                          "for last selector!"
                       << std::endl;
         }
diff --git a/src/ui/dialog/selectorsdialog.h b/src/ui/dialog/selectorsdialog.h
index 66d9bb859..d304ccfad 100644
--- a/src/ui/dialog/selectorsdialog.h
+++ b/src/ui/dialog/selectorsdialog.h
@@ -55,9 +55,8 @@ class SelectorsDialog : public Widget::Panel {
     SelectorsDialog();
     SelectorsDialog(SelectorsDialog const &d) = delete;
     SelectorsDialog operator=(SelectorsDialog const &d) = delete;
-
     static SelectorsDialog &getInstance() { return *new SelectorsDialog(); }
-
+    
   private:
     // Monitor <style> element for changes.
     class NodeObserver;
@@ -119,6 +118,7 @@ class SelectorsDialog : public Widget::Panel {
     Gtk::TreeView _treeView;
     Gtk::TreeModel::Path _lastpath;
     // Widgets
+    StyleDialog *_style_dialog;
     Gtk::Paned _paned;
     Glib::RefPtr<Gtk::Adjustment> _vadj;
     Gtk::Box _button_box;
@@ -127,7 +127,6 @@ class SelectorsDialog : public Widget::Panel {
 
     Gtk::Button _del;
     Gtk::Button _create;
-    StyleDialog *_style_dialog;
     // Reading and writing the style element.
     Inkscape::XML::Node *_getStyleTextNode();
     void _readStyleElement();
@@ -154,9 +153,9 @@ class SelectorsDialog : public Widget::Panel {
 
     void _selectObjects(int, int);
     // Variables
-    bool _updating;  // Prevent cyclic actions: read <-> write, select via dialog <-> via desktop
     double _scroolpos;
     bool _scroollock;
+    bool _updating;  // Prevent cyclic actions: read <-> write, select via dialog <-> via desktop
     Inkscape::XML::Node *_textNode; // Track so we know when to add a NodeObserver.
 
     // Signals and handlers - External
@@ -167,6 +166,7 @@ class SelectorsDialog : public Widget::Panel {
     void _handleDocumentReplaced(SPDesktop* desktop, SPDocument *document);
     void _handleDesktopChanged(SPDesktop* desktop);
     void _handleSelectionChanged();
+    void _panedrealized();
     void _rowExpand(const Gtk::TreeModel::iterator &iter, const Gtk::TreeModel::Path &path);
     void _rowCollapse(const Gtk::TreeModel::iterator &iter, const Gtk::TreeModel::Path &path);
     void _closeDialog(Gtk::Dialog *textDialogPtr);
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index 89c6337ef..975e28dd7 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -79,7 +79,7 @@ void StyleDialog::NodeObserver::notifyContentChanged(Inkscape::XML::Node & /*nod
 
     g_debug("StyleDialog::NodeObserver::notifyContentChanged");
     _styledialog->_updating = false;
-    _styledialog->_readStyleElement();
+    _styledialog->readStyleElement();
 }
 
 
@@ -148,7 +148,7 @@ void StyleDialog::_nodeAdded(Inkscape::XML::Node &node)
     node.addObserver(*w);
     _nodeWatchers.push_back(w);
 
-    _readStyleElement();
+    readStyleElement();
 }
 
 void StyleDialog::_nodeRemoved(Inkscape::XML::Node &repr)
@@ -163,19 +163,19 @@ void StyleDialog::_nodeRemoved(Inkscape::XML::Node &repr)
             break;
         }
     }
-    _readStyleElement();
+    readStyleElement();
 }
 
 void StyleDialog::_nodeChanged(Inkscape::XML::Node &object)
 {
     g_debug("StyleDialog::_nodeChanged");
-    _readStyleElement();
+    readStyleElement();
 }
 
 /* void
 StyleDialog::_stylesheetChanged( Inkscape::XML::Node &repr ) {
     std::cout << "Style tag modified" << std::endl;
-    _readStyleElement();
+    readStyleElement();
 } */
 
 /**
@@ -221,7 +221,7 @@ StyleDialog::StyleDialog()
     _updateWatchers();
 
     // Load tree
-    _readStyleElement();
+    readStyleElement();
 }
 
 void StyleDialog::_vscrool()
@@ -282,7 +282,7 @@ StyleDialog::~StyleDialog()
     _selection_changed_connection.disconnect();
 }
 
-void StyleDialog::_reload() { _readStyleElement(); }
+void StyleDialog::_reload() { readStyleElement(); }
 
 /**
  * @return Inkscape::XML::Node* pointing to a style element's text node.
@@ -379,7 +379,7 @@ void StyleDialog::setCurrentSelector(Glib::ustring current_selector)
 {
     g_debug("StyleDialog::setCurrentSelector");
     _current_selector = current_selector;
-    _readStyleElement();
+    readStyleElement();
 }
 
 // copied from style.cpp:1499
@@ -397,9 +397,9 @@ static bool is_url(char const *p)
 /**
  * Fill the Gtk::TreeStore from the svg:style element.
  */
-void StyleDialog::_readStyleElement()
+void StyleDialog::readStyleElement()
 {
-    g_debug("StyleDialog::_readStyleElement");
+    g_debug("StyleDialog::readStyleElement");
 
     if (_updating)
         return; // Don't read if we wrote style element.
@@ -407,7 +407,7 @@ void StyleDialog::_readStyleElement()
     _scroollock = true;
     Inkscape::XML::Node *textNode = _getStyleTextNode();
     if (textNode == nullptr) {
-        std::cerr << "StyleDialog::_readStyleElement: No text node!" << std::endl;
+        std::cerr << "StyleDialog::readStyleElement: No text node!" << std::endl;
     }
     SPDocument *document = SP_ACTIVE_DOCUMENT;
 
@@ -620,7 +620,7 @@ void StyleDialog::_readStyleElement()
         if ((i + 1) < tokens.size()) {
             properties = tokens[i + 1];
         } else {
-            std::cerr << "StyleDialog::_readStyleElement: Missing values "
+            std::cerr << "StyleDialog::readStyleElement: Missing values "
                          "for last selector!"
                       << std::endl;
         }
@@ -659,14 +659,14 @@ void StyleDialog::_readStyleElement()
          */
         Inkscape::UI::Widget::IconRenderer *addRenderer = manage(new Inkscape::UI::Widget::IconRenderer());
         addRenderer->add_icon("edit-delete");
-        int addCol = css_tree->append_column("Delete row", *addRenderer) - 1;
+        int addCol = css_tree->append_column("", *addRenderer) - 1;
         Gtk::TreeViewColumn *col = css_tree->get_column(addCol);
         if (col) {
             addRenderer->signal_activated().connect(
                 sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(sigc::mem_fun(*this, &StyleDialog::_onPropDelete), store));
         }
         Gtk::CellRendererToggle *active = Gtk::manage(new Gtk::CellRendererToggle);
-        addCol = css_tree->append_column("Active Property", *active) - 1;
+        addCol = css_tree->append_column("", *active) - 1;
         col = css_tree->get_column(addCol);
         if (col) {
             col->add_attribute(active->property_active(), _mColumns._colActive);
@@ -692,7 +692,7 @@ void StyleDialog::_readStyleElement()
             sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(sigc::mem_fun(*this, &StyleDialog::_valueEdited), store));
         value->signal_editing_started().connect(
             sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(sigc::mem_fun(*this, &StyleDialog::_startValueEdit), store));
-        addCol = css_tree->append_column("CSS Value", *value) - 1;
+        addCol = css_tree->append_column("", *value) - 1;
         col = css_tree->get_column(addCol);
         if (col) {
             col->add_attribute(value->property_text(), _mColumns._colValue);
@@ -808,7 +808,7 @@ void StyleDialog::_readStyleElement()
                             Inkscape::UI::Widget::IconRenderer *addRenderer =
                                 manage(new Inkscape::UI::Widget::IconRenderer());
                             addRenderer->add_icon("edit-delete");
-                            int addCol = css_tree->append_column("Delete row", *addRenderer) - 1;
+                            int addCol = css_tree->append_column("", *addRenderer) - 1;
                             Gtk::TreeViewColumn *col = css_tree->get_column(addCol);
                             if (col) {
                                 addRenderer->signal_activated().connect(sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(
@@ -820,7 +820,7 @@ void StyleDialog::_readStyleElement()
                             label->signal_edited().connect(sigc::bind<Glib::RefPtr<Gtk::TreeStore>, Gtk::TreeView *>(
                                 sigc::mem_fun(*this, &StyleDialog::_nameEdited), store, css_tree));
                             label->signal_editing_started().connect(sigc::mem_fun(*this, &StyleDialog::_startNameEdit));
-                            addCol = css_tree->append_column("CSS Property", *label) - 1;
+                            addCol = css_tree->append_column("", *label) - 1;
                             col = css_tree->get_column(addCol);
                             if (col) {
                                 col->set_resizable(true);
@@ -834,7 +834,7 @@ void StyleDialog::_readStyleElement()
                             value->signal_editing_started().connect(sigc::bind<Glib::RefPtr<Gtk::TreeStore>>(
                                 sigc::mem_fun(*this, &StyleDialog::_startValueEdit), store));
 
-                            addCol = css_tree->append_column("CSS Value", *value) - 1;
+                            addCol = css_tree->append_column("", *value) - 1;
                             col = css_tree->get_column(addCol);
                             if (col) {
                                 col->add_attribute(value->property_text(), _mColumns._colValue);
@@ -1046,7 +1046,7 @@ void StyleDialog::_writeStyleElement(Glib::RefPtr<Gtk::TreeStore> store, Glib::u
         obj = getDesktop()->getDocument()->getXMLDialogSelectedObject();
     }
     if (selection->objects().size() < 2 && !obj) {
-        _readStyleElement();
+        readStyleElement();
         return;
     }
     _updating = true;
@@ -1119,7 +1119,7 @@ void StyleDialog::_writeStyleElement(Glib::RefPtr<Gtk::TreeStore> store, Glib::u
         INKSCAPE.readStyleSheets(true);
     }
     _updating = false;
-    _readStyleElement();
+    readStyleElement();
     /*     SPDocument *document = SP_ACTIVE_DOCUMENT;
         for (auto iter : document->getObjectsBySelector(selector)) {
             std::cout << std::endl;
@@ -1556,7 +1556,7 @@ void StyleDialog::_handleDocumentReplaced(SPDesktop *desktop, SPDocument * /* do
         desktop->getSelection()->connectChanged(sigc::hide(sigc::mem_fun(this, &StyleDialog::_handleSelectionChanged)));
 
     _updateWatchers();
-    _readStyleElement();
+    readStyleElement();
 }
 
 
@@ -1583,7 +1583,7 @@ void StyleDialog::_handleDesktopChanged(SPDesktop *desktop)
         desktop->connectDocumentReplaced(sigc::mem_fun(this, &StyleDialog::_handleDocumentReplaced));
 
     _updateWatchers();
-    _readStyleElement();
+    readStyleElement();
 }
 
 
@@ -1595,7 +1595,7 @@ void StyleDialog::_handleSelectionChanged()
     g_debug("StyleDialog::_handleSelectionChanged()");
     _scroolpos = 0;
     _vadj->set_value(0);
-    _readStyleElement();
+    readStyleElement();
 }
 
 } // namespace Dialog
diff --git a/src/ui/dialog/styledialog.h b/src/ui/dialog/styledialog.h
index b7ccf6619..07dfd8a0e 100644
--- a/src/ui/dialog/styledialog.h
+++ b/src/ui/dialog/styledialog.h
@@ -71,7 +71,7 @@ class StyleDialog : public Widget::Panel {
     Gtk::TreeViewColumn *_current_value_col;
     Gtk::TreeModel::Path _current_path;
     Glib::ustring fixCSSSelectors(Glib::ustring selector);
-
+    void readStyleElement();
   private:
     // Monitor <style> element for changes.
     class NodeObserver;
@@ -125,7 +125,6 @@ class StyleDialog : public Widget::Panel {
     Gtk::Box _styleBox;
     // Reading and writing the style element.
     Inkscape::XML::Node *_getStyleTextNode();
-    void _readStyleElement();
     Glib::RefPtr<Gtk::TreeModel> _selectTree(Glib::ustring selector);
     void _writeStyleElement(Glib::RefPtr<Gtk::TreeStore> store, Glib::ustring selector,
                             Glib::ustring new_selector = "");