diff --git a/McBitFont/CodeShift.Designer.cs b/McBitFont/CodeShift.Designer.cs
new file mode 100644
index 0000000..7571850
--- /dev/null
+++ b/McBitFont/CodeShift.Designer.cs
@@ -0,0 +1,175 @@
+namespace McBitFont {
+    partial class CodeShift {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing) {
+            if (disposing && (components != null)) {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent() {
+            rbShiftLeft = new System.Windows.Forms.RadioButton();
+            rbShiftRight = new System.Windows.Forms.RadioButton();
+            rbSpecify = new System.Windows.Forms.RadioButton();
+            lblValue = new System.Windows.Forms.Label();
+            nudValue = new System.Windows.Forms.NumericUpDown();
+            btnOK = new System.Windows.Forms.Button();
+            btnCancel = new System.Windows.Forms.Button();
+            lblMessage = new System.Windows.Forms.Label();
+            lblRange = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)nudValue).BeginInit();
+            SuspendLayout();
+            // 
+            // rbShiftLeft
+            // 
+            rbShiftLeft.AutoSize = true;
+            rbShiftLeft.Location = new System.Drawing.Point(12, 12);
+            rbShiftLeft.Name = "rbShiftLeft";
+            rbShiftLeft.Size = new System.Drawing.Size(134, 19);
+            rbShiftLeft.TabIndex = 0;
+            rbShiftLeft.Text = "Shift Left (towards 0)";
+            rbShiftLeft.UseVisualStyleBackColor = true;
+            rbShiftLeft.CheckedChanged += ModeChanged;
+            // 
+            // rbShiftRight
+            // 
+            rbShiftRight.AutoSize = true;
+            rbShiftRight.Location = new System.Drawing.Point(12, 37);
+            rbShiftRight.Name = "rbShiftRight";
+            rbShiftRight.Size = new System.Drawing.Size(154, 19);
+            rbShiftRight.TabIndex = 1;
+            rbShiftRight.Text = "Shift Right (towards 255)";
+            rbShiftRight.UseVisualStyleBackColor = true;
+            rbShiftRight.CheckedChanged += ModeChanged;
+            // 
+            // rbSpecify
+            // 
+            rbSpecify.AutoSize = true;
+            rbSpecify.Location = new System.Drawing.Point(12, 62);
+            rbSpecify.Name = "rbSpecify";
+            rbSpecify.Size = new System.Drawing.Size(118, 19);
+            rbSpecify.TabIndex = 2;
+            rbSpecify.Text = "Specify start code";
+            rbSpecify.UseVisualStyleBackColor = true;
+            rbSpecify.CheckedChanged += ModeChanged;
+            // 
+            // lblValue
+            // 
+            lblValue.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
+            lblValue.AutoSize = true;
+            lblValue.Location = new System.Drawing.Point(206, 8);
+            lblValue.Name = "lblValue";
+            lblValue.Size = new System.Drawing.Size(50, 15);
+            lblValue.TabIndex = 3;
+            lblValue.Text = "Shift by:";
+            // 
+            // nudValue
+            // 
+            nudValue.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
+            nudValue.Location = new System.Drawing.Point(206, 27);
+            nudValue.Maximum = new decimal(new int[] { 254, 0, 0, 0 });
+            nudValue.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
+            nudValue.Name = "nudValue";
+            nudValue.Size = new System.Drawing.Size(50, 23);
+            nudValue.TabIndex = 5;
+            nudValue.Value = new decimal(new int[] { 1, 0, 0, 0 });
+            nudValue.ValueChanged += nudValue_ValueChanged;
+            // 
+            // btnOK
+            // 
+            btnOK.Location = new System.Drawing.Point(24, 155);
+            btnOK.Name = "btnOK";
+            btnOK.Size = new System.Drawing.Size(88, 27);
+            btnOK.TabIndex = 6;
+            btnOK.Text = "OK";
+            btnOK.UseVisualStyleBackColor = true;
+            btnOK.Click += btnOK_Click;
+            // 
+            // btnCancel
+            // 
+            btnCancel.Location = new System.Drawing.Point(156, 155);
+            btnCancel.Name = "btnCancel";
+            btnCancel.Size = new System.Drawing.Size(88, 27);
+            btnCancel.TabIndex = 7;
+            btnCancel.Text = "Cancel";
+            btnCancel.UseVisualStyleBackColor = true;
+            btnCancel.Click += btnCancel_Click;
+            // 
+            // lblMessage
+            // 
+            lblMessage.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
+            lblMessage.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 204);
+            lblMessage.ForeColor = System.Drawing.Color.DarkRed;
+            lblMessage.Location = new System.Drawing.Point(0, 84);
+            lblMessage.Name = "lblMessage";
+            lblMessage.Size = new System.Drawing.Size(268, 68);
+            lblMessage.TabIndex = 8;
+            lblMessage.Text = "Message";
+            lblMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // lblRange
+            // 
+            lblRange.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
+            lblRange.Location = new System.Drawing.Point(204, 53);
+            lblRange.Name = "lblRange";
+            lblRange.Size = new System.Drawing.Size(62, 31);
+            lblRange.TabIndex = 9;
+            lblRange.Text = "min: 222\r\nmax: 222";
+            // 
+            // CodeShift
+            // 
+            AcceptButton = btnOK;
+            AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            CancelButton = btnCancel;
+            ClientSize = new System.Drawing.Size(268, 191);
+            Controls.Add(lblRange);
+            Controls.Add(lblMessage);
+            Controls.Add(btnCancel);
+            Controls.Add(btnOK);
+            Controls.Add(nudValue);
+            Controls.Add(lblValue);
+            Controls.Add(rbSpecify);
+            Controls.Add(rbShiftRight);
+            Controls.Add(rbShiftLeft);
+            FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            MaximizeBox = false;
+            MinimizeBox = false;
+            Name = "CodeShift";
+            ShowIcon = false;
+            ShowInTaskbar = false;
+            StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            Text = "Code Shift";
+            Load += CodeShift_Load;
+            ((System.ComponentModel.ISupportInitialize)nudValue).EndInit();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+        private System.Windows.Forms.Label lblValue;
+        private System.Windows.Forms.Button btnOK;
+        private System.Windows.Forms.Button btnCancel;
+        public System.Windows.Forms.RadioButton rbShiftLeft;
+        public System.Windows.Forms.RadioButton rbShiftRight;
+        public System.Windows.Forms.RadioButton rbSpecify;
+        public System.Windows.Forms.NumericUpDown nudValue;
+        private System.Windows.Forms.Label lblMessage;
+        private System.Windows.Forms.Label lblRange;
+    }
+}
\ No newline at end of file
diff --git a/McBitFont/CodeShift.cs b/McBitFont/CodeShift.cs
new file mode 100644
index 0000000..344ddf5
--- /dev/null
+++ b/McBitFont/CodeShift.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace McBitFont {
+    public partial class CodeShift : Form {
+
+        private int maxLeft, maxRight, maxSC, count;
+        public int sc;
+
+        public CodeShift(MainForm parent) {
+            InitializeComponent();
+
+            count = parent.frames.Count;
+            sc = parent.frames.First().code;
+            maxLeft = sc;
+            maxRight = 255 - sc - count + 1;
+            maxSC = sc + maxRight;
+        }
+
+        private void CodeShift_Load(object sender, EventArgs e) {
+            byte enabled = 7;
+            string msg = "";
+            if (maxLeft < 1) {
+                rbShiftLeft.Enabled = false;
+                enabled -= 1;
+                msg += "Cannot shift left: Start code is " + sc.ToString() + ".";
+            }
+            if (maxRight < 1) {
+                rbShiftRight.Enabled = false;
+                enabled -= 2;
+                msg += "\nCannot shift right: Last code is " + (sc + count - 1).ToString() + ".";
+            }
+            if (maxSC <= 0) {
+                rbSpecify.Enabled = false;
+                enabled -= 4;
+                msg += "\nCannot shift: The font is full." + (sc + count - 1).ToString();
+            }
+            lblMessage.Text = msg;
+
+            if ((enabled & 1) > 0) rbShiftLeft.Checked = true;
+            else if ((enabled & 2) > 0) rbShiftRight.Checked = true;
+            else if ((enabled & 4) > 0) rbSpecify.Checked = true;
+            else {
+                btnOK.Enabled = false;
+                nudValue.Enabled = false;
+            }
+
+
+            //ModeChanged(rbShiftLeft, null);
+            //nudValue.Minimum = 1;
+            //nudValue.Maximum = maxLeft;
+        }
+
+        private void ModeChanged(object sender, EventArgs e) {
+            if (rbSpecify.Checked) {
+                lblValue.Text = "New start code:";
+                nudValue.Minimum = 0;
+                nudValue.Maximum = maxSC;
+                nudValue.Value = 0;
+                lblRange.Text = "min: 0\nmax: " + maxSC.ToString();
+            } else {
+                lblValue.Text = "Shift by:";
+                nudValue.Minimum = 1;
+                nudValue.Value = 1;
+                if (rbShiftLeft.Checked) {
+                    nudValue.Maximum = maxLeft;
+                    lblRange.Text = "min: 1\nmax: " + maxLeft.ToString();
+                }
+                if (rbShiftRight.Checked) {
+                    nudValue.Maximum = maxRight;
+                    lblRange.Text = "min: 1\nmax: " + maxRight.ToString();
+                }
+            }
+
+        }
+
+        private void nudValue_ValueChanged(object sender, EventArgs e) {
+            if (rbSpecify.Checked) {
+                if (nudValue.Value == sc) btnOK.Enabled = false;
+                else btnOK.Enabled = true;
+            }
+        }
+
+        private void btnOK_Click(object sender, EventArgs e) {
+            DialogResult = DialogResult.OK;
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e) {
+            DialogResult = DialogResult.Cancel;
+        }
+    }
+}
diff --git a/McBitFont/CodeShift.resx b/McBitFont/CodeShift.resx
new file mode 100644
index 0000000..8b2ff64
--- /dev/null
+++ b/McBitFont/CodeShift.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/McBitFont/Form1.Designer.cs b/McBitFont/Form1.Designer.cs
index d38543d..036397b 100644
--- a/McBitFont/Form1.Designer.cs
+++ b/McBitFont/Form1.Designer.cs
@@ -55,20 +55,21 @@
             openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            fontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            makeVarWidthToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             prependSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             appendSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             removeSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             removeBeforeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             removeAfterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            makeVarWidthToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            canvasToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ClearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             shiftUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             shiftDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -77,7 +78,7 @@
             invertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             mirrorXToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             mirrorYToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             dlgSave = new System.Windows.Forms.SaveFileDialog();
             dlgOpen = new System.Windows.Forms.OpenFileDialog();
