From 6912a5c6facae829bd491b09531fbfcdcb58e7db Mon Sep 17 00:00:00 2001
From: Jabiertxof <jabier.arraiza@marker.es>
Date: Wed, 4 Sep 2019 17:58:19 +0200
Subject: Add Text direction icons

---
 .../actions/format-text-direction-horizontal.svg   |   2 +-
 .../actions/format-text-direction-vertical.svg     |   2 +-
 .../actions/format-text-direction-horizontal.svg   |  36 -------
 .../scalable/actions/format-text-direction-r2l.svg |  37 -------
 .../actions/format-text-direction-vertical-lr.svg  |  46 ---------
 .../actions/format-text-direction-vertical.svg     |  40 --------
 .../actions/frmt-text-direction-horizontal.svg     |  36 +++++++
 .../scalable/actions/frmt-text-direction-r2l.svg   |  37 +++++++
 .../actions/frmt-text-direction-vertical-lr.svg    |  46 +++++++++
 .../actions/frmt-text-direction-vertical.svg       |  40 ++++++++
 .../scalable/actions/text-orientation-auto.svg     |   4 +-
 .../scalable/actions/text-orientation-sideways.svg |   4 +-
 .../scalable/actions/text-orientation-upright.svg  |   4 +-
 .../format-text-direction-horizontal-symbolic.svg  |  13 ---
 .../actions/format-text-direction-r2l-symbolic.svg |  37 -------
 .../format-text-direction-vertical-lr-symbolic.svg |  46 ---------
 .../format-text-direction-vertical-symbolic.svg    |  13 ---
 .../frmt-text-direction-horizontal-symbolic.svg    |  84 ++++++++++++++++
 .../actions/frmt-text-direction-r2l-symbolic.svg   |  83 ++++++++++++++++
 .../frmt-text-direction-vertical-lr-symbolic.svg   |  84 ++++++++++++++++
 .../frmt-text-direction-vertical-symbolic.svg      |  83 ++++++++++++++++
 .../actions/text-orientation-auto-symbolic.svg     | 109 +++++++++++++++-----
 .../actions/text-orientation-sideways-symbolic.svg | 110 ++++++++++++++++-----
 .../actions/text-orientation-upright-symbolic.svg  | 110 ++++++++++++++++-----
 share/pixmaps/symbolic_icons.svg                   |   4 +-
 src/ui/toolbar/text-toolbar.cpp                    |  15 +--
 src/ui/widget/combo-tool-item.cpp                  |  16 ++-
 27 files changed, 785 insertions(+), 356 deletions(-)
 delete mode 100644 share/icons/hicolor/scalable/actions/format-text-direction-horizontal.svg
 delete mode 100644 share/icons/hicolor/scalable/actions/format-text-direction-r2l.svg
 delete mode 100644 share/icons/hicolor/scalable/actions/format-text-direction-vertical-lr.svg
 delete mode 100644 share/icons/hicolor/scalable/actions/format-text-direction-vertical.svg
 create mode 100644 share/icons/hicolor/scalable/actions/frmt-text-direction-horizontal.svg
 create mode 100644 share/icons/hicolor/scalable/actions/frmt-text-direction-r2l.svg
 create mode 100644 share/icons/hicolor/scalable/actions/frmt-text-direction-vertical-lr.svg
 create mode 100644 share/icons/hicolor/scalable/actions/frmt-text-direction-vertical.svg
 delete mode 100644 share/icons/hicolor/symbolic/actions/format-text-direction-horizontal-symbolic.svg
 delete mode 100644 share/icons/hicolor/symbolic/actions/format-text-direction-r2l-symbolic.svg
 delete mode 100644 share/icons/hicolor/symbolic/actions/format-text-direction-vertical-lr-symbolic.svg
 delete mode 100644 share/icons/hicolor/symbolic/actions/format-text-direction-vertical-symbolic.svg
 create mode 100644 share/icons/hicolor/symbolic/actions/frmt-text-direction-horizontal-symbolic.svg
 create mode 100644 share/icons/hicolor/symbolic/actions/frmt-text-direction-r2l-symbolic.svg
 create mode 100644 share/icons/hicolor/symbolic/actions/frmt-text-direction-vertical-lr-symbolic.svg
 create mode 100644 share/icons/hicolor/symbolic/actions/frmt-text-direction-vertical-symbolic.svg

diff --git a/share/icons/Tango/scalable/actions/format-text-direction-horizontal.svg b/share/icons/Tango/scalable/actions/format-text-direction-horizontal.svg
index 2f383eb0f..b170cc9c9 100644
--- a/share/icons/Tango/scalable/actions/format-text-direction-horizontal.svg
+++ b/share/icons/Tango/scalable/actions/format-text-direction-horizontal.svg
@@ -12,7 +12,7 @@
    width="25.200003"
    height="25.200003"
    version="1.1"
-   sodipodi:docname="format-text-direction-horizontal.svg"
+   sodipodi:docname="frmt-text-direction-horizontal.svg"
    viewBox="0 0 25.200003 25.200003">
   <metadata
      id="metadata38">
diff --git a/share/icons/Tango/scalable/actions/format-text-direction-vertical.svg b/share/icons/Tango/scalable/actions/format-text-direction-vertical.svg
index aec2267e6..14eb214fe 100644
--- a/share/icons/Tango/scalable/actions/format-text-direction-vertical.svg
+++ b/share/icons/Tango/scalable/actions/format-text-direction-vertical.svg
@@ -12,7 +12,7 @@
    width="25.200003"
    height="25.200003"
    version="1.1"
-   sodipodi:docname="format-text-direction-vertical.svg"
+   sodipodi:docname="frmt-text-direction-vertical.svg"
    viewBox="0 0 25.200003 25.200003">
   <metadata
      id="metadata38">
