diff --git a/icons/16x16/format-text-none.svg b/icons/16x16/format-text-none.svg
new file mode 100644
index 00000000..f864f351
--- /dev/null
+++ b/icons/16x16/format-text-none.svg
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="16px"
+   height="16px"
+   id="svg4597"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="format-text-none.svg">
+  <defs
+     id="defs4599">
+    <linearGradient
+       id="linearGradient6977-28-2-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop6979-4-5-5" />
+      <stop
+         id="stop6981-1-2-8"
+         offset="0.6102711"
+         style="stop-color:#2e3436;stop-opacity:1" />
+      <stop
+         id="stop6983-3-5-43"
+         offset="0.85851747"
+         style="stop-color:#888a85;stop-opacity:1" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="1"
+         id="stop6985-44-1-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7113-62-9-4"
+       inkscape:collect="always">
+      <stop
+         id="stop7115-8-20-7"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop7117-6-9-41"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4256"
+       inkscape:collect="always">
+      <stop
+         id="stop4258"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4260"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6977-28-2-3"
+       id="radialGradient4743"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.61013339,-1.0734673,0,174.224,-25.823876)"
+       cx="39.088383"
+       cy="219.06908"
+       fx="39.088383"
+       fy="219.06908"
+       r="22" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7113-62-9-4"
+       id="linearGradient4745"
+       gradientUnits="userSpaceOnUse"
+       x1="-57.984837"
+       y1="11.971753"
+       x2="-58.111061"
+       y2="-0.03020489" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4256"
+       id="linearGradient4747"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-59.984835,-4.0298118)"
+       x1="7.2478447"
+       y1="6.3656702"
+       x2="12.993087"
+       y2="16.751301" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4256"
+       id="linearGradient4749"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-59.984835,-4.0298118)"
+       x1="8.2643108"
+       y1="14.541593"
+       x2="4.7950678"
+       y2="10.431535" />
+    <linearGradient
+       id="linearGradient3242">
+      <stop
+         offset="0"
+         style="stop-color:#f8b17e;stop-opacity:1"
+         id="stop3244" />
+      <stop
+         offset="0.31209752"
+         style="stop-color:#e35d4f;stop-opacity:1"
+         id="stop3246" />
+      <stop
+         offset="0.57054454"
+         style="stop-color:#c6262e;stop-opacity:1"
+         id="stop3248" />
+      <stop
+         offset="1"
+         style="stop-color:#690b54;stop-opacity:1"
+         id="stop3250" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2490">
+      <stop
+         offset="0"
+         style="stop-color:#791235;stop-opacity:1"
+         id="stop2492" />
+      <stop
+         offset="1"
+         style="stop-color:#dd3b27;stop-opacity:1"
+         id="stop2494" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7916">
+      <stop
+         id="stop7918"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop7920"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="32.702335"
+       x2="16.331276"
+       y1="20.584223"
+       x1="28.449389"
+       gradientTransform="matrix(0.3077295,-0.29497944,0.3077295,0.29497944,25.634631,17.292858)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2419"
+       xlink:href="#linearGradient7916"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5647">
+      <stop
+         id="stop5649"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop5651"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7916"
+       id="linearGradient4805"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.19694688,-0.20520309,0.19694688,0.20520309,182.13207,-47.935531)"
+       x1="28.449389"
+       y1="20.584223"
+       x2="16.331276"
+       y2="32.702335" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7916"
+       id="linearGradient4808"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.19694688,-0.20520309,0.19694688,0.20520309,182.33061,-48.039071)"
+       x1="36.010902"
+       y1="13.022708"
+       x2="16.331276"
+       y2="32.702335" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3242"
+       id="linearGradient4811"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3705263,0,0,0.38647344,187.53368,-52.663271)"
+       x1="11.192374"
+       y1="4.0641627"
+       x2="11.192374"
+       y2="30.298229" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2490"
+       id="linearGradient4813"
+       gradientUnits="userSpaceOnUse"
+       x1="41.225124"
+       y1="23.238064"
+       x2="41.225124"
+       y2="7.9166722"
+       gradientTransform="matrix(0.64000001,0,0,0.69565218,165.72591,-59.965345)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="22"
+     inkscape:cy="-9.5"
+     inkscape:current-layer="g5518"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     showborder="false"
+     inkscape:window-width="462"
+     inkscape:window-height="408"
+     inkscape:window-x="807"
+     inkscape:window-y="159"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4602">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g16-8"
+       style="display:inline;enable-background:new"
+       transform="translate(0,-9.7991298e-4)">
+      <g
+         id="g5518"
+         inkscape:export-filename="/home/lapo/Desktop/format-text.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90"
+         transform="translate(-180,60)">
+        <g
+           id="g3612"
+           inkscape:export-filename="/home/lapo/Desktop/format-text.png"
+           inkscape:export-xdpi="90"
+           inkscape:export-ydpi="90"
+           transform="translate(240.98463,-57.969794)">
+          <path
+             inkscape:connector-curvature="0"
+             d="m -54.984835,0.4701882 c -0.133754,-0.003858 -0.263185,0.0475806 -0.357802,0.142198 -0.09462,0.0946175 -0.146056,0.2240483 -0.142198,0.357802 l 0,1 c -0.0039,0.1337537 0.04758,0.2631845 0.142198,0.357802 0.09462,0.094617 0.224048,0.146056 0.357802,0.142198 3.000107,0 2.771516,0.00347 3.625,0.25 0.426742,0.1232654 0.569536,0.264441 0.6875,0.46875 0.117964,0.204309 0.185652,0.5493391 0.1875,1.09375 l 0,0.1875 -2.5,0 c -1.178461,0.022794 -1.475394,0.016591 -2.5625,0.4375 -0.543553,0.2104548 -1.058614,0.5497257 -1.40625,1.0625 -0.347636,0.5127743 -0.53125,1.1789739 -0.53125,2 0,0.7635038 0.03698,1.348337 0.15625,1.84375 0.119266,0.4954128 0.35812,0.9262468 0.75,1.1874998 0.783759,0.522506 0.84375,0.46875 2.59375,0.46875 1.404462,0.01929 2.49198,-0.296984 3.5,-1.125 l 0,0.625 c -0.0039,0.133754 0.04758,0.263185 0.142198,0.357802 0.09462,0.09462 0.224048,0.146056 0.357802,0.142198 l 3,0 c 0.133754,0.0039 0.263185,-0.04758 0.357802,-0.142198 0.09462,-0.09462 0.146056,-0.224048 0.142198,-0.357802 l 0,-0.9999998 c 0.0039,-0.133754 -0.04758,-0.263185 -0.142198,-0.357802 -0.09462,-0.094617 -0.224048,-0.146056 -0.357802,-0.142198 l -1.5,0 0,-4.375 c 0,-1.0602805 -0.115145,-1.8704791 -0.34375,-2.53125 -0.228605,-0.6607709 -0.605172,-1.1848662 -1.125,-1.5 -1.039656,-0.6302677 -1.767285,-0.59375 -2.3125,-0.59375 -1.722754,0.0115436 -1.21625,0 -2.71875,0 z m 4.5,6 0,1.21875 c -0.703863,0.6613073 -2.05152,1.453548 -3.15625,1.65625 -0.584592,0.107264 -1.053007,0.038383 -1.34375,-0.15625 -0.290743,-0.194633 -0.502598,-0.5409526 -0.5,-1.34375 -0.0025,-0.4064377 0.06539,-0.6279229 0.1875,-0.78125 0.122114,-0.1533271 0.339791,-0.304434 0.75,-0.40625 0.7475,-0.1855336 2.132562,-0.1841946 4.0625,-0.1875 z"
+             id="path3614"
+             sodipodi:nodetypes="csccscsscccssssscccsccsccscccssccccsssssc"
+             style="font-size:21.15485954px;font-style:normal;font-weight:bold;color:#000000;fill:url(#radialGradient4743);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4745);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Serif" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m -54.984835,0.9701882 0,1 c 1.190146,-4.095e-4 -0.642107,0.00912 0.71875,0 4.417035,0 4.28125,0.4663672 4.28125,4.125 l 0,4.8749998 2,0 1,0 0,-0.9999998 -2,0 0,-4.875 c 0,-4.122568 -1.789656,-4.125 -4.28125,-4.125 -1.726802,0.0115707 -0.21875,0 -1.71875,0 z m 3,4 c -1.899318,0.036737 -3.972849,0.028937 -4.71875,1.5625 0.983275,-0.526179 2.385547,-0.536713 3.71875,-0.5625 l 2,0 0,-0.6875 c -4.1e-4,-0.1208149 -0.02487,-0.2039587 -0.03125,-0.3125 l -0.96875,0 z"
+             id="path3616"
+             sodipodi:nodetypes="ccccccccccccccccccc"
+             style="font-size:21.15485954px;font-style:normal;font-weight:bold;opacity:0.4;fill:url(#linearGradient4747);fill-opacity:1;stroke:none;font-family:Bitstream Vera Serif" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m -55.891085,7.3139382 c -0.753659,0.255553 -1.099049,0.677001 -1.09375,1.53125 -0.0117,3.6144438 4.492137,1.6246468 6,0.0625 l 0,-0.21875 c -1.915234,1.278052 -5.009723,2.1606748 -5,-0.84375 -0.0012,-0.201118 0.05879,-0.370747 0.09375,-0.53125 z"
+             id="path3618"
+             sodipodi:nodetypes="ccccsc"
+             style="font-size:21.15485954px;font-style:normal;font-weight:bold;opacity:0.21072795;fill:url(#linearGradient4749);fill-opacity:1;stroke:none;font-family:Bitstream Vera Serif" />
+        </g>
+        <path
+           inkscape:connector-curvature="0"
+           style="font-size:59.90107727000000182px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4811);fill-opacity:1;stroke:url(#linearGradient4813);stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+           d="m 195.5,-45.784118 -2.0384,-2.049501 1.96142,-2.147073 -1.41391,-1.329922 -2.01857,2.046035 -2.05948,-2.046035 -1.47106,1.378839 2.05948,2.089411 -2.05948,2.056046 1.47106,1.432225 2.05709,-2.148338 2.06188,2.148338 1.44997,-1.430025 z"
+           id="text1314"
+           sodipodi:nodetypes="ccccccccccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="font-size:59.90107727px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:0.5;fill:none;stroke:url(#linearGradient4808);stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+           d="m 194.01392,-49.900902 -2.00624,2.049356 -2.09215,-2.047403"
+           id="path7076"
+           sodipodi:nodetypes="ccc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="font-size:59.90107727px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:0.4;fill:none;stroke:url(#linearGradient4805);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+           d="m 194.3566,-45.376933 -1.66668,-1.887606 m -1.42902,0.08076 -1.73943,1.713246"
+           id="path3165"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <g
+         id="g126"
+         inkscape:export-filename="/home/lapo/Desktop/format-text.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90"
+         style="display:inline"
+         transform="matrix(1.1234418,0,-0.7136519,1.2607334,166.69725,2.9002995)" />
+      <g
+         id="g128"
+         inkscape:export-filename="/home/lapo/Desktop/format-text.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90"
+         style="fill:#fce94f;stroke:none;display:inline"
+         transform="matrix(1.1234418,0,-0.7136519,1.2607334,166.69725,2.9002995)" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/24x24/format-text-none.svg b/icons/24x24/format-text-none.svg
new file mode 100644
index 00000000..2757e6dc
--- /dev/null
+++ b/icons/24x24/format-text-none.svg
@@ -0,0 +1,452 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="24"
+   height="24"
+   id="svg4594"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="format-text-none-24.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="444"
+     inkscape:window-height="408"
+     id="namedview77"
+     showgrid="false"
+     showborder="false"
+     inkscape:zoom="1"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-x="393"
+     inkscape:window-y="159"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4594" />
+  <defs
+     id="defs4596">
+    <linearGradient
+       id="linearGradient3787-6">
+      <stop
+         id="stop3789-60"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3791-2"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6977-28-7">
+      <stop
+         id="stop6979-4-8"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6981-1-8"
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="0.6102711" />
+      <stop
+         id="stop6983-3-2"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0.85851747" />
+      <stop
+         id="stop6985-44-5"
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7113-62-52">
+      <stop
+         id="stop7115-8-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop7117-6-4"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4256">
+      <stop
+         id="stop4258"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4260"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="11.03125"
+       cy="17.125"
+       r="9.84375"
+       fx="11.03125"
+       fy="17.125"
+       id="radialGradient4675"
+       xlink:href="#linearGradient3787-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.2730159,0,12.449603)" />
+    <radialGradient
+       cx="37.839142"
+       cy="126.90098"
+       r="22"
+       fx="37.839142"
+       fy="126.90098"
+       id="radialGradient4677"
+       xlink:href="#linearGradient6977-28-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.5259017e-8,0.93154556,-1.6389592,1.5000453e-7,244.93186,-38.900758)" />
+    <linearGradient
+       x1="39"
+       y1="14.000207"
+       x2="39"
+       y2="-1.0002024"
+       id="linearGradient4679"
+       xlink:href="#linearGradient7113-62-52"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="7.2478447"
+       y1="6.3656702"
+       x2="12.993087"
+       y2="16.751301"
+       id="linearGradient4681"
+       xlink:href="#linearGradient4256"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="8"
+       y1="1052.3622"
+       x2="8"
+       y2="1039.6725"
+       id="linearGradient2433"
+       xlink:href="#linearGradient3195"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1036.3622)" />
+    <linearGradient
+       x1="11.375383"
+       y1="1051.4489"
+       x2="11.375383"
+       y2="1037.3622"
+       id="linearGradient2430"
+       xlink:href="#linearGradient2490"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1036.3622)" />
+    <linearGradient
+       x1="5.6815348"
+       y1="1038.5883"
+       x2="5.6815348"
+       y2="1054.8181"
+       id="linearGradient2428"
+       xlink:href="#linearGradient3242"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1036.3622)" />
+    <linearGradient
+       x1="8"
+       y1="1037.3622"
+       x2="8"
+       y2="1051.3622"
+       id="linearGradient2425"
+       xlink:href="#linearGradient3195"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8461539,0,0,0.8461527,1.2307693,-875.68989)" />
+    <linearGradient
+       x1="8"
+       y1="1037.3622"
+       x2="8"
+       y2="1051.3622"
+       id="linearGradient3930"
+       xlink:href="#linearGradient3195"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8461539,0,0,0.8461527,1.2307693,-875.68989)" />
+    <linearGradient
+       id="linearGradient3195">
+      <stop
+         id="stop3197"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3199"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="5.6815348"
+       y1="1038.5883"
+       x2="5.6815348"
+       y2="1054.8181"
+       id="linearGradient4000"
+       xlink:href="#linearGradient3242"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3242">
+      <stop
+         id="stop3244"
+         style="stop-color:#f8b17e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3246"
+         style="stop-color:#e35d4f;stop-opacity:1"
+         offset="0.31209752" />
+      <stop
+         id="stop3248"
+         style="stop-color:#c6262e;stop-opacity:1"
+         offset="0.57054454" />
+      <stop
+         id="stop3250"
+         style="stop-color:#690b54;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="11.375383"
+       y1="1051.4489"
+       x2="11.375383"
+       y2="1037.3622"
+       id="linearGradient3998"
+       xlink:href="#linearGradient2490"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2490">
+      <stop
+         id="stop2492"
+         style="stop-color:#791235;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2494"
+         style="stop-color:#dd3b27;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="8"
+       y1="1052.3622"
+       x2="8"
+       y2="1039.6725"
+       id="linearGradient3201"
+       xlink:href="#linearGradient3195"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="8"
+       y1="1052.3622"
+       x2="8"
+       y2="1039.6725"
+       id="linearGradient4743"
+       xlink:href="#linearGradient3195"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1036.3622)" />
+    <linearGradient
+       x1="5.6815348"
+       y1="1038.5883"
+       x2="5.6815348"
+       y2="1054.8181"
+       id="linearGradient4745"
+       xlink:href="#linearGradient3242"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1036.3622)" />
+    <linearGradient
+       x1="11.375383"
+       y1="1051.4489"
+       x2="11.375383"
+       y2="1037.3622"
+       id="linearGradient4747"
+       xlink:href="#linearGradient2490"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1036.3622)" />
+    <linearGradient
+       x1="8"
+       y1="1037.3622"
+       x2="8"
+       y2="1051.3622"
+       id="linearGradient4749"
+       xlink:href="#linearGradient3195"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8461539,0,0,0.8461527,1.2307693,-875.68989)" />
+    <linearGradient
+       x1="28.449389"
+       y1="20.584223"
+       x2="16.331276"
+       y2="32.702335"
+       id="linearGradient2419"
+       xlink:href="#linearGradient7916"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3077295,-0.29497944,0.3077295,0.29497944,25.634631,17.292858)" />
+    <linearGradient
+       id="linearGradient7916">
+      <stop
+         id="stop7918"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop7920"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="36.010902"
+       y1="13.022708"
+       x2="16.331276"
+       y2="32.702335"
+       id="linearGradient3167"
+       xlink:href="#linearGradient7916"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3077295,-0.29497944,0.3077295,0.29497944,25.944842,17.144019)" />
+    <linearGradient
+       x1="11.192374"
+       y1="-0.74098766"
+       x2="11.192374"
+       y2="30.298229"
+       id="linearGradient3217"
+       xlink:href="#linearGradient3242"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.57894734,0,0,0.55555556,34.074641,10.496731)" />
+    <radialGradient
+       cx="23.070683"
+       cy="35.127438"
+       r="10.31934"
+       fx="23.070683"
+       fy="35.127438"
+       id="radialGradient2410"
+       xlink:href="#linearGradient2091"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)" />
+    <linearGradient
+       id="linearGradient2091">
+      <stop
+         id="stop2093"
+         style="stop-color:#000000;stop-opacity:0.39215687"
+         offset="0" />
+      <stop
+         id="stop3169"
+         style="stop-color:#000000;stop-opacity:0.3137255"
+         offset="0.5" />
+      <stop
+         id="stop2095"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="41.225124"
+       y1="23.238064"
+       x2="41.225124"
+       y2="7.3900404"
+       id="linearGradient5567"
+       xlink:href="#linearGradient2490"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="11.03125"
+       cy="17.125"
+       r="9.84375"
+       fx="11.03125"
+       fy="17.125"
+       id="radialGradient4675-2"
+       xlink:href="#linearGradient3787-6-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.2730159,0,12.449603)" />
+    <linearGradient
+       id="linearGradient3787-6-1">
+      <stop
+         id="stop3789-60-1"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3791-2-0"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="11.03125"
+       cy="17.125"
+       r="9.84375"
+       fx="11.03125"
+       fy="17.125"
+       id="radialGradient5584"
+       xlink:href="#linearGradient3787-6-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.2730159,0,12.449603)" />
+  </defs>
+  <metadata
+     id="metadata4599">
+    <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>
+  <g
+     transform="translate(0,-8)"
+     id="layer1">
+    <g
+       transform="translate(1.0000004,8.9999997)"
+       id="g22-2"
+       style="display:inline;enable-background:new">
+      <g
+         transform="translate(-180,30)"
+         id="g5607">
+        <path
+           d="m 20.875,17.125 a 9.84375,2.6875 0 1 1 -19.6875,0 9.84375,2.6875 0 1 1 19.6875,0 z"
+           transform="matrix(0.63623879,0,0,0.52434209,187.98149,-19.078839)"
+           id="path3843-1"
+           style="opacity:0.4;color:#000000;fill:url(#radialGradient5584);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           d="m 20.875,17.125 a 9.84375,2.6875 0 1 1 -19.6875,0 9.84375,2.6875 0 1 1 19.6875,0 z"
+           transform="matrix(1.015873,0,0,0.8372092,179.79365,-27.087207)"
+           id="path3843"
+           style="opacity:0.6;color:#000000;fill:url(#radialGradient4675);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <g
+           transform="translate(184,-29.001565)"
+           id="g3831"
+           style="display:inline">
+          <path
+             d="M 43,-0.5 C 42.866246,-0.503858 42.736815,-0.4524194 42.642198,-0.357802 42.547581,-0.2631845 42.496142,-0.1337537 42.5,0 l 0,1 C 42.4961,1.1337537 42.54758,1.2631845 42.642198,1.357802 42.736815,1.4524194 42.866246,1.503858 43,1.5 c 3.000107,0 4.771516,0.00347 5.625,0.25 0.426742,0.1232654 0.569536,0.264441 0.6875,0.46875 0.117964,0.204309 0.185652,1.5493391 0.1875,2.09375 L 49.5,4.5 46,4.5 C 44.821539,4.5227944 43.524606,4.5165905 42.4375,4.9375 41.893947,5.1479548 41.378886,5.4872257 41.03125,6 40.683614,6.5127743 40.5,9.1789739 40.5,10 c 0,0.763504 0.03698,1.348337 0.15625,1.84375 1.118729,2.546152 4.578818,1.639439 6.836167,1.161612 C 48.172307,12.835389 48.928528,12.680176 49.5,12.375 l 0,0.625 c -0.0039,0.133754 0.04758,0.263185 0.142198,0.357802 C 49.736815,13.452419 49.866246,13.503858 50,13.5 l 4,0 c 0.133754,0.0039 0.263185,-0.04758 0.357802,-0.142198 C 54.452419,13.263185 54.503858,13.133754 54.5,13 l 0,-1 C 54.5039,11.866246 54.45242,11.736815 54.357802,11.642198 54.263185,11.547581 54.133754,11.496142 54,11.5 l -1.5,0 0,-6.375 c 0,-1.0602805 -0.115145,-2.8704791 -0.34375,-3.53125 -0.228605,-0.6607709 -0.605172,-1.1848662 -1.125,-1.5 C 49.991594,-0.5365177 49.604757,-0.4942165 47.71875,-0.5 45.995996,-0.4884564 44.5025,-0.5 43,-0.5 z m 6.5,7 0,2.875 c -0.305164,1.138889 -3.05152,1.797298 -4.15625,2 C 44.759158,11.482264 44.290743,11.413383 44,11.21875 43.709257,11.024117 43.497402,10.677797 43.5,9.875 43.497479,9.4685623 43.565386,7.2470771 43.6875,7.09375 43.809614,6.9404229 44.027291,6.789316 44.4375,6.6875 45.185,6.5019664 47.570062,6.5033054 49.5,6.5 z"
+             transform="translate(-40,3)"
+             id="path3833"
+             style="font-size:21.15485954px;font-style:normal;font-weight:bold;color:#000000;fill:url(#radialGradient4677);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4679);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Serif" />
+          <path
+             d="M 3,3 3,4 C 4.1901464,3.9995905 5.3578928,4.0091186 6.71875,4 10.491948,4.0115709 11,4.002432 11,8.125 l 0,7.875 2,0 1,0 0,-1 -2,0 0,-7.875 C 12,3.002432 10.308492,3 7.71875,3 5.991948,3.0115707 4.5,3 3,3 z M 6,8 C 4.1006816,8.0367372 2.027151,8.0289371 1.28125,9.5625 2.264525,9.036321 3.6667974,9.025787 5,9 L 9,9 9,8.3125 C 8.9995899,8.1916851 8.9751262,8.1085413 8.96875,8 L 6,8 z M 3.09375,11.34375 C 2.3400912,11.599303 1.9947007,13.020751 2,13.875 1.988303,17.489444 7.492137,15.499647 9,13.9375 L 9,13.71875 C 5.9597658,14.996802 2.9902773,15.879425 3,12.875 2.99875,12.673882 3.058795,11.504253 3.09375,11.34375 z"
+             id="path3835"
+             style="font-size:21.15485954px;font-style:normal;font-weight:bold;opacity:0.4;fill:url(#linearGradient4681);fill-opacity:1;stroke:none;font-family:Bitstream Vera Serif" />
+        </g>
+        <g
+           transform="translate(153.97799,-31.941175)"
+           id="layer1-3">
+          <path
+             d="m 46.52201,20.385514 -3.184991,-2.946158 3.06471,-3.086417 -2.209232,-1.911764 -3.154011,2.941176 -3.217945,-2.941176 -2.298531,1.982082 3.217944,3.003528 -3.217944,2.955566 2.298531,2.058824 3.214211,-3.088236 3.22168,3.088236 2.265578,-2.055661 z"
+             id="text1314"
+             style="font-size:59.90107727px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient3217);fill-opacity:1;stroke:url(#linearGradient5567);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans" />
+          <path
+             d="m 44.93385,14.418281 -0.647334,-0.627116 -3.264508,2.866366 -3.225731,-2.863558 -0.824531,0.673766"
+             id="path7076"
+             style="font-size:59.90107727px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:0.5;fill:none;stroke:url(#linearGradient3167);stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans" />
+          <path
+             d="m 45.42749,20.732088 -2.99345,-2.713434 m -2.968147,0.03651 -2.804358,2.701545"
+             id="path3165"
+             style="font-size:59.90107727px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:0.4;fill:none;stroke:url(#linearGradient2419);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans" />
+        </g>
+      </g>
+      <g
+         transform="matrix(1.1234418,0,-0.7136519,1.2607334,166.69725,2.9002995)"
+         id="g3532-1"
+         style="display:inline" />
+      <g
+         transform="matrix(1.1234418,0,-0.7136519,1.2607334,166.69725,2.9002995)"
+         id="g3557-05"
+         style="fill:#fce94f;stroke:none;display:inline" />
+    </g>
+  </g>
+</svg>
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 17989942..41132dfb 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -6,11 +6,11 @@ set(ICON_FILES
     mail-sent.png
     menu-down.svg
     non-starred-grey.png
-    remove-formatting.png
     starred.png
 )
 
 set(ICON_FILES_16
+    16x16/format-text-none.svg
     16x16/mail-archive.svg
     16x16/tag.svg
     16x16/tag-new.svg
@@ -18,6 +18,7 @@ set(ICON_FILES_16
 )
 
 set(ICON_FILES_24
+    24x24/format-text-none.svg
     24x24/edit-flag.svg
     24x24/mail-archive.svg
     24x24/mail-move.svg
diff --git a/icons/remove-formatting.png b/icons/remove-formatting.png
deleted file mode 100644
index cc42155c..00000000
Binary files a/icons/remove-formatting.png and /dev/null differ
diff --git a/ui/composer.glade b/ui/composer.glade
index 71214672..e00365a7 100644
--- a/ui/composer.glade
+++ b/ui/composer.glade
@@ -97,7 +97,7 @@
     <child>
       <object class="GtkAction" id="removeformat">
         <property name="label" translatable="yes">Remove formatting</property>
-        <property name="icon_name">remove-formatting</property>
+        <property name="icon_name">format-text-none</property>
       </object>
       <accelerator key="space" modifiers="GDK_CONTROL_MASK"/>
     </child>
@@ -147,7 +147,7 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
+    <property name="spacing">2</property>
     <child>
       <object class="GtkAlignment" id="hidden_on_attachment_drag_over">
         <property name="visible">True</property>
@@ -358,10 +358,8 @@
       <object class="GtkToolbar" id="compose_toolbar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
-        <property name="margin_right">6</property>
         <property name="toolbar_style">icons</property>
-        <property name="icon_size">1</property>
+        <property name="icon_size">2</property>
         <child>
           <object class="GtkToggleToolButton" id="bold button">
             <property name="related_action">bold</property>