@@ -85,6 +86,7 @@
             toolTip1 = new System.Windows.Forms.ToolTip(components);
             chkLeftSide = new System.Windows.Forms.CheckBox();
             chkTopSide = new System.Windows.Forms.CheckBox();
+            CodeShiftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)nudX).BeginInit();
             ((System.ComponentModel.ISupportInitialize)nudY).BeginInit();
             panel1.SuspendLayout();
@@ -399,7 +401,7 @@
             // 
             // menuStrip1
             // 
-            menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { fileToolStripMenuItem, editToolStripMenuItem, toolsToolStripMenuItem, aboutToolStripMenuItem });
+            menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { fileToolStripMenuItem, editToolStripMenuItem, fontToolStripMenuItem, canvasToolStripMenuItem, aboutToolStripMenuItem });
             menuStrip1.Location = new System.Drawing.Point(0, 0);
             menuStrip1.Name = "menuStrip1";
             menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2);
@@ -409,7 +411,7 @@
             // 
             // fileToolStripMenuItem
             // 
-            fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { newToolStripMenuItem, openToolStripMenuItem, saveToolStripMenuItem, saveAsToolStripMenuItem, exitToolStripMenuItem });
+            fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { newToolStripMenuItem, openToolStripMenuItem, saveToolStripMenuItem, saveAsToolStripMenuItem, exportToolStripMenuItem, exitToolStripMenuItem });
             fileToolStripMenuItem.Name = "fileToolStripMenuItem";
             fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
             fileToolStripMenuItem.Text = "File";