diff --git a/share/icons/hicolor/scalable/actions/format-text-direction-horizontal.svg b/share/icons/hicolor/scalable/actions/format-text-direction-horizontal.svg
deleted file mode 100644
index 351ea6036..000000000
--- a/share/icons/hicolor/scalable/actions/format-text-direction-horizontal.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-  >
-  <defs>
-    <linearGradient id="linearGradientA"
-		    xlink:href="#linearGradientVector"
-		    gradientUnits="userSpaceOnUse"
-		    x1="30" x2="4" y1="25" y2="4" />
-    <linearGradient id="linearGradientVector">
-      <stop offset="0" style="stop-color:#ffffff"/>
-      <stop offset="1" style="stop-color:#e2e1e1"/>
-    </linearGradient>
-  </defs>
-  <g id="format-text-direction-horizontal" inkscape:label="#writing_mode_lr">
-
-    <!-- Background -->
-    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
-    <rect x="0.5" y="0.5" width="21" height="21"  style="fill:url(#linearGradientA);stroke:black;stroke-linejoin:round" />
-    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
-
-    <!-- A -->
-    <path d="m 3.5,9.75 v -4 c 0,-3 5,-3 5,0 v 4" style="fill:none;stroke:#383838;stroke-linecap:round" />
-    <path d="m 3.5,7 h 5.1" style="fill:none;stroke:#383838" />
-
-    <!-- Arrows -->
-    <path d="m 20,5.5 -3,-2.5 v 2 h -7 v 1 h 7 v 2 z" style="fill:#5a5a5a" />
-    <path d="m 20,11.5 -3,-2.5 v 2 h -15 v 1 h 15 v 2 z" style="fill:#5a5a5a" />
-    <path d="m 20,17.5 -3,-2.5 v 2 h -15 v 1 h 15 v 2 z" style="fill:#5a5a5a" />
-  </g>
-
-</svg>
diff --git a/share/icons/hicolor/scalable/actions/format-text-direction-r2l.svg b/share/icons/hicolor/scalable/actions/format-text-direction-r2l.svg
deleted file mode 100644
index fd2cd7ea1..000000000
--- a/share/icons/hicolor/scalable/actions/format-text-direction-r2l.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-  >
-  <defs>
-    <linearGradient id="linearGradientA"
-		    xlink:href="#linearGradientVector"
-		    gradientUnits="userSpaceOnUse"
-		    x1="30" x2="4" y1="25" y2="4" />
-    <linearGradient id="linearGradientVector">
-      <stop offset="0" style="stop-color:#ffffff"/>
-      <stop offset="1" style="stop-color:#e2e1e1"/>
-    </linearGradient>
-  </defs>
-
-  <!-- Note "format-text-direction-rtl" is the GTK icon name but we want to use our own. -->
-  <g id="format-text-direction-r2l" inkscape:label="#writing_mode_rl">
-
-    <!-- Background -->
-    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
-    <rect x="0.5" y="0.5" width="21" height="21"  style="fill:url(#linearGradientA);stroke:black;stroke-linejoin:round" />
-    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
-
-    <!-- A -->
-    <path d="m 18.5,9.75 v -4 c 0,-3 -5,-3 -5,0 v 4" style="fill:none;stroke:#383838;stroke-linecap:round" />
-    <path d="m 18.5,7 h -5.1" style="fill:none;stroke:#383838" />
-
-    <!-- Arrows -->
-    <path d="m 2,5.5 3,-2.5 v 2 h 7 v 1 h -7 v 2 z"    style="fill:#5a5a5a" />
-    <path d="m 2,11.5 3,-2.5 v 2 h 15 v 1 h -15 v 2 z" style="fill:#5a5a5a" />
-    <path d="m 2,17.5 3,-2.5 v 2 h 15 v 1 h -15 v 2 z" style="fill:#5a5a5a" />
-  </g>
-</svg>
diff --git a/share/icons/hicolor/scalable/actions/format-text-direction-vertical-lr.svg b/share/icons/hicolor/scalable/actions/format-text-direction-vertical-lr.svg
deleted file mode 100644
index 2ce3630f0..000000000
--- a/share/icons/hicolor/scalable/actions/format-text-direction-vertical-lr.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="24"
-   height="24"
-  >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient id="linearGradient6524">
-      <stop id="stop6526" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop6528" offset="1" style="stop-color:#e2e1e1;stop-opacity:1"/>
-    </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient10133" inkscape:collect="always" x1="860.239" x2="843.9635" xlink:href="#linearGradient6524" y1="45.30668" y2="28.96459"/>
-  </defs>
-<g id="format-text-direction-vertical-lr" inkscape:label="#writing_mode_tb_lr" transform="translate(-840,-25)">
-  <path d="m 841,26 22,0 1,1 0,20 -2,2 -20,0 -1,-1 0,-22 z" id="path10109" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="color:#000000;fill:#000000;fill-opacity:0.06666673;fill-rule:evenodd"/>
-  <path d="m 840,26 1,0 0,20 -1,0 0,-20 z" id="path10111" inkscape:connector-curvature="0" style="color:#000000;fill:#000000;fill-rule:evenodd"/>
-  <rect height="20" id="rect10113" style="color:#000000;fill:#000000;fill-rule:evenodd" width="1" x="861" y="26"/>
-  <rect height="20" id="rect10115" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="matrix(0,-1,1,0,0,0)" width="1" x="-26" y="841"/>
-  <rect height="20" id="rect10117" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="matrix(0,-1,1,0,0,0)" width="1" x="-47" y="841"/>
-  <rect height="20" id="rect10119" style="color:#000000;fill:url(#linearGradient10133);fill-rule:evenodd" width="20" x="841" y="26"/>
-  <path d="m 842,46 -1,0 0,-20 20,0 0,1 -19,0 0,19 z" id="path10121" inkscape:connector-curvature="0" style="fill:#ffffff;fill-rule:evenodd"/>
-  <path d="m 843.5,34.7482 0,-4 c 0,-3 5,-3 5,0 l 0,4" id="path10123" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" style="fill:none;stroke:#383838;stroke-width:1.00000012px;stroke-linecap:round"/>
-  <path d="m 843.3571,31.9982 5.1429,0" id="path10125" inkscape:connector-curvature="0" style="fill:none;stroke:#383838;stroke-width:1.00000012px"/>
-  <path d="m 845.5492,45 2.4754,-3.0009 -2,0 0,-7 -1,0 0,7 -2,0 2.5246,3.0009 z" id="path10127" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd"/>
-  <path d="m 851.4754,45 -2.4754,-3 2,0 0,-15 1,0 0,15 2,0 -2.5246,3 z" id="path10129" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd"/>
-  <path d="M 851.4754,45 849,42 851,42 851,27 852,27 852,42 854,42 851.4754,45 Z" id="use10131" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd" transform="matrix(1,0,0,1,6,0)"/>
-</g>
-
-</svg>
diff --git a/share/icons/hicolor/scalable/actions/format-text-direction-vertical.svg b/share/icons/hicolor/scalable/actions/format-text-direction-vertical.svg
deleted file mode 100644
index 3d61497e7..000000000
--- a/share/icons/hicolor/scalable/actions/format-text-direction-vertical.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-  >
-  <defs>
-    <linearGradient id="linearGradientA"
-		    xlink:href="#linearGradientVector"
-		    gradientUnits="userSpaceOnUse"
-		    x1="30" x2="4" y1="25" y2="4" />
-    <linearGradient id="linearGradientVector">
-      <stop offset="0" style="stop-color:#ffffff"/>
-      <stop offset="1" style="stop-color:#e2e1e1"/>
-    </linearGradient>
-  </defs>
-  <g id="format-text-direction-vertical" inkscape:label="#writing_mode_tb">
-
-    <!-- Background -->
-    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z"
-	  style="fill:black;fill-opacity:0.0667" />
-    <path d="m 0.5,1  0,20" style="fill:none;stroke:black" />
-    <path d="m 21.5,1 0,20" style="fill:none;stroke:black" />
-    <path d="m 1,0.5  20,0" style="fill:none;stroke:black" />
-    <path d="m 1,21.5 20,0" style="fill:none;stroke:black" />
-    <rect x="1" y="1" width="20" height="20"  style="fill:url(#linearGradientA)" />
-    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
-
-    <!-- A -->
-    <path d="m 19.5,9.75 v -4 c 0,-3 -5,-3 -5,0 v 4" style="fill:none;stroke:#383838;stroke-linecap:round" />
-    <path d="m 19.7,7 h -5.2" style="fill:none;stroke:#383838" />
-
-    <!-- Arrows -->
-    <path d="m 17.5,20 -2.5,-3 h 2 v -7 h 1 v 7 h 2 z" style="fill:#5a5a5a" />
-    <path d="m 11.5,20 -2.5,-3 h 2 v -15 h 1 v 15 h 2 z" style="fill:#5a5a5a" />
-    <path d="m 5.5,20 -2.5,-3 h 2 v -15 h 1 v 15 h 2 z" style="fill:#5a5a5a" />
-  </g>
-</svg>
diff --git a/share/icons/hicolor/scalable/actions/frmt-text-direction-horizontal.svg b/share/icons/hicolor/scalable/actions/frmt-text-direction-horizontal.svg
new file mode 100644
index 000000000..bc6f44081
--- /dev/null
+++ b/share/icons/hicolor/scalable/actions/frmt-text-direction-horizontal.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+  >
+  <defs>
+    <linearGradient id="linearGradientA"
+		    xlink:href="#linearGradientVector"
+		    gradientUnits="userSpaceOnUse"
+		    x1="30" x2="4" y1="25" y2="4" />
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#e2e1e1"/>
+    </linearGradient>
+  </defs>
+  <g id="frmt-text-direction-horizontal" inkscape:label="#writing_mode_lr">
+
+    <!-- Background -->
+    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
+    <rect x="0.5" y="0.5" width="21" height="21"  style="fill:url(#linearGradientA);stroke:black;stroke-linejoin:round" />
+    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
+
+    <!-- A -->
+    <path d="m 3.5,9.75 v -4 c 0,-3 5,-3 5,0 v 4" style="fill:none;stroke:#383838;stroke-linecap:round" />
+    <path d="m 3.5,7 h 5.1" style="fill:none;stroke:#383838" />
+
+    <!-- Arrows -->
+    <path d="m 20,5.5 -3,-2.5 v 2 h -7 v 1 h 7 v 2 z" style="fill:#5a5a5a" />
+    <path d="m 20,11.5 -3,-2.5 v 2 h -15 v 1 h 15 v 2 z" style="fill:#5a5a5a" />
+    <path d="m 20,17.5 -3,-2.5 v 2 h -15 v 1 h 15 v 2 z" style="fill:#5a5a5a" />
+  </g>
+
+</svg>
diff --git a/share/icons/hicolor/scalable/actions/frmt-text-direction-r2l.svg b/share/icons/hicolor/scalable/actions/frmt-text-direction-r2l.svg
new file mode 100644
index 000000000..3f6b4e495
--- /dev/null
+++ b/share/icons/hicolor/scalable/actions/frmt-text-direction-r2l.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+  >
+  <defs>
+    <linearGradient id="linearGradientA"
+		    xlink:href="#linearGradientVector"
+		    gradientUnits="userSpaceOnUse"
+		    x1="30" x2="4" y1="25" y2="4" />
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#e2e1e1"/>
+    </linearGradient>
+  </defs>
+
+  <!-- Note "frmt-text-direction-rtl" is the GTK icon name but we want to use our own. -->
+  <g id="frmt-text-direction-r2l" inkscape:label="#writing_mode_rl">
+
+    <!-- Background -->
+    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
+    <rect x="0.5" y="0.5" width="21" height="21"  style="fill:url(#linearGradientA);stroke:black;stroke-linejoin:round" />
+    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
+
+    <!-- A -->
+    <path d="m 18.5,9.75 v -4 c 0,-3 -5,-3 -5,0 v 4" style="fill:none;stroke:#383838;stroke-linecap:round" />
+    <path d="m 18.5,7 h -5.1" style="fill:none;stroke:#383838" />
+
+    <!-- Arrows -->
+    <path d="m 2,5.5 3,-2.5 v 2 h 7 v 1 h -7 v 2 z"    style="fill:#5a5a5a" />
+    <path d="m 2,11.5 3,-2.5 v 2 h 15 v 1 h -15 v 2 z" style="fill:#5a5a5a" />
+    <path d="m 2,17.5 3,-2.5 v 2 h 15 v 1 h -15 v 2 z" style="fill:#5a5a5a" />
+  </g>
+</svg>
diff --git a/share/icons/hicolor/scalable/actions/frmt-text-direction-vertical-lr.svg b/share/icons/hicolor/scalable/actions/frmt-text-direction-vertical-lr.svg
new file mode 100644
index 000000000..6676e9d61
--- /dev/null
+++ b/share/icons/hicolor/scalable/actions/frmt-text-direction-vertical-lr.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1"
+   width="24"
+   height="24"
+  >
+  <sodipodi:namedview
+     id="base"
+     showgrid="true"
+     gridspacingy="1pt"
+     gridspacingx="1pt"
+     gridoriginy="0pt"
+     gridoriginx="0pt"
+  />
+  <defs id="defs3">
+
+    <linearGradient id="linearGradient6524">
+      <stop id="stop6526" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
+      <stop id="stop6528" offset="1" style="stop-color:#e2e1e1;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient10133" inkscape:collect="always" x1="860.239" x2="843.9635" xlink:href="#linearGradient6524" y1="45.30668" y2="28.96459"/>
+  </defs>
+<g id="frmt-text-direction-vertical-lr" inkscape:label="#writing_mode_tb_lr" transform="translate(-840,-25)">
+  <path d="m 841,26 22,0 1,1 0,20 -2,2 -20,0 -1,-1 0,-22 z" id="path10109" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="color:#000000;fill:#000000;fill-opacity:0.06666673;fill-rule:evenodd"/>
+  <path d="m 840,26 1,0 0,20 -1,0 0,-20 z" id="path10111" inkscape:connector-curvature="0" style="color:#000000;fill:#000000;fill-rule:evenodd"/>
+  <rect height="20" id="rect10113" style="color:#000000;fill:#000000;fill-rule:evenodd" width="1" x="861" y="26"/>
+  <rect height="20" id="rect10115" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="matrix(0,-1,1,0,0,0)" width="1" x="-26" y="841"/>
+  <rect height="20" id="rect10117" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="matrix(0,-1,1,0,0,0)" width="1" x="-47" y="841"/>
+  <rect height="20" id="rect10119" style="color:#000000;fill:url(#linearGradient10133);fill-rule:evenodd" width="20" x="841" y="26"/>
+  <path d="m 842,46 -1,0 0,-20 20,0 0,1 -19,0 0,19 z" id="path10121" inkscape:connector-curvature="0" style="fill:#ffffff;fill-rule:evenodd"/>
+  <path d="m 843.5,34.7482 0,-4 c 0,-3 5,-3 5,0 l 0,4" id="path10123" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" style="fill:none;stroke:#383838;stroke-width:1.00000012px;stroke-linecap:round"/>
+  <path d="m 843.3571,31.9982 5.1429,0" id="path10125" inkscape:connector-curvature="0" style="fill:none;stroke:#383838;stroke-width:1.00000012px"/>
+  <path d="m 845.5492,45 2.4754,-3.0009 -2,0 0,-7 -1,0 0,7 -2,0 2.5246,3.0009 z" id="path10127" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd"/>
+  <path d="m 851.4754,45 -2.4754,-3 2,0 0,-15 1,0 0,15 2,0 -2.5246,3 z" id="path10129" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd"/>
+  <path d="M 851.4754,45 849,42 851,42 851,27 852,27 852,42 854,42 851.4754,45 Z" id="use10131" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd" transform="matrix(1,0,0,1,6,0)"/>
+</g>
+
+</svg>
diff --git a/share/icons/hicolor/scalable/actions/frmt-text-direction-vertical.svg b/share/icons/hicolor/scalable/actions/frmt-text-direction-vertical.svg
new file mode 100644
index 000000000..612c7acc8
--- /dev/null
+++ b/share/icons/hicolor/scalable/actions/frmt-text-direction-vertical.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+  >
+  <defs>
+    <linearGradient id="linearGradientA"
+		    xlink:href="#linearGradientVector"
+		    gradientUnits="userSpaceOnUse"
+		    x1="30" x2="4" y1="25" y2="4" />
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#e2e1e1"/>
+    </linearGradient>
+  </defs>
+  <g id="frmt-text-direction-vertical" inkscape:label="#writing_mode_tb">
+
+    <!-- Background -->
+    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z"
+	  style="fill:black;fill-opacity:0.0667" />
+    <path d="m 0.5,1  0,20" style="fill:none;stroke:black" />
+    <path d="m 21.5,1 0,20" style="fill:none;stroke:black" />
+    <path d="m 1,0.5  20,0" style="fill:none;stroke:black" />
+    <path d="m 1,21.5 20,0" style="fill:none;stroke:black" />
+    <rect x="1" y="1" width="20" height="20"  style="fill:url(#linearGradientA)" />
+    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
+
+    <!-- A -->
+    <path d="m 19.5,9.75 v -4 c 0,-3 -5,-3 -5,0 v 4" style="fill:none;stroke:#383838;stroke-linecap:round" />
+    <path d="m 19.7,7 h -5.2" style="fill:none;stroke:#383838" />
+
+    <!-- Arrows -->
+    <path d="m 17.5,20 -2.5,-3 h 2 v -7 h 1 v 7 h 2 z" style="fill:#5a5a5a" />
+    <path d="m 11.5,20 -2.5,-3 h 2 v -15 h 1 v 15 h 2 z" style="fill:#5a5a5a" />
+    <path d="m 5.5,20 -2.5,-3 h 2 v -15 h 1 v 15 h 2 z" style="fill:#5a5a5a" />
+  </g>
+</svg>
diff --git a/share/icons/hicolor/scalable/actions/text-orientation-auto.svg b/share/icons/hicolor/scalable/actions/text-orientation-auto.svg
index a4bf06643..d17ee6671 100644
--- a/share/icons/hicolor/scalable/actions/text-orientation-auto.svg
+++ b/share/icons/hicolor/scalable/actions/text-orientation-auto.svg
@@ -17,8 +17,8 @@
     </linearGradient>
   </defs>
 
