diff --git a/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_all.png b/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_all.png
new file mode 100644
index 00000000..04752c3d
Binary files /dev/null and b/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_all.png differ
diff --git a/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_group.png b/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_group.png
new file mode 100644
index 00000000..7bc8b223
Binary files /dev/null and b/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_group.png differ
diff --git a/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_off.png b/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_off.png
new file mode 100644
index 00000000..771d35f2
Binary files /dev/null and b/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_off.png differ
diff --git a/data/icons/HighContrast/16x16/actions/terminator_horiz.png b/data/icons/HighContrast/16x16/actions/terminator_horiz.png
new file mode 100644
index 00000000..8cb6408d
Binary files /dev/null and b/data/icons/HighContrast/16x16/actions/terminator_horiz.png differ
diff --git a/data/icons/HighContrast/16x16/actions/terminator_receive_off.png b/data/icons/HighContrast/16x16/actions/terminator_receive_off.png
new file mode 100644
index 00000000..eba128f3
Binary files /dev/null and b/data/icons/HighContrast/16x16/actions/terminator_receive_off.png differ
diff --git a/data/icons/HighContrast/16x16/actions/terminator_receive_on.png b/data/icons/HighContrast/16x16/actions/terminator_receive_on.png
new file mode 100644
index 00000000..434ad997
Binary files /dev/null and b/data/icons/HighContrast/16x16/actions/terminator_receive_on.png differ
diff --git a/data/icons/HighContrast/16x16/actions/terminator_vert.png b/data/icons/HighContrast/16x16/actions/terminator_vert.png
new file mode 100644
index 00000000..be44d088
Binary files /dev/null and b/data/icons/HighContrast/16x16/actions/terminator_vert.png differ
diff --git a/data/icons/HighContrast/16x16/apps/terminator-custom-commands.png b/data/icons/HighContrast/16x16/apps/terminator-custom-commands.png
new file mode 100644
index 00000000..75a9445d
Binary files /dev/null and b/data/icons/HighContrast/16x16/apps/terminator-custom-commands.png differ
diff --git a/data/icons/HighContrast/16x16/apps/terminator-layout.png b/data/icons/HighContrast/16x16/apps/terminator-layout.png
new file mode 100644
index 00000000..f6485948
Binary files /dev/null and b/data/icons/HighContrast/16x16/apps/terminator-layout.png differ
diff --git a/data/icons/HighContrast/16x16/apps/terminator-preferences.png b/data/icons/HighContrast/16x16/apps/terminator-preferences.png
new file mode 100644
index 00000000..41103fd6
Binary files /dev/null and b/data/icons/HighContrast/16x16/apps/terminator-preferences.png differ
diff --git a/data/icons/HighContrast/16x16/apps/terminator.png b/data/icons/HighContrast/16x16/apps/terminator.png
new file mode 100644
index 00000000..83b04af4
Binary files /dev/null and b/data/icons/HighContrast/16x16/apps/terminator.png differ
diff --git a/data/icons/HighContrast/16x16/status/terminal-bell.png b/data/icons/HighContrast/16x16/status/terminal-bell.png
new file mode 100644
index 00000000..877095b6
Binary files /dev/null and b/data/icons/HighContrast/16x16/status/terminal-bell.png differ
diff --git a/data/icons/HighContrast/22x22/apps/terminator-custom-commands.png b/data/icons/HighContrast/22x22/apps/terminator-custom-commands.png
new file mode 100644
index 00000000..2161b2b7
Binary files /dev/null and b/data/icons/HighContrast/22x22/apps/terminator-custom-commands.png differ
diff --git a/data/icons/HighContrast/22x22/apps/terminator-layout.png b/data/icons/HighContrast/22x22/apps/terminator-layout.png
new file mode 100644
index 00000000..ed221dc4
Binary files /dev/null and b/data/icons/HighContrast/22x22/apps/terminator-layout.png differ
diff --git a/data/icons/HighContrast/22x22/apps/terminator-preferences.png b/data/icons/HighContrast/22x22/apps/terminator-preferences.png
new file mode 100644
index 00000000..9993383c
Binary files /dev/null and b/data/icons/HighContrast/22x22/apps/terminator-preferences.png differ
diff --git a/data/icons/HighContrast/22x22/apps/terminator.png b/data/icons/HighContrast/22x22/apps/terminator.png
new file mode 100644
index 00000000..147e7391
Binary files /dev/null and b/data/icons/HighContrast/22x22/apps/terminator.png differ
diff --git a/data/icons/HighContrast/24x24/apps/terminator-custom-commands.png b/data/icons/HighContrast/24x24/apps/terminator-custom-commands.png
new file mode 100644
index 00000000..33fa537d
Binary files /dev/null and b/data/icons/HighContrast/24x24/apps/terminator-custom-commands.png differ
diff --git a/data/icons/HighContrast/24x24/apps/terminator-layout.png b/data/icons/HighContrast/24x24/apps/terminator-layout.png
new file mode 100644
index 00000000..71823381
Binary files /dev/null and b/data/icons/HighContrast/24x24/apps/terminator-layout.png differ
diff --git a/data/icons/HighContrast/24x24/apps/terminator-preferences.png b/data/icons/HighContrast/24x24/apps/terminator-preferences.png
new file mode 100644
index 00000000..0e9d5e1f
Binary files /dev/null and b/data/icons/HighContrast/24x24/apps/terminator-preferences.png differ
diff --git a/data/icons/HighContrast/24x24/apps/terminator.png b/data/icons/HighContrast/24x24/apps/terminator.png
new file mode 100644
index 00000000..d99ffcee
Binary files /dev/null and b/data/icons/HighContrast/24x24/apps/terminator.png differ
diff --git a/data/icons/HighContrast/32x32/apps/terminator-custom-commands.png b/data/icons/HighContrast/32x32/apps/terminator-custom-commands.png
new file mode 100644
index 00000000..c8ae92ba
Binary files /dev/null and b/data/icons/HighContrast/32x32/apps/terminator-custom-commands.png differ
diff --git a/data/icons/HighContrast/32x32/apps/terminator-layout.png b/data/icons/HighContrast/32x32/apps/terminator-layout.png
new file mode 100644
index 00000000..7ecef061
Binary files /dev/null and b/data/icons/HighContrast/32x32/apps/terminator-layout.png differ
diff --git a/data/icons/HighContrast/32x32/apps/terminator-preferences.png b/data/icons/HighContrast/32x32/apps/terminator-preferences.png
new file mode 100644
index 00000000..d27b510a
Binary files /dev/null and b/data/icons/HighContrast/32x32/apps/terminator-preferences.png differ
diff --git a/data/icons/HighContrast/32x32/apps/terminator.png b/data/icons/HighContrast/32x32/apps/terminator.png
new file mode 100644
index 00000000..ddd43e06
Binary files /dev/null and b/data/icons/HighContrast/32x32/apps/terminator.png differ
diff --git a/data/icons/HighContrast/48x48/apps/terminator-custom-commands.png b/data/icons/HighContrast/48x48/apps/terminator-custom-commands.png
new file mode 100644
index 00000000..0e6f9b6a
Binary files /dev/null and b/data/icons/HighContrast/48x48/apps/terminator-custom-commands.png differ
diff --git a/data/icons/HighContrast/48x48/apps/terminator-layout.png b/data/icons/HighContrast/48x48/apps/terminator-layout.png
new file mode 100644
index 00000000..fac8934e
Binary files /dev/null and b/data/icons/HighContrast/48x48/apps/terminator-layout.png differ
diff --git a/data/icons/HighContrast/48x48/apps/terminator-preferences.png b/data/icons/HighContrast/48x48/apps/terminator-preferences.png
new file mode 100644
index 00000000..ef3316a9
Binary files /dev/null and b/data/icons/HighContrast/48x48/apps/terminator-preferences.png differ
diff --git a/data/icons/HighContrast/48x48/apps/terminator.png b/data/icons/HighContrast/48x48/apps/terminator.png
new file mode 100644
index 00000000..8aa6c713
Binary files /dev/null and b/data/icons/HighContrast/48x48/apps/terminator.png differ
diff --git a/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_all.svg b/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_all.svg
new file mode 100644
index 00000000..75c7951f
--- /dev/null
+++ b/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_all.svg
@@ -0,0 +1,127 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="terminator_active_broadcast_all.svg"
+   inkscape:export-filename="/home/sboddy/Development/terminator/terminator-trunk-ssh/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_all.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective3833" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#828282"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.50980392"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="26.16729"
+     inkscape:cy="9.1686341"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1006"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 1,1 15,0 0,9 -6,0 0,6 -9,0 z"
+       id="path3022"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797"
+       width="7"
+       height="7"
+       x="2"
+       y="2"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797-1"
+       width="7"
+       height="7"
+       x="8"
+       y="1038.3622" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797-5"
+       width="7"
+       height="7"
+       x="2"
+       y="1044.3622" />
+    <path
+       style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 9,3 14,3 9,8 z"
+       id="path3851"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 9,1046.3622 7,0 0,3 -2,2 -3,0 -2,-2 z"
+       id="path3855"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="m 10,1047.3622 0,1 2,2 1,0 2,-2 0,-1 z"
+       id="path3853"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 3,1045.3622 5,0 -5,5 z"
+       id="path3851-5"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_group.svg b/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_group.svg
new file mode 100644
index 00000000..51f158ed
--- /dev/null
+++ b/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_group.svg
@@ -0,0 +1,130 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="terminator_active_broadcast_group.svg"
+   inkscape:export-filename="/home/sboddy/Development/terminator/terminator-trunk-ssh/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_group.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective3833" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#828282"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.50980392"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="85.960388"
+     inkscape:cy="9.8592204"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1006"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 1,1 15,0 0,9 -6,0 0,6 -9,0 z"
+       id="path3022"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797"
+       width="7"
+       height="7"
+       x="2"
+       y="2"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797-1"
+       width="7"
+       height="7"
+       x="8"
+       y="1038.3622" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797-5"
+       width="7"
+       height="7"
+       x="2"
+       y="1044.3622" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3849"
+       width="5"
+       height="5"
+       x="3"
+       y="9"
+       transform="translate(0,1036.3622)" />
+    <path
+       style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 9,3 14,3 9,8 z"
+       id="path3851"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 9,1046.3622 7,0 0,3 -2,2 -3,0 -2,-2 z"
+       id="path3855"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="m 10,1047.3622 0,1 2,2 1,0 2,-2 0,-1 z"
+       id="path3853"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_off.svg b/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_off.svg
new file mode 100644
index 00000000..19358fbc
--- /dev/null
+++ b/data/icons/HighContrast/scalable/actions/terminator_active_broadcast_off.svg
@@ -0,0 +1,131 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="terminator_active_broadcast_off.svg"
+   inkscape:export-filename="/home/sboddy/Development/terminator/terminator-trunk-ssh/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_off.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective3833" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#828282"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.50980392"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="26.16729"
+     inkscape:cy="9.1686341"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1006"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 1,1 15,0 0,9 -6,0 0,6 -9,0 z"
+       id="path3022"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797"
+       width="7"
+       height="7"
+       x="2"
+       y="2"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797-1"
+       width="7"
+       height="7"
+       x="8"
+       y="1038.3622" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797-5"
+       width="7"
+       height="7"
+       x="2"
+       y="1044.3622" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3849"
+       width="5"
+       height="5"
+       x="3"
+       y="9"
+       transform="translate(0,1036.3622)" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 9,1046.3622 7,0 0,3 -2,2 -3,0 -2,-2 z"
+       id="path3855"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="m 10,1047.3622 0,1 2,2 1,0 2,-2 0,-1 z"
+       id="path3853"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3849-2"
+       width="5"
+       height="5"
+       x="9"
+       y="1039.3622" />
+  </g>
+</svg>
diff --git a/data/icons/HighContrast/scalable/actions/terminator_horiz.svg b/data/icons/HighContrast/scalable/actions/terminator_horiz.svg
new file mode 100644
index 00000000..1c75798d
--- /dev/null
+++ b/data/icons/HighContrast/scalable/actions/terminator_horiz.svg
@@ -0,0 +1,98 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="terminator_horiz.svg"
+   inkscape:export-filename="/home/sboddy/Development/terminator/terminator-trunk-ssh/data/icons/HighContrast/16x16/actions/terminator_horiz.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective3833" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#828282"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.50980392"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="23.220414"
+     inkscape:cy="7.1298732"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1006"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3849"
+       width="16"
+       height="16.000017"
+       x="0"
+       y="1036.3622" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797"
+       width="14"
+       height="6.0000172"
+       x="1"
+       y="1037.3622" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797-5"
+       width="14"
+       height="5.9999828"
+       x="1"
+       y="1045.3622" />
+  </g>
+</svg>
diff --git a/data/icons/HighContrast/scalable/actions/terminator_receive_off.svg b/data/icons/HighContrast/scalable/actions/terminator_receive_off.svg
new file mode 100644
index 00000000..ac0cb3ba
--- /dev/null
+++ b/data/icons/HighContrast/scalable/actions/terminator_receive_off.svg
@@ -0,0 +1,138 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="terminator_receive_off.svg"
+   inkscape:export-filename="/home/sboddy/Development/terminator/terminator-trunk-ssh/data/icons/HighContrast/16x16/actions/terminator_receive_off.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective3833" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#828282"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.50980392"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="28.373088"
+     inkscape:cy="7.4989073"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1006"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 1,1 15,0 0,9 -6,0 0,6 -9,0 z"
+       id="path3022"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797"
+       width="7"
+       height="7"
+       x="2"
+       y="2"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797-1"
+       width="7"
+       height="7"
+       x="8"
+       y="1038.3622" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797-5"
+       width="7"
+       height="7"
+       x="2"
+       y="1044.3622" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3849"
+       width="5"
+       height="5"
+       x="3"
+       y="9"
+       transform="translate(0,1036.3622)" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 9,1046.3622 7,0 0,3 -2,2 -3,0 -2,-2 z"
+       id="path3855"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="m 10,1047.3622 0,1 2,2 1,0 2,-2 0,-1 z"
+       id="path3853"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3849-2"
+       width="5"
+       height="5"
+       x="9"
+       y="1039.3622" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3849-2-1"
+       width="5"
+       height="5"
+       x="3"
+       y="1039.3622" />
+  </g>
+</svg>
diff --git a/data/icons/HighContrast/scalable/actions/terminator_receive_on.svg b/data/icons/HighContrast/scalable/actions/terminator_receive_on.svg
new file mode 100644
index 00000000..ca42e189
--- /dev/null
+++ b/data/icons/HighContrast/scalable/actions/terminator_receive_on.svg
@@ -0,0 +1,136 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="terminator_receive_on.svg"
+   inkscape:export-filename="/home/sboddy/Development/terminator/terminator-trunk-ssh/data/icons/HighContrast/16x16/actions/terminator_active_broadcast_group.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective3833" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#828282"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.50980392"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="28.373088"
+     inkscape:cy="7.4989073"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1006"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 1,1 15,0 0,9 -6,0 0,6 -9,0 z"
+       id="path3022"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797"
+       width="7"
+       height="7"
+       x="2"
+       y="2"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797-1"
+       width="7"
+       height="7"
+       x="8"
+       y="1038.3622" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3797-5"
+       width="7"
+       height="7"
+       x="2"
+       y="1044.3622" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3849"
+       width="5"
+       height="5"
+       x="3"
+       y="9"
+       transform="translate(0,1036.3622)" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 3,1039.3622 5,0 -5,5 z"
+       id="path3851"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 9,1046.3622 7,0 0,3 -2,2 -3,0 -2,-2 z"
+       id="path3855"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="m 10,1047.3622 0,1 2,2 1,0 2,-2 0,-1 z"
+       id="path3853"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3849-2"
+       width="5"
+       height="5"
+       x="9"
+       y="1039.3622" />
+  </g>
+</svg>
diff --git a/data/icons/HighContrast/scalable/actions/terminator_vert.svg b/data/icons/HighContrast/scalable/actions/terminator_vert.svg
new file mode 100644
index 00000000..1cf4f763
--- /dev/null
+++ b/data/icons/HighContrast/scalable/actions/terminator_vert.svg
@@ -0,0 +1,99 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="terminator_vert.svg"
+   inkscape:export-filename="/home/sboddy/Development/terminator/terminator-trunk-ssh/data/icons/HighContrast/16x16/actions/terminator_vert.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective3833" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#828282"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.50980392"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="22.525073"
+     inkscape:cy="10.102324"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1006"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3849"
+       width="16"
+       height="16.000017"
+       x="0"
+       y="1036.3622" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3003"
+       width="6"
+       height="14"
+       x="1"
+       y="1"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3003-5"
+       width="6"
+       height="14"
+       x="9"
+       y="1037.3622" />
+  </g>
+</svg>
diff --git a/data/icons/HighContrast/scalable/apps/terminator-custom-commands.svg b/data/icons/HighContrast/scalable/apps/terminator-custom-commands.svg
new file mode 100644
index 00000000..a7982554
--- /dev/null
+++ b/data/icons/HighContrast/scalable/apps/terminator-custom-commands.svg
@@ -0,0 +1,193 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="terminator-custom-commands_A.svg"
+   inkscape:export-filename="/home/sboddy/Development/terminator/terminator-trunk-ssh/data/icons/HighContrast/16x16/apps/terminator-custom-commands_48png.png"
+   inkscape:export-xdpi="270"
+   inkscape:export-ydpi="270">
+  <defs
+     id="defs4">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3776">
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="rect3778"
+         width="4.7600646"
+         height="3.3320534"
+         x="-7.8439369"
+         y="1042.3563" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#828282"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.50980392"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="13.368211"
+     inkscape:cy="5.9507832"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1006"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3116"
+       width="16"
+       height="16"
+       x="0"
+       y="0"
+       transform="translate(0,1036.3622)"
+       ry="2"
+       rx="2" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3886"
+       width="14"
+       height="14"
+       x="1"
+       y="1"
+       transform="translate(0,1036.3622)"
+       rx="1"
+       ry="1" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3888"
+       width="12"
+       height="12"
+       x="2"
+       y="2"
+       transform="translate(0,1036.3622)"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4128"
+       width="12"
+       height="1"
+       x="2"
+       y="4"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4130"
+       width="1"
+       height="2"
+       x="5"
+       y="2"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4132"
+       width="1"
+       height="2"
+       x="10"
+       y="2"
+       transform="translate(0,1036.3622)" />
+    <path
+       style="fill:#000000;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 6,4 4,-2 0,2 z"
+       id="path4134"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4136"
+       width="3"
+       height="2"
+       x="2"
+       y="2"
+       transform="translate(0,1036.3622)"
+       rx="0"
+       ry="0" />
+    <g
+       id="g3769"
+       transform="matrix(2.1008118,0,0,2.1008118,19.478635,-1147.4323)"
+       clip-path="url(#clipPath3776)">
+      <path
+         inkscape:transform-center-y="-0.28647451"
+         transform="translate(2.5938305,1040.3821)"
+         d="M -6.9999999,2 -7.0357723,5.2838281 -4.8786796,2.8786797 -7.2259916,5.175402 -4,5.0000001 -7.2838281,4.9642277 -4.8786797,7.1213204 -7.175402,4.7740084 -7.0000001,8 -6.9642277,4.7161719 -9.1213204,7.1213203 -6.7740084,4.824598 -10,4.9999999 l 3.2838281,0.035772 -2.4051484,-2.1570927 2.2967223,2.347312 z"
+         inkscape:randomized="0"
+         inkscape:rounded="4.1980308e-16"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.6961702"
+         sodipodi:arg1="-1.5707963"
+         sodipodi:r2="0.28607354"
+         sodipodi:r1="3"
+         sodipodi:cy="5"
+         sodipodi:cx="-7"
+         sodipodi:sides="8"
+         id="path2995"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.10599995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="star" />
+      <path
+         transform="matrix(1.9710551,0,0,1.9710551,7.39712,1036.1451)"
+         d="m -4.7729706,4.6862917 c 0,0.6712136 -0.5441261,1.2153398 -1.2153397,1.2153398 -0.6712137,0 -1.2153398,-0.5441262 -1.2153398,-1.2153398 0,-0.6712136 0.5441261,-1.2153398 1.2153398,-1.2153398 0.6712136,0 1.2153397,0.5441262 1.2153397,1.2153398 z"
+         sodipodi:ry="1.2153398"
+         sodipodi:rx="1.2153398"
+         sodipodi:cy="4.6862917"
+         sodipodi:cx="-5.9883103"
+         id="path3765"
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="path3767"
+         sodipodi:cx="-5.9883103"
+         sodipodi:cy="4.6862917"
+         sodipodi:rx="1.2153398"
+         sodipodi:ry="1.2153398"
+         d="m -4.7729706,4.6862917 c 0,0.6712136 -0.5441261,1.2153398 -1.2153397,1.2153398 -0.6712137,0 -1.2153398,-0.5441262 -1.2153398,-1.2153398 0,-0.6712136 0.5441261,-1.2153398 1.2153398,-1.2153398 0.6712136,0 1.2153397,0.5441262 1.2153397,1.2153398 z"
+         transform="matrix(1.1310044,0,0,1.1310044,2.3666358,1040.0819)" />
+    </g>
+  </g>
+</svg>
diff --git a/data/icons/HighContrast/scalable/apps/terminator-layout.svg b/data/icons/HighContrast/scalable/apps/terminator-layout.svg
new file mode 100644
index 00000000..10a91065
--- /dev/null
+++ b/data/icons/HighContrast/scalable/apps/terminator-layout.svg
@@ -0,0 +1,168 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="terminator-layout_A.svg"
+   inkscape:export-filename="/home/sboddy/Development/terminator/terminator-trunk-ssh/data/icons/HighContrast/16x16/apps/terminator-layout22.png"
+   inkscape:export-xdpi="123.75"
+   inkscape:export-ydpi="123.75">
+  <defs
+     id="defs4">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3765">
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3767"
+         width="4.1455574"
+         height="3.6148684"
+         x="18.091976"
+         y="7.2314301" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#828282"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.50980392"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="14.212909"
+     inkscape:cy="6.1318265"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1006"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3116"
+       width="16"
+       height="16"
+       x="0"
+       y="0"
+       transform="translate(0,1036.3622)"
+       ry="2"
+       rx="2" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3886"
+       width="14"
+       height="14"
+       x="1"
+       y="1"
+       transform="translate(0,1036.3622)"
+       rx="1"
+       ry="1" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3888"
+       width="12"
+       height="12"
+       x="2"
+       y="2"
+       transform="translate(0,1036.3622)"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4128"
+       width="12"
+       height="1"
+       x="2"
+       y="4"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4130"
+       width="1"
+       height="2"
+       x="5"
+       y="2"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4132"
+       width="1"
+       height="2"
+       x="10"
+       y="2"
+       transform="translate(0,1036.3622)" />
+    <path
+       style="fill:#000000;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 6,4 4,-2 0,2 z"
+       id="path4134"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4136"
+       width="3"
+       height="2"
+       x="2"
+       y="2"
+       transform="translate(0,1036.3622)"
+       rx="0"
+       ry="0" />
+    <path
+       sodipodi:type="star"
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.54192561;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2993"
+       sodipodi:sides="5"
+       sodipodi:cx="20"
+       sodipodi:cy="9.125"
+       sodipodi:r1="2.7754505"
+       sodipodi:r2="1.0491203"
+       sodipodi:arg1="0.94531129"
+       sodipodi:arg2="1.5736298"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 21.625,11.375 19.997027,10.174116 18.362275,11.365755 19.001313,9.4463675 17.362831,8.2598628 19.38575,8.2745 20.007864,6.3495607 20.61906,8.2779945 22.64203,8.2748214 20.99685,9.4520219 z"
+       transform="matrix(2.8920513,0,0,3.0380779,-50.31209,1019.4103)"
+       clip-path="url(#clipPath3765)" />
+  </g>
+</svg>
diff --git a/data/icons/HighContrast/scalable/apps/terminator-preferences.svg b/data/icons/HighContrast/scalable/apps/terminator-preferences.svg
new file mode 100644
index 00000000..e7820921
--- /dev/null
+++ b/data/icons/HighContrast/scalable/apps/terminator-preferences.svg
@@ -0,0 +1,430 @@
+<?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="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="terminator-preferences_A.svg"
+   inkscape:export-filename="/home/sboddy/Development/terminator/terminator-trunk-ssh/data/icons/HighContrast/16x16/apps/terminator-preferences_48.png"
+   inkscape:export-xdpi="270"
+   inkscape:export-ydpi="270">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5943"
+       id="linearGradient5964"
+       gradientUnits="userSpaceOnUse"
+       x1="-76.875"
+       y1="26.40625"
+       x2="-69.25"
+       y2="36.8125" />
+    <linearGradient
+       id="linearGradient5943">
+      <stop
+         style="stop-color:#e4e4e4;stop-opacity:1;"
+         offset="0"
+         id="stop5945" />
+      <stop
+         style="stop-color:#848484;stop-opacity:1;"
+         offset="1"
+         id="stop5947" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5943"
+       id="linearGradient5966"
+       gradientUnits="userSpaceOnUse"
+       x1="-69.679855"
+       y1="36.21405"
+       x2="-75.663864"
+       y2="27.5578" />
+    <linearGradient
+       id="linearGradient3189">
+      <stop
+         style="stop-color:#e4e4e4;stop-opacity:1;"
+         offset="0"
+         id="stop3191" />
+      <stop
+         style="stop-color:#848484;stop-opacity:1;"
+         offset="1"
+         id="stop3193" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3890"
+       id="linearGradient3896"
+       x1="-41.394413"
+       y1="3.4431255"
+       x2="-36.595379"
+       y2="8.6793737"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3890">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3892" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3894" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3924">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.085167695"
+         id="feGaussianBlur3926" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3900"
+       id="linearGradient3906"
+       x1="-32.718754"
+       y1="14.111807"
+       x2="-34.125004"
+       y2="11.424307"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3900">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3902" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3904" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3916">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.063989819"
+         id="feGaussianBlur3918" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3930"
+       id="linearGradient3936"
+       x1="-32.130291"
+       y1="10.357611"
+       x2="-31.940214"
+       y2="10.700115"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3930">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3932" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3934" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(-1.0808629,0,0,-1.0808629,-71.130351,13.91307)"
+       y2="10.700115"
+       x2="-31.940214"
+       y1="10.357611"
+       x1="-32.130291"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3953"
+       xlink:href="#linearGradient3930-8"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3930-8">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3932-1" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3934-3" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3976">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.043378915"
+         id="feGaussianBlur3978" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4024"
+       id="radialGradient4020"
+       cx="-38.273067"
+       cy="4.9480405"
+       fx="-38.273067"
+       fy="4.9480405"
+       r="1.696793"
+       gradientTransform="matrix(1.0316209,-0.97143642,0.59437745,0.63120161,-1.7307739,-35.56584)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4024">
+      <stop
+         id="stop4026"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.99607843;"
+         offset="0.66670585"
+         id="stop4028" />
+      <stop
+         id="stop4030"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3976-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.043378915"
+         id="feGaussianBlur3978-3" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4034"
+       id="radialGradient4040"
+       cx="-65.494896"
+       cy="36.941002"
+       fx="-65.494896"
+       fy="36.941002"
+       r="2.6478596"
+       gradientTransform="matrix(2.0209357,2.0602577,-2.3196098,2.2753377,152.55479,87.800104)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4034">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4036" />
+      <stop
+         id="stop4042"
+         offset="0.54124016"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4038" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter4108">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.15811967"
+         id="feGaussianBlur4110" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter4100">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.16900571"
+         id="feGaussianBlur4102" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4034"
+       id="radialGradient3124"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.0209357,2.0602577,-2.3196098,2.2753377,172.38625,1112.5548)"
+       cx="-65.494896"
+       cy="36.941002"
+       fx="-65.494896"
+       fy="36.941002"
+       r="2.6478596" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3930"
+       id="linearGradient3129"
+       gradientUnits="userSpaceOnUse"
+       x1="-32.130291"
+       y1="10.357611"
+       x2="-31.940214"
+       y2="10.700115"
+       gradientTransform="translate(19.831456,1024.7547)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3900"
+       id="linearGradient3132"
+       gradientUnits="userSpaceOnUse"
+       x1="-32.718754"
+       y1="14.111807"
+       x2="-34.125004"
+       y2="11.424307"
+       gradientTransform="translate(19.831456,1024.7547)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3890"
+       id="linearGradient3135"
+       gradientUnits="userSpaceOnUse"
+       x1="-41.394413"
+       y1="3.4431255"
+       x2="-36.595379"
+       y2="8.6793737"
+       gradientTransform="translate(19.831456,1024.7547)" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3912">
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         id="rect3914"
+         width="12"
+         height="8"
+         x="2"
+         y="1041.3622"
+         rx="0"
+         ry="0" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#828282"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.50980392"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="20.697916"
+     inkscape:cy="2.9559449"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1006"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3116"
+       width="16"
+       height="16"
+       x="0"
+       y="0"
+       transform="translate(0,1036.3622)"
+       ry="2"
+       rx="2" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3886"
+       width="14"
+       height="14"
+       x="1"
+       y="1"
+       transform="translate(0,1036.3622)"
+       rx="1"
+       ry="1" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3888"
+       width="12"
+       height="12"
+       x="2"
+       y="2"
+       transform="translate(0,1036.3622)"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4128"
+       width="12"
+       height="1"
+       x="2"
+       y="4"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4130"
+       width="1"
+       height="2"
+       x="5"
+       y="2"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4132"
+       width="1"
+       height="2"
+       x="10"
+       y="2"
+       transform="translate(0,1036.3622)" />
+    <path
+       style="fill:#000000;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 6,4 4,-2 0,2 z"
+       id="path4134"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4136"
+       width="3"
+       height="2"
+       x="2"
+       y="2"
+       transform="translate(0,1036.3622)"
+       rx="0"
+       ry="0" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.369066;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m -0.8543108,1053.8247 c 1.00629,0.2218 7.2993717,-5.2923 7.8834013,-7.7907 -0.2463689,-2.2676 1.0458703,-4.1869 4.3755125,-3.2398 -0.582608,0.3691 -1.7810028,0.9731 -2.4828073,1.4491 -0.1472452,0.9654 0.3494594,2.1432 1.4221383,2.4704 0.836175,-0.4719 1.849726,-1.0045 2.471533,-1.3343 -0.373138,1.5705 -1.707004,3.3038 -3.5312378,2.8299 -1.6203515,0.3662 -7.6951242,6.1285 -7.928914,7.6815"
+       id="path5380"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc"
+       clip-path="url(#clipPath3912)" />
+  </g>
+</svg>
diff --git a/data/icons/HighContrast/scalable/apps/terminator.svg b/data/icons/HighContrast/scalable/apps/terminator.svg
new file mode 100644
index 00000000..03f27fc0
--- /dev/null
+++ b/data/icons/HighContrast/scalable/apps/terminator.svg
@@ -0,0 +1,154 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="terminator.svg"
+   inkscape:export-filename="/home/sboddy/Development/terminator/terminator-trunk-ssh/data/icons/HighContrast/16x16/apps/terminator_16.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#828282"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.50980392"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="9.473784"
+     inkscape:cy="11.271827"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1006"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3116"
+       width="16"
+       height="16"
+       x="0"
+       y="0"
+       transform="translate(0,1036.3622)"
+       ry="2"
+       rx="2" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3886"
+       width="14"
+       height="14"
+       x="1"
+       y="1"
+       transform="translate(0,1036.3622)"
+       rx="1"
+       ry="1" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3888"
+       width="12"
+       height="12"
+       x="2"
+       y="2"
+       transform="translate(0,1036.3622)"
+       rx="0"
+       ry="0" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="M 3,13 3,12 5.5192815,9.5 3,7 3,6 4,6 7.5192815,9.5 4,13 z"
+       id="path4124"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4126"
+       width="5"
+       height="1"
+       x="8"
+       y="12"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4128"
+       width="12"
+       height="1"
+       x="2"
+       y="4"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4130"
+       width="1"
+       height="2"
+       x="5"
+       y="2"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4132"
+       width="1"
+       height="2"
+       x="10"
+       y="2"
+       transform="translate(0,1036.3622)" />
+    <path
+       style="fill:#000000;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 6,4 4,-2 0,2 z"
+       id="path4134"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect4136"
+       width="3"
+       height="2"
+       x="2"
+       y="2"
+       transform="translate(0,1036.3622)"
+       rx="0"
+       ry="0" />
+  </g>
+</svg>
diff --git a/data/icons/HighContrast/scalable/status/terminal_bell.svg b/data/icons/HighContrast/scalable/status/terminal_bell.svg
new file mode 100644
index 00000000..a6079f8f
--- /dev/null
+++ b/data/icons/HighContrast/scalable/status/terminal_bell.svg
@@ -0,0 +1,159 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="terminal_bell.svg"
+   inkscape:export-filename="/home/sboddy/Development/terminator/terminator-trunk-ssh/data/icons/HighContrast/16x16/status/terminal-bell.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 8 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="16 : 8 : 1"
+       inkscape:persp3d-origin="8 : 5.3333333 : 1"
+       id="perspective3833" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#828282"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.50980392"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="12.010232"
+     inkscape:cy="4.6519834"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1006"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3035-3"
+       width="6"
+       height="8.9999485"
+       x="5"
+       y="1043.3622"
+       ry="1.5000261" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3035"
+       width="4"
+       height="5.9999657"
+       x="6"
+       y="1045.3622"
+       ry="1.0000174" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path3033-3-5"
+       sodipodi:cx="8"
+       sodipodi:cy="7"
+       sodipodi:rx="5"
+       sodipodi:ry="5"
+       d="M 13,7 A 5,5 0 1 1 3,7 5,5 0 1 1 13,7 z"
+       transform="matrix(1.2,0,0,1.2,-1.6,1033.9622)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="path3033-3"
+       sodipodi:cx="8"
+       sodipodi:cy="7"
+       sodipodi:rx="5"
+       sodipodi:ry="5"
+       d="M 13,7 A 5,5 0 1 1 3,7 5,5 0 1 1 13,7 z"
+       transform="translate(0,1035.3622)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path3033"
+       sodipodi:cx="8"
+       sodipodi:cy="7"
+       sodipodi:rx="5"
+       sodipodi:ry="5"
+       d="M 13,7 A 5,5 0 1 1 3,7 5,5 0 1 1 13,7 z"
+       transform="matrix(0.8,0,0,0.8,1.6,1036.7622)" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3866"
+       width="4"
+       height="5.0000172"
+       x="6"
+       y="1043.3622"
+       ry="1.7382812e-05" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="m 6.0000174,1045.827 c 0.2669189,0.1641 0.7682314,0.4219 0.9999826,0.4571 -1.16e-5,0.6667 2.32e-5,1.4115 -1.74e-5,2.0781 -0.3333252,0 -0.6666689,0 -0.9999826,0 5.8e-6,-0.6667 1.16e-5,-1.8685 1.74e-5,-2.5352 z"
+       id="rect3868"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="m 9.9999826,1045.827 c -0.2669189,0.1641 -0.7682314,0.4219 -0.9999826,0.4571 1.16e-5,0.6667 -2.32e-5,1.4115 1.74e-5,2.0781 0.3333252,0 0.6666689,0 0.9999826,0 -5.8e-6,-0.6667 -1.16e-5,-1.8685 -1.74e-5,-2.5352 z"
+       id="rect3868-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3913"
+       width="2.0850058"
+       height="0.78570437"
+       x="7.2975202"
+       y="1051.8151"
+       transform="matrix(0.95922998,-0.2826267,0,1,0,0)"
+       ry="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8,11 c 0,0 0.3093592,-2.3812816 -1.248699,-3.9393398 -2,-2 0.6906407,-2.5026019 0.6906407,-1.5026019 0,1 1.0197811,-0.6788398 1.5580583,-0.5580583 0.4599673,0.1032099 1,1 1,1"
+       id="path3933"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1036.3622)"
+       sodipodi:nodetypes="csssc" />
+  </g>
+</svg>
diff --git a/setup.py b/setup.py
index c2d5e989..a08d1c01 100755
--- a/setup.py
+++ b/setup.py
@@ -181,16 +181,23 @@ setup(name=APP_NAME.capitalize(),
                   ('share/applications', ['data/terminator.desktop']),
                   (os.path.join(man_dir, 'man1'), ['doc/terminator.1']),
                   (os.path.join(man_dir, 'man5'), ['doc/terminator_config.5']),
-                  ('share/pixmaps', ['data/icons/48x48/apps/terminator.png']),
-                  ('share/icons/hicolor/scalable/apps', glob.glob('data/icons/scalable/apps/*.svg')),
-                  ('share/icons/hicolor/16x16/apps', glob.glob('data/icons/16x16/apps/*.png')),
-                  ('share/icons/hicolor/22x22/apps', glob.glob('data/icons/22x22/apps/*.png')),
-                  ('share/icons/hicolor/24x24/apps', glob.glob('data/icons/24x24/apps/*.png')),
-                  ('share/icons/hicolor/32x32/apps', glob.glob('data/icons/32x32/apps/*.png')),
-                  ('share/icons/hicolor/48x48/apps', glob.glob('data/icons/48x48/apps/*.png')),
-                  ('share/icons/hicolor/16x16/actions', glob.glob('data/icons/16x16/actions/*.png')),
-                  ('share/icons/hicolor/16x16/status',
-                      glob.glob('data/icons/16x16/status/*.png')),
+                  ('share/pixmaps', ['data/icons/hicolor/48x48/apps/terminator.png']),
+                  ('share/icons/hicolor/scalable/apps', glob.glob('data/icons/hicolor/scalable/apps/*.svg')),
+                  ('share/icons/hicolor/16x16/apps', glob.glob('data/icons/hicolor/16x16/apps/*.png')),
+                  ('share/icons/hicolor/22x22/apps', glob.glob('data/icons/hicolor/22x22/apps/*.png')),
+                  ('share/icons/hicolor/24x24/apps', glob.glob('data/icons/hicolor/24x24/apps/*.png')),
+                  ('share/icons/hicolor/32x32/apps', glob.glob('data/icons/hicolor/32x32/apps/*.png')),
+                  ('share/icons/hicolor/48x48/apps', glob.glob('data/icons/hicolor/48x48/apps/*.png')),
+                  ('share/icons/hicolor/16x16/actions', glob.glob('data/icons/hicolor/16x16/actions/*.png')),
+                  ('share/icons/hicolor/16x16/status', glob.glob('data/icons/hicolor/16x16/status/*.png')),
+                  ('share/icons/HighContrast/scalable/apps', glob.glob('data/icons/HighContrast/scalable/apps/*.svg')),
+                  ('share/icons/HighContrast/16x16/apps', glob.glob('data/icons/HighContrast/16x16/apps/*.png')),
+                  ('share/icons/HighContrast/22x22/apps', glob.glob('data/icons/HighContrast/22x22/apps/*.png')),
+                  ('share/icons/HighContrast/24x24/apps', glob.glob('data/icons/HighContrast/24x24/apps/*.png')),
+                  ('share/icons/HighContrast/32x32/apps', glob.glob('data/icons/HighContrast/32x32/apps/*.png')),
+                  ('share/icons/HighContrast/48x48/apps', glob.glob('data/icons/HighContrast/48x48/apps/*.png')),
+                  ('share/icons/HighContrast/16x16/actions', glob.glob('data/icons/HighContrast/16x16/actions/*.png')),
+                  ('share/icons/HighContrast/16x16/status', glob.glob('data/icons/HighContrast/16x16/status/*.png')),
                  ],
       packages=['terminatorlib', 'terminatorlib.configobj',
       'terminatorlib.plugins'],