@@ -458,6 +460,17 @@
             saveAsToolStripMenuItem.ToolTipText = "Save changes to another file";
             saveAsToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
             // 
+            // exportToolStripMenuItem
+            // 
+            exportToolStripMenuItem.Image = Properties.Resources.z_export;
+            exportToolStripMenuItem.Name = "exportToolStripMenuItem";
+            exportToolStripMenuItem.ShortcutKeyDisplayString = "";
+            exportToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E;
+            exportToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
+            exportToolStripMenuItem.Text = "Export";
+            exportToolStripMenuItem.ToolTipText = "Configure and export data";
+            exportToolStripMenuItem.Click += button1_Click;
+            // 
             // exitToolStripMenuItem
             // 
             exitToolStripMenuItem.Image = Properties.Resources.Famfamfam_Silk_Door_out_16;
@@ -471,7 +484,7 @@
             // 
             // editToolStripMenuItem
             // 
-            editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { undoToolStripMenuItem, redoToolStripMenuItem, copyToolStripMenuItem, pasteToolStripMenuItem, prependSymbolToolStripMenuItem, appendSymbolToolStripMenuItem, removeSymbolToolStripMenuItem, removeBeforeToolStripMenuItem, removeAfterToolStripMenuItem, applyToolStripMenuItem });
+            editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { undoToolStripMenuItem, redoToolStripMenuItem, copyToolStripMenuItem, pasteToolStripMenuItem });
             editToolStripMenuItem.Name = "editToolStripMenuItem";
             editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
             editToolStripMenuItem.Text = "Edit";
@@ -482,7 +495,7 @@
             undoToolStripMenuItem.Image = Properties.Resources.arrow_undo;
             undoToolStripMenuItem.Name = "undoToolStripMenuItem";
             undoToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z;
-            undoToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
+            undoToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
             undoToolStripMenuItem.Text = "Undo";
             undoToolStripMenuItem.ToolTipText = "Undo last canvas change";
             undoToolStripMenuItem.Click += undoToolStripMenuItem_Click;
@@ -492,7 +505,7 @@
             redoToolStripMenuItem.Image = Properties.Resources.arrow_redo;
             redoToolStripMenuItem.Name = "redoToolStripMenuItem";
             redoToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y;
-            redoToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
+            redoToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
             redoToolStripMenuItem.Text = "Redo";
             redoToolStripMenuItem.ToolTipText = "Redo canvas change";
             redoToolStripMenuItem.Click += redoToolStripMenuItem_Click;
@@ -504,7 +517,7 @@
             copyToolStripMenuItem.Name = "copyToolStripMenuItem";
             copyToolStripMenuItem.ShortcutKeyDisplayString = "";
             copyToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C;
-            copyToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
+            copyToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
             copyToolStripMenuItem.Text = "Copy";
             copyToolStripMenuItem.ToolTipText = "Copy current symbol to clipboard";
             copyToolStripMenuItem.Click += copyToolStripMenuItem_Click;
@@ -516,15 +529,32 @@
             pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
             pasteToolStripMenuItem.ShortcutKeyDisplayString = "";
             pasteToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V;
-            pasteToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
+            pasteToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
             pasteToolStripMenuItem.Text = "Paste";
             pasteToolStripMenuItem.ToolTipText = "Paste from clipboard to current symbol";
             pasteToolStripMenuItem.Click += pasteToolStripMenuItem_Click;
             // 