-  <!-- Note "format-text-direction-rtl" is the GTK icon name but we want to use our own. -->
-  <g id="format-text-direction-r2l" inkscape:label="#writing_mode_rl">
+  <!-- Note "frmt-text-direction-rtl" is the GTK icon name but we want to use our own. -->
+  <g id="frmt-text-direction-r2l" inkscape:label="#writing_mode_rl">
 
     <!-- Background -->
     <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
diff --git a/share/icons/hicolor/scalable/actions/text-orientation-sideways.svg b/share/icons/hicolor/scalable/actions/text-orientation-sideways.svg
index a6ce53531..a417c3d66 100644
--- a/share/icons/hicolor/scalable/actions/text-orientation-sideways.svg
+++ b/share/icons/hicolor/scalable/actions/text-orientation-sideways.svg
@@ -17,8 +17,8 @@
     </linearGradient>
   </defs>
 
-  <!-- Note "format-text-direction-rtl" is the GTK icon name but we want to use our own. -->
-  <g id="format-text-direction-r2l" inkscape:label="#writing_mode_rl">
+  <!-- Note "frmt-text-direction-rtl" is the GTK icon name but we want to use our own. -->
+  <g id="frmt-text-direction-r2l" inkscape:label="#writing_mode_rl">
 
     <!-- Background -->
     <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
diff --git a/share/icons/hicolor/scalable/actions/text-orientation-upright.svg b/share/icons/hicolor/scalable/actions/text-orientation-upright.svg
index 222a3d518..c1b75607b 100644
--- a/share/icons/hicolor/scalable/actions/text-orientation-upright.svg
+++ b/share/icons/hicolor/scalable/actions/text-orientation-upright.svg
@@ -17,8 +17,8 @@
     </linearGradient>
   </defs>
 
-  <!-- Note "format-text-direction-rtl" is the GTK icon name but we want to use our own. -->
-  <g id="format-text-direction-r2l" inkscape:label="#writing_mode_rl">
+  <!-- Note "frmt-text-direction-rtl" is the GTK icon name but we want to use our own. -->
+  <g id="frmt-text-direction-r2l" inkscape:label="#writing_mode_rl">
 
     <!-- Background -->
     <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