diff --git a/terminatorlib/window.py b/terminatorlib/window.py
index f11fbd8c..f2d004a3 100755
--- a/terminatorlib/window.py
+++ b/terminatorlib/window.py
@@ -168,35 +168,27 @@ class Window(Container, gtk.Window):
 
     def apply_icon(self, requested_icon):
         """Set the window icon"""
-        icon_theme = gtk.IconTheme()
-        icon = None
-        
+        icon_theme = gtk.icon_theme_get_default()
+        icon_name_list = [self.wmclass_name, APP_NAME]
+
         if requested_icon:
             try:
                 self.set_icon_from_file(requested_icon)
-                icon = self.get_icon()
+                return
             except (NameError, gobject.GError):
-                dbg('Unable to load 48px %s icon as file' % (repr(requested_icon)))
-        
-        if requested_icon and icon is None:
-            try:
-                icon = icon_theme.load_icon(requested_icon, 48, 0)
-            except (NameError, gobject.GError):
-                dbg('Unable to load 48px %s icon' % (repr(requested_icon)))
-        
-        if icon is None:
-            try:
-                icon = icon_theme.load_icon(self.wmclass_name, 48, 0)
-            except (NameError, gobject.GError):
-                dbg('Unable to load 48px %s icon' % (self.wmclass_name))
-        
-        if icon is None:
-            try:
-                icon = icon_theme.load_icon(APP_NAME, 48, 0)
-            except (NameError, gobject.GError):
-                dbg('Unable to load 48px Terminator icon')
-                icon = self.render_icon(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
+                dbg('Unable to load %s icon as file' % (repr(requested_icon)))
 
+            icon_name_list.insert(0, requested_icon)
+
+        for icon_name in icon_name_list:
+            # Test if the icon is available first
+            if icon_theme.lookup_icon(icon_name, 48, 0):
+                self.set_icon_name(icon_name)
+                return # Success! We're done.
+            else:
+                dbg('Unable to load %s icon' % (icon_name))
+
+        icon = self.render_icon(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
         self.set_icon(icon)
 
     def on_key_press(self, window, event):