+            // fontToolStripMenuItem
+            // 
+            fontToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { makeVarWidthToolStripMenuItem, prependSymbolToolStripMenuItem, appendSymbolToolStripMenuItem, removeSymbolToolStripMenuItem, removeBeforeToolStripMenuItem, removeAfterToolStripMenuItem, CodeShiftToolStripMenuItem });
+            fontToolStripMenuItem.Name = "fontToolStripMenuItem";
+            fontToolStripMenuItem.Size = new System.Drawing.Size(43, 20);
+            fontToolStripMenuItem.Text = "Font";
+            // 
+            // makeVarWidthToolStripMenuItem
+            // 
+            makeVarWidthToolStripMenuItem.Image = Properties.Resources.z_asterisk;
+            makeVarWidthToolStripMenuItem.Name = "makeVarWidthToolStripMenuItem";
+            makeVarWidthToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
+            makeVarWidthToolStripMenuItem.Text = "Make Variable Width";
+            makeVarWidthToolStripMenuItem.ToolTipText = "Make Font Variable width one";
+            makeVarWidthToolStripMenuItem.Visible = false;
+            makeVarWidthToolStripMenuItem.Click += makeVarWidthToolStripMenuItem_Click;
+            // 
             // prependSymbolToolStripMenuItem
             // 
             prependSymbolToolStripMenuItem.Enabled = false;
-            prependSymbolToolStripMenuItem.Image = Properties.Resources.action_add;
+            prependSymbolToolStripMenuItem.Image = Properties.Resources.add;
             prependSymbolToolStripMenuItem.Name = "prependSymbolToolStripMenuItem";
             prependSymbolToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Ins";
             prependSymbolToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert;
@@ -536,7 +566,7 @@
             // appendSymbolToolStripMenuItem
             // 
             appendSymbolToolStripMenuItem.Enabled = false;
-            appendSymbolToolStripMenuItem.Image = Properties.Resources.action_add;
+            appendSymbolToolStripMenuItem.Image = Properties.Resources.add;
             appendSymbolToolStripMenuItem.Name = "appendSymbolToolStripMenuItem";
             appendSymbolToolStripMenuItem.ShortcutKeyDisplayString = "";
             appendSymbolToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.End;
@@ -548,7 +578,7 @@
             // removeSymbolToolStripMenuItem
             // 
             removeSymbolToolStripMenuItem.Enabled = false;
-            removeSymbolToolStripMenuItem.Image = Properties.Resources.action_remove;
+            removeSymbolToolStripMenuItem.Image = Properties.Resources.delete;
             removeSymbolToolStripMenuItem.Name = "removeSymbolToolStripMenuItem";
             removeSymbolToolStripMenuItem.ShortcutKeyDisplayString = "";
             removeSymbolToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete;
@@ -560,7 +590,7 @@
             // removeBeforeToolStripMenuItem
             // 
             removeBeforeToolStripMenuItem.Enabled = false;
-            removeBeforeToolStripMenuItem.Image = Properties.Resources.action_remove;
+            removeBeforeToolStripMenuItem.Image = Properties.Resources.delete;
             removeBeforeToolStripMenuItem.Name = "removeBeforeToolStripMenuItem";
             removeBeforeToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
             removeBeforeToolStripMenuItem.Text = "Remove all before selected";
@@ -570,42 +600,23 @@
             // removeAfterToolStripMenuItem
             // 
             removeAfterToolStripMenuItem.Enabled = false;
-            removeAfterToolStripMenuItem.Image = Properties.Resources.action_remove;
+            removeAfterToolStripMenuItem.Image = Properties.Resources.delete;
             removeAfterToolStripMenuItem.Name = "removeAfterToolStripMenuItem";
             removeAfterToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
             removeAfterToolStripMenuItem.Text = "Remove all after selected";
             removeAfterToolStripMenuItem.ToolTipText = "Remove all symbols after current one";
             removeAfterToolStripMenuItem.Click += removeAfterToolStripMenuItem_Click;
             // 
-            // applyToolStripMenuItem
+            // canvasToolStripMenuItem
             // 
-            applyToolStripMenuItem.Image = Properties.Resources.action_check;
-            applyToolStripMenuItem.Name = "applyToolStripMenuItem";
-            applyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Space";
-            applyToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Space;
-            applyToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
-            applyToolStripMenuItem.Text = "Apply";
-            applyToolStripMenuItem.ToolTipText = "Apply canvas changes";
-            applyToolStripMenuItem.Click += button2_Click;
-            // 
-            // toolsToolStripMenuItem
-            // 
-            toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { makeVarWidthToolStripMenuItem, ClearToolStripMenuItem, shiftUpToolStripMenuItem, shiftDownToolStripMenuItem, shiftLeftToolStripMenuItem, shiftRightToolStripMenuItem, invertToolStripMenuItem, mirrorXToolStripMenuItem, mirrorYToolStripMenuItem, exportToolStripMenuItem });
-            toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
-            toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
-            toolsToolStripMenuItem.Text = "Tools";
-            // 
-            // makeVarWidthToolStripMenuItem
-            // 
-            makeVarWidthToolStripMenuItem.Name = "makeVarWidthToolStripMenuItem";
-            makeVarWidthToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
-            makeVarWidthToolStripMenuItem.Text = "Make Variable Width";
-            makeVarWidthToolStripMenuItem.ToolTipText = "Make Font Variable width one";
-            makeVarWidthToolStripMenuItem.Visible = false;
-            makeVarWidthToolStripMenuItem.Click += makeVarWidthToolStripMenuItem_Click;
+            canvasToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { ClearToolStripMenuItem, shiftUpToolStripMenuItem, shiftDownToolStripMenuItem, shiftLeftToolStripMenuItem, shiftRightToolStripMenuItem, invertToolStripMenuItem, mirrorXToolStripMenuItem, mirrorYToolStripMenuItem, applyToolStripMenuItem });
+            canvasToolStripMenuItem.Name = "canvasToolStripMenuItem";
+            canvasToolStripMenuItem.Size = new System.Drawing.Size(57, 20);
+            canvasToolStripMenuItem.Text = "Canvas";
             // 
             // ClearToolStripMenuItem
             // 