diff --git a/share/icons/hicolor/symbolic/actions/format-text-direction-horizontal-symbolic.svg b/share/icons/hicolor/symbolic/actions/format-text-direction-horizontal-symbolic.svg
deleted file mode 100644
index e104e7015..000000000
--- a/share/icons/hicolor/symbolic/actions/format-text-direction-horizontal-symbolic.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16" sodipodi:docname="format-text-direction-horizontal-symbolic.svg">
-<sodipodi:namedview objecttolerance="10" gridtolerance="10" guidetolerance="10" id="namedview" showgrid="true" inkscape:zoom="0.6002936" inkscape:cx="732.67439" inkscape:cy="-567.94603" inkscape:window-width="1920" inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="layer1">
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <g transform="matrix(1,0,0,0.99975,-589,-805.15691)" inkscape:label="00189" id="format-text-direction-horizontal">
-      <path inkscape:connector-curvature="0" id="rect15975" d="m 589,805.36218 h 16 v 16 h -16 z" style="opacity:0;fill:none"/>
-      <path inkscape:connector-curvature="0" id="path15977" d="m 589.9942,809.3682 v -2 L 601,807.3582 v -2 l 2.9883,3 -2.9883,3 v -2 z" style="opacity:1"/>
-      <path inkscape:connector-curvature="0" style="opacity:1" d="m 601,304 v 2 h -11 v 2 h 11 v 1 h 1 l 2,-2 z" transform="translate(0,512.3622)" id="path15979"/>
-      <path style="opacity:1" d="m 592.9864,810.3681 -2.5031,6.9896 h 1.5019 c 0.744,-1.997 0,10e-4 0.7424,-1.9955 l 2.5585,0.018 0.7041,1.9775 h 1.5019 l -2.5031,-6.9896 z m 1.0013,1.4978 1.0123,2.4963 h -2.0025 z" id="path15981" inkscape:connector-curvature="0"/>
-    </g>
-    </svg>
diff --git a/share/icons/hicolor/symbolic/actions/format-text-direction-r2l-symbolic.svg b/share/icons/hicolor/symbolic/actions/format-text-direction-r2l-symbolic.svg
deleted file mode 100644
index fd2cd7ea1..000000000
--- a/share/icons/hicolor/symbolic/actions/format-text-direction-r2l-symbolic.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-  >
-  <defs>
-    <linearGradient id="linearGradientA"
-		    xlink:href="#linearGradientVector"
-		    gradientUnits="userSpaceOnUse"
-		    x1="30" x2="4" y1="25" y2="4" />
-    <linearGradient id="linearGradientVector">
-      <stop offset="0" style="stop-color:#ffffff"/>
-      <stop offset="1" style="stop-color:#e2e1e1"/>
-    </linearGradient>
-  </defs>
-
-  <!-- Note "format-text-direction-rtl" is the GTK icon name but we want to use our own. -->
-  <g id="format-text-direction-r2l" inkscape:label="#writing_mode_rl">
-
-    <!-- Background -->
-    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
-    <rect x="0.5" y="0.5" width="21" height="21"  style="fill:url(#linearGradientA);stroke:black;stroke-linejoin:round" />
-    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
-
-    <!-- A -->
-    <path d="m 18.5,9.75 v -4 c 0,-3 -5,-3 -5,0 v 4" style="fill:none;stroke:#383838;stroke-linecap:round" />
-    <path d="m 18.5,7 h -5.1" style="fill:none;stroke:#383838" />
-
-    <!-- Arrows -->
-    <path d="m 2,5.5 3,-2.5 v 2 h 7 v 1 h -7 v 2 z"    style="fill:#5a5a5a" />
-    <path d="m 2,11.5 3,-2.5 v 2 h 15 v 1 h -15 v 2 z" style="fill:#5a5a5a" />
-    <path d="m 2,17.5 3,-2.5 v 2 h 15 v 1 h -15 v 2 z" style="fill:#5a5a5a" />
-  </g>
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/format-text-direction-vertical-lr-symbolic.svg b/share/icons/hicolor/symbolic/actions/format-text-direction-vertical-lr-symbolic.svg
deleted file mode 100644
index 2ce3630f0..000000000
--- a/share/icons/hicolor/symbolic/actions/format-text-direction-vertical-lr-symbolic.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
-   width="24"
-   height="24"
-  >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient id="linearGradient6524">
-      <stop id="stop6526" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop6528" offset="1" style="stop-color:#e2e1e1;stop-opacity:1"/>
-    </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient10133" inkscape:collect="always" x1="860.239" x2="843.9635" xlink:href="#linearGradient6524" y1="45.30668" y2="28.96459"/>
-  </defs>
-<g id="format-text-direction-vertical-lr" inkscape:label="#writing_mode_tb_lr" transform="translate(-840,-25)">
-  <path d="m 841,26 22,0 1,1 0,20 -2,2 -20,0 -1,-1 0,-22 z" id="path10109" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="color:#000000;fill:#000000;fill-opacity:0.06666673;fill-rule:evenodd"/>
-  <path d="m 840,26 1,0 0,20 -1,0 0,-20 z" id="path10111" inkscape:connector-curvature="0" style="color:#000000;fill:#000000;fill-rule:evenodd"/>
-  <rect height="20" id="rect10113" style="color:#000000;fill:#000000;fill-rule:evenodd" width="1" x="861" y="26"/>
-  <rect height="20" id="rect10115" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="matrix(0,-1,1,0,0,0)" width="1" x="-26" y="841"/>
-  <rect height="20" id="rect10117" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="matrix(0,-1,1,0,0,0)" width="1" x="-47" y="841"/>
-  <rect height="20" id="rect10119" style="color:#000000;fill:url(#linearGradient10133);fill-rule:evenodd" width="20" x="841" y="26"/>
-  <path d="m 842,46 -1,0 0,-20 20,0 0,1 -19,0 0,19 z" id="path10121" inkscape:connector-curvature="0" style="fill:#ffffff;fill-rule:evenodd"/>
-  <path d="m 843.5,34.7482 0,-4 c 0,-3 5,-3 5,0 l 0,4" id="path10123" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" style="fill:none;stroke:#383838;stroke-width:1.00000012px;stroke-linecap:round"/>
-  <path d="m 843.3571,31.9982 5.1429,0" id="path10125" inkscape:connector-curvature="0" style="fill:none;stroke:#383838;stroke-width:1.00000012px"/>
-  <path d="m 845.5492,45 2.4754,-3.0009 -2,0 0,-7 -1,0 0,7 -2,0 2.5246,3.0009 z" id="path10127" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd"/>
-  <path d="m 851.4754,45 -2.4754,-3 2,0 0,-15 1,0 0,15 2,0 -2.5246,3 z" id="path10129" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd"/>
-  <path d="M 851.4754,45 849,42 851,42 851,27 852,27 852,42 854,42 851.4754,45 Z" id="use10131" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd" transform="matrix(1,0,0,1,6,0)"/>
-</g>
-
-</svg>
diff --git a/share/icons/hicolor/symbolic/actions/format-text-direction-vertical-symbolic.svg b/share/icons/hicolor/symbolic/actions/format-text-direction-vertical-symbolic.svg
deleted file mode 100644
index f35f8dfa1..000000000
--- a/share/icons/hicolor/symbolic/actions/format-text-direction-vertical-symbolic.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16" sodipodi:docname="format-text-direction-vertical-symbolic.svg">
-<sodipodi:namedview objecttolerance="10" gridtolerance="10" guidetolerance="10" id="namedview" showgrid="true" inkscape:zoom="0.6002936" inkscape:cx="732.67439" inkscape:cy="-567.94603" inkscape:window-width="1920" inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="layer1">
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <g transform="matrix(0.999375,0,0,1,-558.65084,-805.36218)" inkscape:label="00188" id="format-text-direction-vertical">
-      <path inkscape:connector-curvature="0" id="rect15925" d="m 559,805.36218 h 16 v 16 h -16 z" style="opacity:0;fill:none"/>
-      <path inkscape:connector-curvature="0" id="path15933" d="m 561,806.3622 h 2 l 0.01,11.0058 h 2 l -3,2.9883 -3,-2.9883 h 2 z" style="opacity:1"/>
-      <path style="opacity:1" d="m 571,806.3622 h 2 l 0.01,11.0058 h 2 l -3,2.9883 -3,-2.9883 h 2 z" id="path15956" inkscape:connector-curvature="0"/>
-      <path inkscape:connector-curvature="0" id="path15962" d="m 565.9864,807.3681 -2.5031,6.9896 h 1.5019 c 0.744,-1.997 0,10e-4 0.7424,-1.9955 l 2.5585,0.018 0.7041,1.9775 h 1.5019 l -2.5031,-6.9896 z m 1.0013,1.4978 1.0123,2.4963 h -2.0025 z" style="opacity:1"/>
-    </g>
-    </svg>
diff --git a/share/icons/hicolor/symbolic/actions/frmt-text-direction-horizontal-symbolic.svg b/share/icons/hicolor/symbolic/actions/frmt-text-direction-horizontal-symbolic.svg
new file mode 100644
index 000000000..f70e65580
--- /dev/null
+++ b/share/icons/hicolor/symbolic/actions/frmt-text-direction-horizontal-symbolic.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0alpha2 (9a5671800d, 2019-09-04, custom)"
+   sodipodi:docname="frmt-text-direction-horizontal-symbolic.svg"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1">
+  <metadata
+     id="metadata915">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs913" />
+  <sodipodi:namedview
+     inkscape:snap-global="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="svg1"
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1376"
+     inkscape:window-width="2560"
+     inkscape:cy="18.276386"
+     inkscape:cx="11.838902"
+     inkscape:zoom="21.337261"
+     showgrid="true"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10">
+    <inkscape:grid
+       id="grid"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <g
+     id="frmt-text-direction-vertical"
+     inkscape:label="00188"
+     transform="matrix(0.999375,0,0,1,-558.65084,-805.36218)">
+    <path
+       style="opacity:0;fill:none"
+       d="m 559,805.36218 h 16 v 16 h -16 z"
+       id="rect15925"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     style="opacity:1;stroke-width:0.581489"
+     d="m 7.281757,2.583687 v 1.162839 l 6.40055,0.006 V 4.915354 L 15.420187,3.1711 13.682307,1.426856 v 1.16283 z"
+     id="path994"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path15977"
+     d="m 1.1603472,7.801552 v 1.162839 l 12.5219598,0.006 v 1.162828 l 1.73788,-1.744254 -1.73788,-1.744244 V 7.80755 Z"
+     style="opacity:1;stroke-width:0.581489"
+     sodipodi:nodetypes="cccccccc" />
+  <path
+     style="opacity:1;stroke-width:0.785258"
+     d="M 3.101706,1.0150566 1.1358859,6.5030046 H 2.315416 c 0.5843,-1.567958 0,7.89e-4 0.58304,-1.566788 l 2.00934,0.0141 0.55296,1.552651 h 1.17953 l -1.96582,-5.487947 z m 0.78638,1.176016 0.79502,1.95999 h -1.57268 z"
+     id="path15981"
+     inkscape:connector-curvature="0" />
+  <path
+     style="opacity:1;stroke-width:0.581489"
+     d="m 1.1603472,13.019413 v 1.162839 l 12.5219598,0.006 v 1.16283 l 1.73788,-1.744254 -1.73788,-1.744244 v 1.162829 z"
+     id="path996"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccc" />
+</svg>
diff --git a/share/icons/hicolor/symbolic/actions/frmt-text-direction-r2l-symbolic.svg b/share/icons/hicolor/symbolic/actions/frmt-text-direction-r2l-symbolic.svg
new file mode 100644
index 000000000..7ae3f9477
--- /dev/null
+++ b/share/icons/hicolor/symbolic/actions/frmt-text-direction-r2l-symbolic.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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: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"
+   sodipodi:docname="frmt-text-direction-r2l-symbolic.svg"
+   inkscape:version="1.0alpha2 (9a5671800d, 2019-09-04, custom)">
+  <metadata
+     id="metadata992">
+    <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="defs990" />
+  <sodipodi:namedview
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     id="namedview"
+     showgrid="true"
+     inkscape:zoom="22.4"
+     inkscape:cx="9.9368155"
+     inkscape:cy="4.4950558"
+     inkscape:window-width="2560"
+     inkscape:window-height="1376"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="frmt-text-direction-horizontal"
+     inkscape:document-rotation="0"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid" />
+  </sodipodi:namedview>
+  <g
+     transform="matrix(1,0,0,0.99975,-589,-805.15691)"
+     inkscape:label="00189"
+     id="frmt-text-direction-horizontal">
+    <path
+       inkscape:connector-curvature="0"
+       id="rect15975"
+       d="m 589,805.36218 h 16 v 16 h -16 z"
+       style="opacity:0;fill:none" />
+    <path
+       style="opacity:1;stroke-width:0.581562"
+       d="m 597.91816,809.56841 v -1.16313 l -6.40055,-0.006 v -1.16312 l -1.73788,1.74469 1.73788,1.74468 v -1.16312 z"
+       id="path994"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path15977"
+       d="m 604.12141,814.78758 v -1.16313 l -12.52196,-0.006 v -1.16312 l -1.73788,1.74469 1.73788,1.74468 v -1.16312 z"
+       style="opacity:1;stroke-width:0.581562"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="opacity:1;stroke-width:0.785356"
+       d="m 600.82934,806.3677 -1.96582,5.48932 h 1.17953 c 0.5843,-1.56835 0,7.9e-4 0.58304,-1.56718 l 2.00934,0.0141 0.55296,1.55304 h 1.17953 l -1.96582,-5.48932 z m 0.78638,1.17631 0.79502,1.96048 h -1.57268 z"
+       id="path15981"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;stroke-width:0.581562"
+       d="m 604.12141,820.00675 v -1.16313 l -12.52196,-0.006 v -1.16312 l -1.73788,1.74469 1.73788,1.74468 v -1.16312 z"
+       id="path996"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+</svg>
diff --git a/share/icons/hicolor/symbolic/actions/frmt-text-direction-vertical-lr-symbolic.svg b/share/icons/hicolor/symbolic/actions/frmt-text-direction-vertical-lr-symbolic.svg
new file mode 100644
index 000000000..fcbf2577d
--- /dev/null
+++ b/share/icons/hicolor/symbolic/actions/frmt-text-direction-vertical-lr-symbolic.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0alpha2 (9a5671800d, 2019-09-04, custom)"
+   sodipodi:docname="frmt-text-direction-vertical-lr-symbolic.svg"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1">
+  <metadata
+     id="metadata915">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs913" />
+  <sodipodi:namedview
+     inkscape:snap-global="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="svg1"
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1376"
+     inkscape:window-width="2560"
+     inkscape:cy="18.276386"
+     inkscape:cx="11.838902"
+     inkscape:zoom="21.337261"
+     showgrid="true"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10">
+    <inkscape:grid
+       id="grid"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <g
+     id="frmt-text-direction-vertical"
+     inkscape:label="00188"
+     transform="matrix(0.999375,0,0,1,-558.65084,-805.36218)">
+    <path
+       style="opacity:0;fill:none"
+       d="m 559,805.36218 h 16 v 16 h -16 z"
+       id="rect15925"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     style="opacity:1;stroke-width:0.581489"
+     d="m 3.9261329,7.3804589 h -1.162839 l -0.006,6.4005501 h -1.162828 l 1.744254,1.73788 1.744244,-1.73788 h -1.16283 z"
+     id="path994"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path15977"
+     d="m 14.022224,1.2590491 h -1.162839 l -0.006,12.5219599 h -1.162828 l 1.744254,1.73788 1.744244,-1.73788 h -1.162829 z"
+     style="opacity:1;stroke-width:0.581489"
+     sodipodi:nodetypes="cccccccc" />
+  <path
+     style="opacity:1;stroke-width:0.785258"
+     d="M 3.101706,1.0150566 1.1358859,6.5030046 H 2.315416 c 0.5843,-1.567958 0,7.89e-4 0.58304,-1.566788 l 2.00934,0.0141 0.55296,1.552651 h 1.17953 l -1.96582,-5.487947 z m 0.78638,1.176016 0.79502,1.95999 h -1.57268 z"
+     id="path15981"
+     inkscape:connector-curvature="0" />
+  <path
+     style="opacity:1;stroke-width:0.581489"
+     d="m 8.9741806,1.2590491 h -1.162839 l -0.006,12.5219599 h -1.16283 l 1.744254,1.73788 1.7442444,-1.73788 H 8.9681806 Z"
+     id="path996"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccc" />
+</svg>
diff --git a/share/icons/hicolor/symbolic/actions/frmt-text-direction-vertical-symbolic.svg b/share/icons/hicolor/symbolic/actions/frmt-text-direction-vertical-symbolic.svg
new file mode 100644
index 000000000..d71dd246f
--- /dev/null
+++ b/share/icons/hicolor/symbolic/actions/frmt-text-direction-vertical-symbolic.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0alpha2 (9a5671800d, 2019-09-04, custom)"
+   sodipodi:docname="frmt-text-direction-vertical-symbolic.svg"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1">
+  <metadata
+     id="metadata915">
+    <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="defs913" />
+  <sodipodi:namedview
+     inkscape:snap-global="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="svg1"
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="1376"
+     inkscape:window-width="2560"
+     inkscape:cy="18.276386"
+     inkscape:cx="11.838902"
+     inkscape:zoom="21.337261"
+     showgrid="true"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10">
+    <inkscape:grid
+       id="grid"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <g
+     id="frmt-text-direction-vertical"
+     inkscape:label="00188"
+     transform="matrix(0.999375,0,0,1,-558.65084,-805.36218)">
+    <path
+       style="opacity:0;fill:none"
+       d="m 559,805.36218 h 16 v 16 h -16 z"
+       id="rect15925"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     style="opacity:1;stroke-width:0.581489"
+     d="M 3.727109,7.20325 H 2.56427 l -0.006,6.40055 H 1.395442 L 3.139696,15.34168 4.88394,13.6038 H 3.72111 Z"
+     id="path994"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path15977"
+     d="M 8.944974,1 H 7.782135 l -0.006,12.52196 H 6.613307 l 1.744254,1.73788 1.744244,-1.73788 H 8.938976 Z"
+     style="opacity:1;stroke-width:0.581489"
+     sodipodi:nodetypes="cccccccc" />
+  <path
+     style="opacity:1;stroke-width:0.785258"
+     d="M 2.7018,1.0150566 0.73597999,6.5030046 H 1.91551 c 0.5843,-1.567958 0,7.89e-4 0.58304,-1.566788 l 2.00934,0.0141 0.55296,1.552651 H 6.24038 L 4.27456,1.0150206 Z m 0.78638,1.176016 0.79502,1.95999 H 2.71052 Z"
+     id="path15981"
+     inkscape:connector-curvature="0" />
+  <path
+     style="opacity:1;stroke-width:0.581489"
+     d="M 14.162839,1 H 13 l -0.006,12.52196 h -1.16283 l 1.744254,1.73788 1.744244,-1.73788 h -1.162829 z"
+     id="path996"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccc" />
+</svg>
diff --git a/share/icons/hicolor/symbolic/actions/text-orientation-auto-symbolic.svg b/share/icons/hicolor/symbolic/actions/text-orientation-auto-symbolic.svg
index a4bf06643..a046b8340 100644
--- a/share/icons/hicolor/symbolic/actions/text-orientation-auto-symbolic.svg
+++ b/share/icons/hicolor/symbolic/actions/text-orientation-auto-symbolic.svg
@@ -1,37 +1,100 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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"
    width="24"
    height="24"