+            ClearToolStripMenuItem.Image = Properties.Resources.z_shading;
             ClearToolStripMenuItem.Name = "ClearToolStripMenuItem";
             ClearToolStripMenuItem.ShortcutKeyDisplayString = "";
             ClearToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W;
@@ -616,7 +627,7 @@
             // 
             // shiftUpToolStripMenuItem
             // 
-            shiftUpToolStripMenuItem.Image = Properties.Resources.arrow_top;
+            shiftUpToolStripMenuItem.Image = Properties.Resources.z_uo;
             shiftUpToolStripMenuItem.Name = "shiftUpToolStripMenuItem";
             shiftUpToolStripMenuItem.ShortcutKeyDisplayString = "";
             shiftUpToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up;
@@ -627,7 +638,7 @@
             // 
             // shiftDownToolStripMenuItem
             // 
-            shiftDownToolStripMenuItem.Image = Properties.Resources.arrow_down;
+            shiftDownToolStripMenuItem.Image = Properties.Resources.z_down;
             shiftDownToolStripMenuItem.Name = "shiftDownToolStripMenuItem";
             shiftDownToolStripMenuItem.ShortcutKeyDisplayString = "";
             shiftDownToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down;
@@ -638,7 +649,7 @@
             // 
             // shiftLeftToolStripMenuItem
             // 
-            shiftLeftToolStripMenuItem.Image = Properties.Resources.arrow_back;
+            shiftLeftToolStripMenuItem.Image = Properties.Resources.z_left;
             shiftLeftToolStripMenuItem.Name = "shiftLeftToolStripMenuItem";
             shiftLeftToolStripMenuItem.ShortcutKeyDisplayString = "";
             shiftLeftToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Left;
@@ -649,7 +660,7 @@
             // 
             // shiftRightToolStripMenuItem
             // 
-            shiftRightToolStripMenuItem.Image = Properties.Resources.arrow_next;
+            shiftRightToolStripMenuItem.Image = Properties.Resources.z_right;
             shiftRightToolStripMenuItem.Name = "shiftRightToolStripMenuItem";
             shiftRightToolStripMenuItem.ShortcutKeyDisplayString = "";
             shiftRightToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Right;
@@ -660,7 +671,7 @@
             // 
             // invertToolStripMenuItem
             // 
-            invertToolStripMenuItem.Image = Properties.Resources.Ionic_Ionicons_Invert_mode_outline_16;
+            invertToolStripMenuItem.Image = Properties.Resources.z_contrast;
             invertToolStripMenuItem.Name = "invertToolStripMenuItem";
             invertToolStripMenuItem.ShortcutKeyDisplayString = "";
             invertToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I;
@@ -689,15 +700,16 @@
             mirrorYToolStripMenuItem.ToolTipText = "Mirror by Y axis (vertical)";
             mirrorYToolStripMenuItem.Click += btnMirrorY_Click;
             // 
-            // exportToolStripMenuItem
+            // applyToolStripMenuItem
             // 
-            exportToolStripMenuItem.Name = "exportToolStripMenuItem";
-            exportToolStripMenuItem.ShortcutKeyDisplayString = "";
-            exportToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E;
-            exportToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
-            exportToolStripMenuItem.Text = "Export";
-            exportToolStripMenuItem.ToolTipText = "Configure and export data";
-            exportToolStripMenuItem.Click += button1_Click;
+            applyToolStripMenuItem.Image = Properties.Resources.z_tick;
+            applyToolStripMenuItem.Name = "applyToolStripMenuItem";
+            applyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Space";
+            applyToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Space;
+            applyToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
+            applyToolStripMenuItem.Text = "Apply";
+            applyToolStripMenuItem.ToolTipText = "Apply canvas changes";
+            applyToolStripMenuItem.Click += button2_Click;
             // 
             // aboutToolStripMenuItem
             // 
@@ -759,6 +771,15 @@
             toolTip1.SetToolTip(chkTopSide, "Height changes will be made on Top/Bottom side");
             chkTopSide.UseVisualStyleBackColor = true;
             // 
+            // CodeShiftToolStripMenuItem
+            // 
+            CodeShiftToolStripMenuItem.Image = Properties.Resources.z_align_center;
+            CodeShiftToolStripMenuItem.Name = "CodeShiftToolStripMenuItem";
+            CodeShiftToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
+            CodeShiftToolStripMenuItem.Text = "Code shift";
+            CodeShiftToolStripMenuItem.ToolTipText = "Shift the font on the code line";
+            CodeShiftToolStripMenuItem.Click += CodeShiftToolStripMenuItem_Click;
+            // 
             // MainForm
             // 
             AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