-  >
-  <defs>
-    <linearGradient id="linearGradientA"
-		    xlink:href="#linearGradientVector"
-		    gradientUnits="userSpaceOnUse"
-		    x1="30" x2="4" y1="25" y2="4" />
-    <linearGradient id="linearGradientVector">
-      <stop offset="0" style="stop-color:#ffffff"/>
-      <stop offset="1" style="stop-color:#e2e1e1"/>
+   version="1.1"
+   id="svg1028"
+   sodipodi:docname="text-orientation-auto-symbolic.svg"
+   inkscape:version="1.0alpha2 (9a5671800d, 2019-09-04, custom)">
+  <metadata
+     id="metadata1032">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     inkscape:document-rotation="0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1737"
+     inkscape:window-height="1242"
+     id="namedview1030"
+     showgrid="false"
+     inkscape:zoom="22.4"
+     inkscape:cx="15.828689"
+     inkscape:cy="16.738404"
+     inkscape:window-x="610"
+     inkscape:window-y="538"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="frmt-text-direction-r2l" />
+  <defs
+     id="defs1011">
+    <linearGradient
+       id="linearGradientA"
+       xlink:href="#linearGradientVector"
+       gradientUnits="userSpaceOnUse"
+       x1="30"
+       x2="4"
+       y1="25"
+       y2="4" />
+    <linearGradient
+       id="linearGradientVector">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff"
+         id="stop1006" />
+      <stop
+         offset="1"
+         style="stop-color:#e2e1e1"
+         id="stop1008" />
     </linearGradient>
   </defs>
-
-  <!-- Note "format-text-direction-rtl" is the GTK icon name but we want to use our own. -->
-  <g id="format-text-direction-r2l" inkscape:label="#writing_mode_rl">
-
+  <!-- Note "frmt-text-direction-rtl" is the GTK icon name but we want to use our own. -->
+  <g
+     id="frmt-text-direction-r2l"
+     inkscape:label="#writing_mode_rl">
     <!-- Background -->
-    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
-    <rect x="0.5" y="0.5" width="21" height="21"  style="fill:url(#linearGradientA);stroke:black;stroke-linejoin:round" />
-    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
-
     <!-- Glyphs -->
-    <path d="m 11.3,19.1 h 4 c 3,0 3,-5 0,-5 h -4" style="fill:none;stroke:#383838;stroke-linecap:round"/>
-    <path d="m 14.1,19.3 v -5.2" style="fill:none;stroke:#383838"/>
-    <path d="m 11,8.5 7.5,0.1 m -6,-2.6 h 4.2 l -1.7,1.5 v 3 c 0,0.5 -0.5,1 -1,1 h -1 m 2,-7.7 -0.5,-0.8 m -3.5,2 v -1 h 7.5 v 1"
-	  style="fill:none;stroke:#383838;stroke-linecap:round;stroke-linejoin:round" />
-
+    <path
+       inkscape:connector-curvature="0"
+       d="m 12.951047,15.362028 a 0.61271088,0.61271088 0 0 0 -0.612712,0.612712 0.61271088,0.61271088 0 0 0 0.612712,0.612709 h 2.817033 v 4.901687 h -2.817033 a 0.61271088,0.61271088 0 0 0 -0.612712,0.612712 0.61271088,0.61271088 0 0 0 0.612712,0.61271 h 4.901686 c 1.089264,0 1.98332,-0.48305 2.54658,-1.187128 0.563261,-0.704076 0.82333,-1.600706 0.82333,-2.489138 0,-0.88843 -0.260069,-1.78506 -0.82333,-2.489137 -0.56326,-0.704076 -1.457316,-1.187127 -2.54658,-1.187127 z m 4.042454,1.225421 h 0.859232 c 0.74887,0 1.233414,0.282839 1.589219,0.727594 0.355805,0.444757 0.555269,1.079904 0.555269,1.723249 0,0.643347 -0.199464,1.278494 -0.555269,1.723249 -0.355805,0.444758 -0.840349,0.727595 -1.589219,0.727595 h -0.859232 z"
+       style="stroke-width:1.1228"
+       id="path1469" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1467"
+       d="m 14.330524,4.7151491 a 0.57340799,0.57340799 0 0 0 -0.573407,0.573408 0.57340799,0.57340799 0 0 0 0.573407,0.573408 H 17.6321 l -0.813075,0.71676 a 0.57346533,0.57346533 0 0 0 -0.194869,0.430056 v 0.627165 L 12.61702,7.5821898 a 0.57340799,0.57340799 0 0 0 -0.580127,0.5666883 0.57340799,0.57340799 0 0 0 0.566688,0.5801277 l 4.020575,0.053757 v 1.6664682 c 0,0.09557 -0.06546,0.258093 -0.190389,0.383018 -0.124926,0.124926 -0.28745,0.190389 -0.383019,0.190389 h -1.146815 a 0.57340799,0.57340799 0 0 0 -0.573409,0.573408 0.57340799,0.57340799 0 0 0 0.573409,0.573409 h 1.146815 c 0.477841,0 0.888724,-0.221241 1.193855,-0.526371 0.305129,-0.30513 0.526369,-0.716013 0.526369,-1.193853 V 8.7984412 l 3.433729,0.044798 A 0.57340799,0.57340799 0 0 0 21.784828,8.2787898 0.57340799,0.57340799 0 0 0 21.218139,7.6964223 L 17.770972,7.6516252 V 7.2686065 l 1.756062,-1.5499934 a 0.57346533,0.57346533 0 0 0 -0.380778,-1.003464 z"
+       style="stroke-width:1.05077" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1465"
+       d="m 16.590558,1.2747012 a 0.57340799,0.57340799 0 0 0 -0.271024,0.087355 0.57340799,0.57340799 0 0 0 -0.18143,0.7906759 l 0.16799,0.268785 H 12.6103 a 0.57346533,0.57346533 0 0 0 -0.573407,0.5734081 v 1.1468159 a 0.57340799,0.57340799 0 0 0 0.573407,0.573408 0.57340799,0.57340799 0 0 0 0.573408,-0.573408 V 3.5683328 h 7.454305 V 4.141741 A 0.57340799,0.57340799 0 0 0 21.21142,4.715149 0.57340799,0.57340799 0 0 0 21.784828,4.141741 V 2.9949252 A 0.57346533,0.57346533 0 0 0 21.21142,2.4215171 H 17.65898 L 17.110209,1.5434862 a 0.57340799,0.57340799 0 0 0 -0.519651,-0.268785 z"
+       style="stroke-width:1.05077" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0"
+       id="path1434"
+       d="M 5.8710186,3.9981341 V 18.013618 H 3.7630188 l 2.6349997,3.161999 2.6349997,-3.161999 H 6.9250185 V 3.9981341 Z"
+       style="stroke-width:0.965729" />
     <!-- Arrow -->
-    <path d="m 6.5,20 -2.5,-3 h 2 v -15 h 1 v 15 h 2 z" style="fill:#5a5a5a"/>
   </g>
 </svg>
diff --git a/share/icons/hicolor/symbolic/actions/text-orientation-sideways-symbolic.svg b/share/icons/hicolor/symbolic/actions/text-orientation-sideways-symbolic.svg
index a6ce53531..16fbfb7d9 100644
--- a/share/icons/hicolor/symbolic/actions/text-orientation-sideways-symbolic.svg
+++ b/share/icons/hicolor/symbolic/actions/text-orientation-sideways-symbolic.svg
@@ -1,37 +1,101 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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"
    width="24"
    height="24"
-  >
-  <defs>
-    <linearGradient id="linearGradientA"
-		    xlink:href="#linearGradientVector"
-		    gradientUnits="userSpaceOnUse"
-		    x1="30" x2="4" y1="25" y2="4" />
-    <linearGradient id="linearGradientVector">
-      <stop offset="0" style="stop-color:#ffffff"/>
-      <stop offset="1" style="stop-color:#e2e1e1"/>
+   version="1.1"
+   id="svg1028"
+   sodipodi:docname="text-orientation-sideways-symbolic.svg"
+   inkscape:version="1.0alpha2 (9a5671800d, 2019-09-04, custom)">
+  <metadata
+     id="metadata1032">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     inkscape:document-rotation="0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1737"
+     inkscape:window-height="1242"
+     id="namedview1030"
+     showgrid="false"
+     inkscape:zoom="22.4"
+     inkscape:cx="15.828689"
+     inkscape:cy="16.738404"
+     inkscape:window-x="1501"
+     inkscape:window-y="413"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="frmt-text-direction-r2l" />
+  <defs
+     id="defs1011">
+    <linearGradient
+       id="linearGradientA"
+       xlink:href="#linearGradientVector"
+       gradientUnits="userSpaceOnUse"
+       x1="30"
+       x2="4"
+       y1="25"
+       y2="4" />
+    <linearGradient
+       id="linearGradientVector">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff"
+         id="stop1006" />
+      <stop
+         offset="1"
+         style="stop-color:#e2e1e1"
+         id="stop1008" />
     </linearGradient>
   </defs>
-
-  <!-- Note "format-text-direction-rtl" is the GTK icon name but we want to use our own. -->
-  <g id="format-text-direction-r2l" inkscape:label="#writing_mode_rl">
-
+  <!-- Note "frmt-text-direction-rtl" is the GTK icon name but we want to use our own. -->
+  <g
+     id="frmt-text-direction-r2l"
+     inkscape:label="#writing_mode_rl">
     <!-- Background -->
-    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
-    <rect x="0.5" y="0.5" width="21" height="21"  style="fill:url(#linearGradientA);stroke:black;stroke-linejoin:round" />
-    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
-
     <!-- Glyphs -->