@@ -835,7 +856,7 @@
         private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem removeSymbolToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem canvasToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem shiftUpToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem shiftDownToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem shiftLeftToolStripMenuItem;
@@ -864,6 +885,8 @@
         private System.Windows.Forms.ToolStripMenuItem makeVarWidthToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem undoToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem redoToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem fontToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem CodeShiftToolStripMenuItem;
     }
 }
 
diff --git a/McBitFont/Form1.cs b/McBitFont/Form1.cs
index 3ea9f9c..e86f9ed 100644
--- a/McBitFont/Form1.cs
+++ b/McBitFont/Form1.cs
@@ -635,6 +635,7 @@ namespace McBitFont {
                     monospaced = form.rbMono.Checked;
                 }
                 makeVarWidthToolStripMenuItem.Visible = monospaced;
+                CodeShiftToolStripMenuItem.Visible = !form.cbSingle.Checked;
                 lblType.Text = monospaced ? "Monospaced" : "Variable width / Single";
                 codepage = (form.cbEncoding.SelectedItem as New.EncodingItem).Code;
                 foreach (FrameMiniature ff in frames) {
@@ -654,6 +655,7 @@ namespace McBitFont {
                 modified = false;
                 checkForAdd();
                 fbuffer = false;
+                miniList.Items[0].Selected = true;
                 miniList.Refresh();
                 dotPanel.Refresh();
 
@@ -965,5 +967,46 @@ namespace McBitFont {
             dotPanel.Refresh();
             CheckHistoryButtons();
         }
+
+        private void CodeShiftToolStripMenuItem_Click(object sender, EventArgs e) {
+            if (!monospaced && frames.Count == 1) return;
+            checkModifiedFrame();
+
+            CodeShift csform = new CodeShift(this);
+            if (csform.ShowDialog() == DialogResult.OK) {
+                Cursor.Current = Cursors.WaitCursor;
+
+                FrameMiniature ff;
+                var sel = miniList.SelectedItems[0].Index;
+                var val = Convert.ToInt32(csform.nudValue.Value);
+                if (csform.rbSpecify.Checked) val -= csform.sc;
+                if (csform.rbShiftLeft.Checked) val *= -1;
+
+                miniList.Clear();
+                ilMiniatures.Images.Clear();
+                for (int i = 0; i < frames.Count; i++) {
+                    ff = frames[i];
+                    ff.code += val;
+                    frames[i] = ff;
+
+                    var key = ff.code.ToString().PadLeft(3, '0');
+                    var text = decodeSymbol(ff.code);
+                    ilMiniatures.Images.Add(key, (Image)getMiniPictue(ff));
+                    miniList.Items.Add(key, key + ' ' + text, key);
+                }
+
+                miniList.Refresh();
+                miniList.Items[sel].Selected = true;
+                dotPanel.Refresh();
+                
+                Cursor.Current = Cursors.Default;
+            }
+            csform.Dispose();
+
+            history.Clear();
+            checkForAdd();
+            prjModified = true;
+
+        }
     }
 }
diff --git a/McBitFont/McBitFont.csproj b/McBitFont/McBitFont.csproj
index 123c225..8b14b8f 100644
--- a/McBitFont/McBitFont.csproj
+++ b/McBitFont/McBitFont.csproj
@@ -23,6 +23,12 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <FileVersion>2.0.0.0</FileVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebugType>portable</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>portable</DebugType>
+  </PropertyGroup>
   <ItemGroup>
     <Content Include="icon.ico" />
     <Content Include="icon_64.ico" />