-    <path d="m 11.3,19.1 h 4 c 3,0 3,-5 0,-5 h -4" style="fill:none;stroke:#383838;stroke-linecap:round"/>
-    <path d="m 14.1,19.3 v -5.2" style="fill:none;stroke:#383838"/>
-    <path d="m 13.5,3.5 -0.1,7.5 m 2.6,-6 v 4.2 l -1.5,-1.7 h -3 c -0.5,0 -1,-0.5 -1,-1 v -1 m 7.7,2 0.8,-0.5 m -2,-3.5 h 1 v 7.5 h -1"
-	  style="fill:none;stroke:#383838;stroke-linecap:round;stroke-linejoin:round" />
-
+    <path
+       inkscape:connector-curvature="0"
+       d="m 13.558537,14.693269 a 0.61271088,0.61271088 0 0 0 -0.612712,0.612712 0.61271088,0.61271088 0 0 0 0.612712,0.612709 h 2.817033 v 4.901687 h -2.817033 a 0.61271088,0.61271088 0 0 0 -0.612712,0.612712 0.61271088,0.61271088 0 0 0 0.612712,0.61271 h 4.901686 c 1.089264,0 1.98332,-0.48305 2.54658,-1.187128 0.563261,-0.704076 0.82333,-1.600706 0.82333,-2.489138 0,-0.88843 -0.260069,-1.78506 -0.82333,-2.489137 -0.56326,-0.704076 -1.457316,-1.187127 -2.54658,-1.187127 z m 4.042454,1.225421 h 0.859232 c 0.74887,0 1.233414,0.282839 1.589219,0.727594 0.355805,0.444757 0.555269,1.079904 0.555269,1.723249 0,0.643347 -0.199464,1.278494 -0.555269,1.723249 -0.355805,0.444758 -0.840349,0.727595 -1.589219,0.727595 h -0.859232 z"
+       style="stroke-width:1.1228"
+       id="path1469" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1467"
+       d="m 18.400363,4.7289396 a 0.57340799,0.57340799 0 0 0 -0.573408,-0.573407 0.57340799,0.57340799 0 0 0 -0.573408,0.573407 v 3.301576 l -0.71676,-0.813075 a 0.57346533,0.57346533 0 0 0 -0.430056,-0.194869 h -0.627165 l 0.05376,-4.007136 a 0.57340799,0.57340799 0 0 0 -0.566688,-0.580127 0.57340799,0.57340799 0 0 0 -0.580128,0.566688 l -0.05376,4.020575 h -1.666468 c -0.09557,0 -0.258093,-0.06546 -0.383018,-0.190389 -0.124926,-0.124926 -0.190389,-0.28745 -0.190389,-0.383019 v -1.146815 a 0.57340799,0.57340799 0 0 0 -0.573408,-0.573409 0.57340799,0.57340799 0 0 0 -0.573409,0.573409 v 1.146815 c 0,0.477841 0.221241,0.888724 0.526371,1.193855 0.30513,0.305129 0.716013,0.526369 1.193853,0.526369 h 1.65079 l -0.0448,3.4337294 a 0.57340799,0.57340799 0 0 0 0.564449,0.580127 0.57340799,0.57340799 0 0 0 0.582368,-0.566689 l 0.0448,-3.4471674 h 0.383019 l 1.549993,1.756062 a 0.57346533,0.57346533 0 0 0 1.003464,-0.380778 z"
+       style="stroke-width:1.05077" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1465"
+       d="m 21.840811,6.9889736 a 0.57340799,0.57340799 0 0 0 -0.08735,-0.271024 0.57340799,0.57340799 0 0 0 -0.790676,-0.18143 L 20.694,6.7045096 v -3.695794 a 0.57346533,0.57346533 0 0 0 -0.573408,-0.573407 h -1.146816 a 0.57340799,0.57340799 0 0 0 -0.573408,0.573407 0.57340799,0.57340799 0 0 0 0.573408,0.573408 h 0.573408 v 7.4543054 h -0.573408 a 0.57340799,0.57340799 0 0 0 -0.573408,0.573407 0.57340799,0.57340799 0 0 0 0.573408,0.573408 h 1.146816 A 0.57346533,0.57346533 0 0 0 20.694,11.609836 V 8.0573956 l 0.878031,-0.548771 a 0.57340799,0.57340799 0 0 0 0.268785,-0.519651 z"
+       style="stroke-width:1.05077" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0"
+       id="path1434"
+       d="M 5.8710186,3.9981341 V 18.013618 H 3.7630188 l 2.6349997,3.161999 2.6349997,-3.161999 H 6.9250185 V 3.9981341 Z"
+       style="stroke-width:0.965729" />
     <!-- Arrow -->
-    <path d="m 6.5,20 -2.5,-3 h 2 v -15 h 1 v 15 h 2 z" style="fill:#5a5a5a"/>
   </g>
 </svg>
diff --git a/share/icons/hicolor/symbolic/actions/text-orientation-upright-symbolic.svg b/share/icons/hicolor/symbolic/actions/text-orientation-upright-symbolic.svg
index 222a3d518..d199a64ec 100644
--- a/share/icons/hicolor/symbolic/actions/text-orientation-upright-symbolic.svg
+++ b/share/icons/hicolor/symbolic/actions/text-orientation-upright-symbolic.svg
@@ -1,37 +1,101 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   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"
    width="24"
    height="24"
-  >
-  <defs>
-    <linearGradient id="linearGradientA"
-		    xlink:href="#linearGradientVector"
-		    gradientUnits="userSpaceOnUse"
-		    x1="30" x2="4" y1="25" y2="4" />
-    <linearGradient id="linearGradientVector">
-      <stop offset="0" style="stop-color:#ffffff"/>
-      <stop offset="1" style="stop-color:#e2e1e1"/>
+   version="1.1"
+   id="svg1028"
+   sodipodi:docname="text-orientation-upright-symbolic.svg"
+   inkscape:version="1.0alpha2 (9a5671800d, 2019-09-04, custom)">
+  <metadata
+     id="metadata1032">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     inkscape:document-rotation="0"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1737"
+     inkscape:window-height="1242"
+     id="namedview1030"
+     showgrid="false"
+     inkscape:zoom="22.4"
+     inkscape:cx="15.828689"
+     inkscape:cy="16.738404"
+     inkscape:window-x="551"
+     inkscape:window-y="393"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="frmt-text-direction-r2l" />
+  <defs
+     id="defs1011">
+    <linearGradient
+       id="linearGradientA"
+       xlink:href="#linearGradientVector"
+       gradientUnits="userSpaceOnUse"
+       x1="30"
+       x2="4"
+       y1="25"
+       y2="4" />
+    <linearGradient
+       id="linearGradientVector">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff"
+         id="stop1006" />
+      <stop
+         offset="1"
+         style="stop-color:#e2e1e1"
+         id="stop1008" />
     </linearGradient>
   </defs>
-
-  <!-- Note "format-text-direction-rtl" is the GTK icon name but we want to use our own. -->
-  <g id="format-text-direction-r2l" inkscape:label="#writing_mode_rl">
-
+  <!-- Note "frmt-text-direction-rtl" is the GTK icon name but we want to use our own. -->
+  <g
+     id="frmt-text-direction-r2l"
+     inkscape:label="#writing_mode_rl">
     <!-- Background -->
-    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
-    <rect x="0.5" y="0.5" width="21" height="21"  style="fill:url(#linearGradientA);stroke:black;stroke-linejoin:round" />
-    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
-
     <!-- Glyphs -->
-    <path d="m 16.9,19.8 v -4 c 0,-3 -5,-3 -5,0 v 4" style="fill:none;stroke:#383838;stroke-linecap:round"/>
-    <path d="m 17.1,17 h -5.2" style="fill:none;stroke:#383838" />
-    <path d="m 11,8.5 7.5,0.1 m -6,-2.6 h 4.2 l -1.7,1.5 v 3 c 0,0.5 -0.5,1 -1,1 h -1 m 2,-7.7 -0.5,-0.8 m -3.5,2 v -1 h 7.5 v 1"
-	  style="fill:none;stroke:#383838;stroke-linecap:round;stroke-linejoin:round" />
-
+    <path
+       inkscape:connector-curvature="0"
+       d="m 13.258881,22.101846 a 0.61271088,0.61271088 0 0 0 0.612712,0.612712 0.61271088,0.61271088 0 0 0 0.612709,-0.612712 v -2.817033 h 4.901687 v 2.817033 a 0.61271088,0.61271088 0 0 0 0.612712,0.612712 0.61271088,0.61271088 0 0 0 0.61271,-0.612712 V 17.20016 c 0,-1.089264 -0.48305,-1.98332 -1.187128,-2.54658 -0.704076,-0.563261 -1.600706,-0.82333 -2.489138,-0.82333 -0.88843,0 -1.78506,0.260069 -2.489137,0.82333 -0.704076,0.56326 -1.187127,1.457316 -1.187127,2.54658 z m 1.225421,-4.042454 V 17.20016 c 0,-0.74887 0.282839,-1.233414 0.727594,-1.589219 0.444757,-0.355805 1.079904,-0.555269 1.723249,-0.555269 0.643347,0 1.278494,0.199464 1.723249,0.555269 0.444758,0.355805 0.727595,0.840349 0.727595,1.589219 v 0.859232 z"
+       style="stroke-width:1.1228"
+       id="path1469" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1467"
+       d="m 14.330524,4.7151491 a 0.57340799,0.57340799 0 0 0 -0.573407,0.573408 0.57340799,0.57340799 0 0 0 0.573407,0.573408 H 17.6321 l -0.813075,0.71676 a 0.57346533,0.57346533 0 0 0 -0.194869,0.430056 v 0.627165 L 12.61702,7.5821898 a 0.57340799,0.57340799 0 0 0 -0.580127,0.5666883 0.57340799,0.57340799 0 0 0 0.566688,0.5801277 l 4.020575,0.053757 v 1.6664682 c 0,0.09557 -0.06546,0.258093 -0.190389,0.383018 -0.124926,0.124926 -0.28745,0.190389 -0.383019,0.190389 h -1.146815 a 0.57340799,0.57340799 0 0 0 -0.573409,0.573408 0.57340799,0.57340799 0 0 0 0.573409,0.573409 h 1.146815 c 0.477841,0 0.888724,-0.221241 1.193855,-0.526371 0.305129,-0.30513 0.526369,-0.716013 0.526369,-1.193853 V 8.7984412 l 3.433729,0.044798 A 0.57340799,0.57340799 0 0 0 21.784828,8.2787898 0.57340799,0.57340799 0 0 0 21.218139,7.6964223 L 17.770972,7.6516252 V 7.2686065 l 1.756062,-1.5499934 a 0.57346533,0.57346533 0 0 0 -0.380778,-1.003464 z"
+       style="stroke-width:1.05077" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1465"
+       d="m 16.590558,1.2747012 a 0.57340799,0.57340799 0 0 0 -0.271024,0.087355 0.57340799,0.57340799 0 0 0 -0.18143,0.7906759 l 0.16799,0.268785 H 12.6103 a 0.57346533,0.57346533 0 0 0 -0.573407,0.5734081 v 1.1468159 a 0.57340799,0.57340799 0 0 0 0.573407,0.573408 0.57340799,0.57340799 0 0 0 0.573408,-0.573408 V 3.5683328 h 7.454305 V 4.141741 A 0.57340799,0.57340799 0 0 0 21.21142,4.715149 0.57340799,0.57340799 0 0 0 21.784828,4.141741 V 2.9949252 A 0.57346533,0.57346533 0 0 0 21.21142,2.4215171 H 17.65898 L 17.110209,1.5434862 a 0.57340799,0.57340799 0 0 0 -0.519651,-0.268785 z"
+       style="stroke-width:1.05077" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0"
+       id="path1434"
+       d="M 5.8710186,3.9981341 V 18.013618 H 3.7630188 l 2.6349997,3.161999 2.6349997,-3.161999 H 6.9250185 V 3.9981341 Z"
+       style="stroke-width:0.965729" />
     <!-- Arrow -->
-    <path d="m 6.5,20 -2.5,-3 h 2 v -15 h 1 v 15 h 2 z" style="fill:#5a5a5a"/>
   </g>
 </svg>
diff --git a/share/pixmaps/symbolic_icons.svg b/share/pixmaps/symbolic_icons.svg
index 12d035d95..b9860cf8a 100644
--- a/share/pixmaps/symbolic_icons.svg
+++ b/share/pixmaps/symbolic_icons.svg
@@ -1773,13 +1773,13 @@
 <path style="opacity:0.3;fill:url(#linearGradient19282)" d="m 589,841.3622 2.6875,3.5 -2.6875,3.5 2.6562,0 1.3438,-1.75 1.3437,1.75 2.6563,0 -2.6875,-3.5 2.6875,-3.5 -2.6563,0 -1.3437,1.75 -1.3438,-1.75 -2.6562,0 z" id="path15886" inkscape:connector-curvature="0" />
 <path sodipodi:nodetypes="ccccccccc" style="fill:url(#linearGradient19282)" d="m 595.9062,844.3622 3.4032,4.5745 -2.3094,3.4255 2.8772,0 5.1228,-8 -2.5237,0 -1.9062,2.9763 -2.0076,-2.9763 z" id="path15888" inkscape:connector-curvature="0" />
 </g>
-<g id="format-text-direction-vertical" inkscape:label="#writing_mode_tb" transform="translate(59.99,31.00002)">
+<g id="frmt-text-direction-vertical" inkscape:label="#writing_mode_tb" transform="translate(59.99,31.00002)">
 <rect y="805.3622" x="559" height="16" width="16" id="rect15925" style="opacity:0.3;fill:none" />
 <path sodipodi:nodetypes="cccccccc" style="fill:url(#linearGradient19282)" d="m 561,806.3622 2,0 0.01,11.0058 2,0 -3,2.9883 -3,-2.9883 2,0 z" id="path15933" inkscape:connector-curvature="0" />
 <path inkscape:connector-curvature="0" id="path15956" d="m 571,806.3622 2,0 0.01,11.0058 2,0 -3,2.9883 -3,-2.9883 2,0 z" style="fill:url(#linearGradient19282)" sodipodi:nodetypes="cccccccc" />
 <path style="fill:url(#linearGradient19282)" d="m 565.9864,807.3681 -2.5031,6.9896 1.5019,0 c 0.744,-1.997 0,10e-4 0.7424,-1.9955 l 2.5585,0.018 0.7041,1.9775 1.5019,0 -2.5031,-6.9896 z m 1.0013,1.4978 1.0123,2.4963 -2.0025,0 z" id="path15962" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccc" />
 </g>
-<g id="format-text-direction-horizontal" inkscape:label="#writing_mode_lr" transform="translate(59.99,31.00002)">
+<g id="frmt-text-direction-horizontal" inkscape:label="#writing_mode_lr" transform="translate(59.99,31.00002)">
 <rect style="opacity:0.3;fill:none" id="rect15975" width="16" height="16" x="589" y="805.3622" />
 <path sodipodi:nodetypes="cccccccc" style="fill:url(#linearGradient19282)" d="m 589.9942,809.3682 0,-2 11.0058,-0.01 0,-2 2.9883,3 -2.9883,3 0,-2 z" id="path15977" inkscape:connector-curvature="0" />
 <path id="path15979" transform="translate(0,512.3622)" d="m 601,304 0,2 -11,0 0,2 11,0 0,1 1,0 2,-2 -3,-3 z" style="fill:url(#linearGradient19282)" inkscape:connector-curvature="0" />
diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index 7326d82bb..042b66e6c 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -350,7 +350,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
     }
     /* Line height units */
     {
-        _line_height_units_item = _tracker->create_tool_item( _("Units"), ("") );
+        _line_height_units_item = _tracker->create_tool_item( _("Units"), (""));
         _line_height_units_item->signal_changed_after().connect(sigc::mem_fun(*this, &TextToolbar::lineheight_unit_changed));
         add(*_line_height_units_item);
     }
@@ -522,19 +522,19 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
         row = *(store->append());
         row[columns.col_label    ] = _("Horizontal");
         row[columns.col_tooltip  ] = _("Horizontal text");
-        row[columns.col_icon     ] = INKSCAPE_ICON("format-text-direction-horizontal");
+        row[columns.col_icon     ] = INKSCAPE_ICON("frmt-text-direction-horizontal");
         row[columns.col_sensitive] = true;
 
         row = *(store->append());
         row[columns.col_label    ] = _("Vertical — RL");
         row[columns.col_tooltip  ] = _("Vertical text — lines: right to left");
-        row[columns.col_icon     ] = INKSCAPE_ICON("format-text-direction-vertical");
+        row[columns.col_icon     ] = INKSCAPE_ICON("frmt-text-direction-vertical");
         row[columns.col_sensitive] = true;
 
         row = *(store->append());
         row[columns.col_label    ] = _("Vertical — LR");
         row[columns.col_tooltip  ] = _("Vertical text — lines: left to right");
-        row[columns.col_icon     ] = INKSCAPE_ICON("format-text-direction-vertical-lr");
+        row[columns.col_icon     ] = INKSCAPE_ICON("frmt-text-direction-vertical-lr");
         row[columns.col_sensitive] = true;
 
         _writing_mode_item =
@@ -584,7 +584,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
                                               "Not Used",               // Icon
                                               store );                  // List store
         _orientation_item->use_icon(true);
-        _orientation_item->use_label( false );
+        _orientation_item->use_label(false);
         gint mode = prefs->getInt("/tools/text/text_orientation", 0);
         _orientation_item->set_active( mode );
         add(*_orientation_item);
@@ -603,13 +603,13 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
         row = *(store->append());
         row[columns.col_label    ] = _("LTR");
         row[columns.col_tooltip  ] = _("Left to right text");
-        row[columns.col_icon     ] = INKSCAPE_ICON("format-text-direction-horizontal");
+        row[columns.col_icon     ] = INKSCAPE_ICON("frmt-text-direction-horizontal");
         row[columns.col_sensitive] = true;
 
         row = *(store->append());
         row[columns.col_label    ] = _("RTL");
         row[columns.col_tooltip  ] = _("Right to left text");
-        row[columns.col_icon     ] = INKSCAPE_ICON("format-text-direction-r2l");
+        row[columns.col_icon     ] = INKSCAPE_ICON("frmt-text-direction-r2l");
         row[columns.col_sensitive] = true;
 
         _direction_item =
@@ -622,6 +622,7 @@ TextToolbar::TextToolbar(SPDesktop *desktop)
         gint mode = prefs->getInt("/tools/text/text_direction", 0);
         _direction_item->set_active( mode );
         add(*_direction_item);
+
         _direction_item->signal_changed_after().connect(sigc::mem_fun(*this, &TextToolbar::direction_changed));
     }
 
diff --git a/src/ui/widget/combo-tool-item.cpp b/src/ui/widget/combo-tool-item.cpp
index 6adafe316..c3adf921f 100644
--- a/src/ui/widget/combo-tool-item.cpp
+++ b/src/ui/widget/combo-tool-item.cpp
@@ -14,7 +14,7 @@
 */
 
 #include "combo-tool-item.h"
-
+#include "preferences.h"
 #include <iostream>
 #include <utility>
 #include <gtkmm/toolitem.h>
@@ -106,10 +106,22 @@ ComboToolItem::populate_combobox()
 
     ComboToolItemColumns columns;
     if (_use_icon) {
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        if (prefs->getBool("/theme/symbolicIcons", false)) {
+            auto children = _store->children();
+            for (auto row : children) {
+                Glib::ustring icon = row[columns.col_icon];
+                gint pos = icon.find("-symbolic");
+                if (pos == std::string::npos) {
+                    icon += "-symbolic";
+                }
+                row[columns.col_icon] = icon;
+            }
+        }
         Gtk::CellRendererPixbuf *renderer = new Gtk::CellRendererPixbuf;
         renderer->set_property ("stock_size", Gtk::ICON_SIZE_LARGE_TOOLBAR);
         _combobox->pack_start (*renderer, false);
-        _combobox->add_attribute (*renderer, "icon_name", columns.col_icon   );
+        _combobox->add_attribute (*renderer, "icon_name", columns.col_icon );
     } else if (_use_pixbuf) {
         Gtk::CellRendererPixbuf *renderer = new Gtk::CellRendererPixbuf;
         //renderer->set_property ("stock_size", Gtk::ICON_SIZE_LARGE_TOOLBAR);
-- 
cgit v1.2.3