diff --git a/McBitFont/Properties/Resources.Designer.cs b/McBitFont/Properties/Resources.Designer.cs
index 414bacb..844f1e4 100644
--- a/McBitFont/Properties/Resources.Designer.cs
+++ b/McBitFont/Properties/Resources.Designer.cs
@@ -90,6 +90,16 @@ namespace McBitFont.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap add {
+            get {
+                object obj = ResourceManager.GetObject("add", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -150,6 +160,16 @@ namespace McBitFont.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap delete {
+            get {
+                object obj = ResourceManager.GetObject("delete", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -309,5 +329,125 @@ namespace McBitFont.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap z_align_center {
+            get {
+                object obj = ResourceManager.GetObject("z_align_center", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap z_asterisk {
+            get {
+                object obj = ResourceManager.GetObject("z_asterisk", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap z_contrast {
+            get {
+                object obj = ResourceManager.GetObject("z_contrast", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap z_down {
+            get {
+                object obj = ResourceManager.GetObject("z_down", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap z_export {
+            get {
+                object obj = ResourceManager.GetObject("z_export", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap z_left {
+            get {
+                object obj = ResourceManager.GetObject("z_left", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap z_redo {
+            get {
+                object obj = ResourceManager.GetObject("z_redo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap z_right {
+            get {
+                object obj = ResourceManager.GetObject("z_right", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap z_shading {
+            get {
+                object obj = ResourceManager.GetObject("z_shading", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap z_tick {
+            get {
+                object obj = ResourceManager.GetObject("z_tick", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap z_undo {
+            get {
+                object obj = ResourceManager.GetObject("z_undo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap z_uo {
+            get {
+                object obj = ResourceManager.GetObject("z_uo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
diff --git a/McBitFont/Properties/Resources.resx b/McBitFont/Properties/Resources.resx
index 67bb33b..085f933 100644
--- a/McBitFont/Properties/Resources.resx
+++ b/McBitFont/Properties/Resources.resx
@@ -187,6 +187,48 @@
   <data name="action_check" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\action_check.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="z_tick" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\tick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="z_redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow_redo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="z_undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow_undo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="z_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="z_left" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow_left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="z_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\..\icons\famfamfam\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="z_uo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="z_align_center" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\shape_align_center.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="z_asterisk" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\asterisk_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="z_shading" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\shading.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="z_export" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\package_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="z_contrast" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\contrast.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="arrow_redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\redo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
diff --git a/McBitFont/Resources/add.png b/McBitFont/Resources/add.png
new file mode 100644
index 0000000..6332fef
Binary files /dev/null and b/McBitFont/Resources/add.png differ
diff --git a/McBitFont/Resources/arrow_left.png b/McBitFont/Resources/arrow_left.png
new file mode 100644
index 0000000..0f58984
Binary files /dev/null and b/McBitFont/Resources/arrow_left.png differ
diff --git a/McBitFont/Resources/arrow_redo.png b/McBitFont/Resources/arrow_redo.png
new file mode 100644
index 0000000..fdc394c
Binary files /dev/null and b/McBitFont/Resources/arrow_redo.png differ
diff --git a/McBitFont/Resources/arrow_right.png b/McBitFont/Resources/arrow_right.png
new file mode 100644
index 0000000..bc153c8
Binary files /dev/null and b/McBitFont/Resources/arrow_right.png differ
diff --git a/McBitFont/Resources/arrow_undo.png b/McBitFont/Resources/arrow_undo.png
new file mode 100644
index 0000000..6972c5e
Binary files /dev/null and b/McBitFont/Resources/arrow_undo.png differ
diff --git a/McBitFont/Resources/arrow_up.png b/McBitFont/Resources/arrow_up.png
new file mode 100644
index 0000000..1ebb193
Binary files /dev/null and b/McBitFont/Resources/arrow_up.png differ
diff --git a/McBitFont/Resources/asterisk_orange.png b/McBitFont/Resources/asterisk_orange.png
new file mode 100644
index 0000000..1ebebde
Binary files /dev/null and b/McBitFont/Resources/asterisk_orange.png differ
diff --git a/McBitFont/Resources/contrast.png b/McBitFont/Resources/contrast.png
new file mode 100644
index 0000000..e623c52
Binary files /dev/null and b/McBitFont/Resources/contrast.png differ
diff --git a/McBitFont/Resources/delete.png b/McBitFont/Resources/delete.png
new file mode 100644
index 0000000..08f2493
Binary files /dev/null and b/McBitFont/Resources/delete.png differ
diff --git a/McBitFont/Resources/package_go.png b/McBitFont/Resources/package_go.png
new file mode 100644
index 0000000..aace63a
Binary files /dev/null and b/McBitFont/Resources/package_go.png differ
diff --git a/McBitFont/Resources/shading.png b/McBitFont/Resources/shading.png
new file mode 100644
index 0000000..09275f9
Binary files /dev/null and b/McBitFont/Resources/shading.png differ
diff --git a/McBitFont/Resources/shape_align_center.png b/McBitFont/Resources/shape_align_center.png
new file mode 100644
index 0000000..efe9a98
Binary files /dev/null and b/McBitFont/Resources/shape_align_center.png differ
diff --git a/McBitFont/Resources/tick.png b/McBitFont/Resources/tick.png
new file mode 100644
index 0000000..a9925a0
Binary files /dev/null and b/McBitFont/Resources/tick.png differ
diff --git a/TODO.txt b/TODO.txt
index c0b9397..3fbbc7c 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -3,12 +3,14 @@ V Migrate from .Net Framework 4.7 to .NET 9
 V New Save file format! Use McBitFont v1.7 to convert old save files to the new format.
 V Better quality pictures in symbol list
 V Spinning cursor when application is busy
+V Change Menu icons
+V Re-arranged menu items
 
 Functionality:
 - Context menu in symbol navigator
 V Delete symbols before/after selected
-- Shift all symbols on code line (change symbol codes)
-- Specify starting code (extends the shift)
+V Shift all symbols on code line (change symbol codes)
+V Specify starting code (extends the shift)
 V Ability to make monospaced font a variable width one
 V Undo/Redo for canvas changes
 - Image import from a file
diff --git a/icons/Famfamfam-Silk-Disk.16.png b/icons/famfamfam/Famfamfam-Silk-Disk.16.png
similarity index 100%
rename from icons/Famfamfam-Silk-Disk.16.png
rename to icons/famfamfam/Famfamfam-Silk-Disk.16.png
diff --git a/icons/Famfamfam-Silk-Door-out.16.png b/icons/famfamfam/Famfamfam-Silk-Door-out.16.png
similarity index 100%
rename from icons/Famfamfam-Silk-Door-out.16.png
rename to icons/famfamfam/Famfamfam-Silk-Door-out.16.png
diff --git a/icons/Famfamfam-Silk-Folder-page.16.png b/icons/famfamfam/Famfamfam-Silk-Folder-page.16.png
similarity index 100%
rename from icons/Famfamfam-Silk-Folder-page.16.png
rename to icons/famfamfam/Famfamfam-Silk-Folder-page.16.png
diff --git a/icons/Famfamfam-Silk-Folder.16.png b/icons/famfamfam/Famfamfam-Silk-Folder.16.png
similarity index 100%
rename from icons/Famfamfam-Silk-Folder.16.png
rename to icons/famfamfam/Famfamfam-Silk-Folder.16.png
diff --git a/icons/Famfamfam-Silk-Page-copy.16.png b/icons/famfamfam/Famfamfam-Silk-Page-copy.16.png
similarity index 100%
rename from icons/Famfamfam-Silk-Page-copy.16.png
rename to icons/famfamfam/Famfamfam-Silk-Page-copy.16.png
diff --git a/icons/Famfamfam-Silk-Page-paste.16.png b/icons/famfamfam/Famfamfam-Silk-Page-paste.16.png
similarity index 100%
rename from icons/Famfamfam-Silk-Page-paste.16.png
rename to icons/famfamfam/Famfamfam-Silk-Page-paste.16.png
diff --git a/icons/Famfamfam-Silk-Page-white-copy.16.png b/icons/famfamfam/Famfamfam-Silk-Page-white-copy.16.png
similarity index 100%
rename from icons/Famfamfam-Silk-Page-white-copy.16.png
rename to icons/famfamfam/Famfamfam-Silk-Page-white-copy.16.png
diff --git a/icons/Famfamfam-Silk-Page-white.16.png b/icons/famfamfam/Famfamfam-Silk-Page-white.16.png
similarity index 100%
rename from icons/Famfamfam-Silk-Page-white.16.png
rename to icons/famfamfam/Famfamfam-Silk-Page-white.16.png
diff --git a/icons/Famfamfam-Silk-Shape-flip-horizontal.16.png b/icons/famfamfam/Famfamfam-Silk-Shape-flip-horizontal.16.png
similarity index 100%
rename from icons/Famfamfam-Silk-Shape-flip-horizontal.16.png
rename to icons/famfamfam/Famfamfam-Silk-Shape-flip-horizontal.16.png
diff --git a/icons/Famfamfam-Silk-Shape-flip-vertical.16.png b/icons/famfamfam/Famfamfam-Silk-Shape-flip-vertical.16.png
similarity index 100%
rename from icons/Famfamfam-Silk-Shape-flip-vertical.16.png
rename to icons/famfamfam/Famfamfam-Silk-Shape-flip-vertical.16.png
diff --git a/icons/famfamfam/add.png b/icons/famfamfam/add.png
new file mode 100644
index 0000000..6332fef
Binary files /dev/null and b/icons/famfamfam/add.png differ
diff --git a/icons/famfamfam/arrow_down.png b/icons/famfamfam/arrow_down.png
new file mode 100644
index 0000000..2c4e279
Binary files /dev/null and b/icons/famfamfam/arrow_down.png differ
diff --git a/icons/famfamfam/arrow_left.png b/icons/famfamfam/arrow_left.png
new file mode 100644
index 0000000..0f58984
Binary files /dev/null and b/icons/famfamfam/arrow_left.png differ
diff --git a/icons/famfamfam/arrow_redo.png b/icons/famfamfam/arrow_redo.png
new file mode 100644
index 0000000..fdc394c
Binary files /dev/null and b/icons/famfamfam/arrow_redo.png differ
diff --git a/icons/famfamfam/arrow_right.png b/icons/famfamfam/arrow_right.png
new file mode 100644
index 0000000..bc153c8
Binary files /dev/null and b/icons/famfamfam/arrow_right.png differ
diff --git a/icons/famfamfam/arrow_undo.png b/icons/famfamfam/arrow_undo.png
new file mode 100644
index 0000000..6972c5e
Binary files /dev/null and b/icons/famfamfam/arrow_undo.png differ
diff --git a/icons/famfamfam/arrow_up.png b/icons/famfamfam/arrow_up.png
new file mode 100644
index 0000000..1ebb193
Binary files /dev/null and b/icons/famfamfam/arrow_up.png differ
diff --git a/icons/famfamfam/asterisk_orange.png b/icons/famfamfam/asterisk_orange.png
new file mode 100644
index 0000000..1ebebde
Binary files /dev/null and b/icons/famfamfam/asterisk_orange.png differ
diff --git a/icons/famfamfam/contrast.png b/icons/famfamfam/contrast.png
new file mode 100644
index 0000000..e623c52
Binary files /dev/null and b/icons/famfamfam/contrast.png differ
diff --git a/icons/famfamfam/package_go.png b/icons/famfamfam/package_go.png
new file mode 100644
index 0000000..aace63a
Binary files /dev/null and b/icons/famfamfam/package_go.png differ
diff --git a/icons/famfamfam/shading.png b/icons/famfamfam/shading.png
new file mode 100644
index 0000000..09275f9
Binary files /dev/null and b/icons/famfamfam/shading.png differ
diff --git a/icons/famfamfam/shape_align_center.png b/icons/famfamfam/shape_align_center.png
new file mode 100644
index 0000000..efe9a98
Binary files /dev/null and b/icons/famfamfam/shape_align_center.png differ
diff --git a/icons/famfamfam/tick.png b/icons/famfamfam/tick.png
new file mode 100644
index 0000000..a9925a0
Binary files /dev/null and b/icons/famfamfam/tick.png differ