diff --git a/src/Bilder.qrc b/src/Bilder.qrc
index f755a3d..df17641 100644
--- a/src/Bilder.qrc
+++ b/src/Bilder.qrc
@@ -1,5 +1,12 @@
 <RCC>
     <qresource prefix="/Icons/Buttons">
         <file>icons/icon.png</file>
+        <file>icons/circle-tool.svg</file>
+        <file>icons/eraser-tool.svg</file>
+        <file>icons/flood-fill-tool.svg</file>
+        <file>icons/magic-wand-tool.svg</file>
+        <file>icons/pen-tool.svg</file>
+        <file>icons/polygon-tool.svg</file>
+        <file>icons/rectangle-tool.svg</file>
     </qresource>
 </RCC>
diff --git a/src/GUI/IntelliPhotoGui.cpp b/src/GUI/IntelliPhotoGui.cpp
index a686e5f..fa34f28 100644
--- a/src/GUI/IntelliPhotoGui.cpp
+++ b/src/GUI/IntelliPhotoGui.cpp
@@ -208,30 +208,37 @@ void IntelliPhotoGui::slotSwapColor(){
 }
 
 void IntelliPhotoGui::slotCreatePenTool(){
+        PenButton->setChecked(true);
 		paintingArea->createPenTool();
 }
 
 void IntelliPhotoGui::slotCreatePlainTool(){
+        PlainButton->setChecked(true);
 		paintingArea->createPlainTool();
 }
 
 void IntelliPhotoGui::slotCreateLineTool(){
+        LineButton->setChecked(true);
 		paintingArea->createLineTool();
 }
 
 void IntelliPhotoGui::slotCreateRectangleTool(){
+        RectangleButton->setChecked(true);
 		paintingArea->createRectangleTool();
 }
 
 void IntelliPhotoGui::slotCreateCircleTool(){
+        CircleButton->setChecked(true);
 		paintingArea->createCircleTool();
 }
 
 void IntelliPhotoGui::slotCreatePolygonTool(){
+        PolygonButton->setChecked(true);
 		paintingArea->createPolygonTool();
 }
 
 void IntelliPhotoGui::slotCreateFloodFillTool(){
+        FloodFillButton->setChecked(true);
 		paintingArea->createFloodFillTool();
 }
 
@@ -244,7 +251,25 @@ void IntelliPhotoGui::slotAboutDialog(){
 
 void IntelliPhotoGui::slotEnterPressed(){
     QString string = EditLineWidth->text();
+    if(string.toInt() > 50){
+        EditLineWidth->setText("50");
+    }
     paintingArea->Toolsettings.setLineWidth(string.toInt());
+    string = EditLineInnerAlpha->text();
+    if(string.toInt() > 255){
+        EditLineInnerAlpha->setText("255");
+    }
+    paintingArea->Toolsettings.setInnerAlpha(string.toInt());
+}
+
+void IntelliPhotoGui::slotResetTools(){
+    CircleButton->setChecked(false);
+    FloodFillButton->setChecked(false);
+    LineButton->setChecked(false);
+    PenButton->setChecked(false);
+    PlainButton->setChecked(false);
+    PolygonButton->setChecked(false);
+    RectangleButton->setChecked(false);
 }
 
 // Define menu actions that call functions
@@ -336,24 +361,32 @@ void IntelliPhotoGui::createActions(){
 
 		//Create Tool actions down here
 		actionCreatePlainTool = new QAction(tr("&Plain"), this);
+        connect(actionCreatePlainTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
 		connect(actionCreatePlainTool, SIGNAL(triggered()), this, SLOT(slotCreatePlainTool()));
 
+
 		actionCreatePenTool = new QAction(tr("&Pen"),this);
-		connect(actionCreatePenTool, SIGNAL(triggered()), this, SLOT(slotCreatePenTool()));
+        connect(actionCreatePenTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
+        connect(actionCreatePenTool, SIGNAL(triggered()), this, SLOT(slotCreatePenTool()));
 
 		actionCreateLineTool = new QAction(tr("&Line"), this);
+        connect(actionCreateLineTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
 		connect(actionCreateLineTool, SIGNAL(triggered()), this, SLOT(slotCreateLineTool()));
 
 		actionCreateCircleTool = new QAction(tr("&Circle"), this);
+        connect(actionCreateCircleTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
 		connect(actionCreateCircleTool, SIGNAL(triggered()), this, SLOT(slotCreateCircleTool()));
 
 		actionCreateRectangleTool = new QAction(tr("&Rectangle"), this);
+        connect(actionCreateRectangleTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
 		connect(actionCreateRectangleTool, SIGNAL(triggered()), this, SLOT(slotCreateRectangleTool()));
 
 		actionCreatePolygonTool = new QAction(tr("&Polygon"), this);
+        connect(actionCreatePolygonTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
 		connect(actionCreatePolygonTool, SIGNAL(triggered()), this, SLOT(slotCreatePolygonTool()));
 
 		actionCreateFloodFillTool = new QAction(tr("&FloodFill"), this);
+        connect(actionCreateFloodFillTool, SIGNAL(triggered()), this, SLOT(slotResetTools()));
 		connect(actionCreateFloodFillTool, SIGNAL(triggered()), this, SLOT(slotCreateFloodFillTool()));
 
 		// Create about action and tie to IntelliPhotoGui::about()
@@ -364,8 +397,29 @@ void IntelliPhotoGui::createActions(){
 		actionAboutQtDialog = new QAction(tr("About &Qt"), this);
 		connect(actionAboutQtDialog, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
 
-        actionPressEnter = new QAction();
         connect(EditLineWidth, SIGNAL(returnPressed()), this, SLOT(slotEnterPressed()));
+        connect(EditLineInnerAlpha, SIGNAL(returnPressed()), this, SLOT(slotEnterPressed()));
+
+        connect(CircleButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+        connect(CircleButton, SIGNAL(clicked()), this, SLOT(slotCreateCircleTool()));
+
+        connect(FloodFillButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+        connect(FloodFillButton, SIGNAL(clicked()), this, SLOT(slotCreateFloodFillTool()));
+
+        connect(LineButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+        connect(LineButton, SIGNAL(clicked()), this, SLOT(slotCreateLineTool()));
+
+        connect(PenButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+        connect(PenButton, SIGNAL(clicked()), this, SLOT(slotCreatePenTool()));
+
+        connect(PlainButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+        connect(PlainButton, SIGNAL(clicked()), this, SLOT(slotCreatePlainTool()));
+
+        connect(PolygonButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+        connect(PolygonButton, SIGNAL(clicked()), this, SLOT(slotCreatePolygonTool()));
+
+        connect(RectangleButton,SIGNAL(pressed()), this, SLOT(slotResetTools()));
+        connect(RectangleButton, SIGNAL(clicked()), this, SLOT(slotCreateRectangleTool()));
 }
 
 // Create the menubar
@@ -442,67 +496,86 @@ void IntelliPhotoGui::createGui(){
 		// create Gui elements
 		paintingArea = new PaintingArea();
 
-        QPixmap p(":/Icons/Buttons/icons/icon.png");
-
+        p = QPixmap(":/Icons/Buttons/icons/circle-tool.svg");
         CircleButton = new QPushButton();
         CircleButton->setFixedSize(Buttonsize);
         CircleButton->setIcon(p);
         CircleButton->setIconSize(Buttonsize);
+        CircleButton->setCheckable(true);
 
+        p = QPixmap(":/Icons/Buttons/icons/flood-fill-tool.svg");
         FloodFillButton = new QPushButton();
         FloodFillButton->setFixedSize(Buttonsize);
         FloodFillButton->setIcon(p);
         FloodFillButton->setIconSize(Buttonsize);
+        FloodFillButton->setCheckable(true);
 
+        p = QPixmap(":/Icons/Buttons/icons/icon.png");
         LineButton = new QPushButton();
         LineButton->setFixedSize(Buttonsize);
         LineButton->setIcon(p);
         LineButton->setIconSize(Buttonsize);
+        LineButton->setCheckable(true);
 
+        p = QPixmap(":/Icons/Buttons/icons/pen-tool.svg");
         PenButton = new QPushButton();
         PenButton->setFixedSize(Buttonsize);
         PenButton->setIcon(p);
         PenButton->setIconSize(Buttonsize);
+        PenButton->setCheckable(true);
 
+        p = QPixmap(":/Icons/Buttons/icons/icon.png");
         PlainButton = new QPushButton();
         PlainButton->setFixedSize(Buttonsize);
         PlainButton->setIcon(p);
         PlainButton->setIconSize(Buttonsize);
+        PlainButton->setCheckable(true);
 
+        p = QPixmap(":/Icons/Buttons/icons/polygon-tool.svg");
         PolygonButton = new QPushButton();
         PolygonButton->setFixedSize(Buttonsize);
         PolygonButton->setIcon(p);
         PolygonButton->setIconSize(Buttonsize);
+        PolygonButton->setCheckable(true);
 
+        p = QPixmap(":/Icons/Buttons/icons/rectangle-tool.svg");
         RectangleButton = new QPushButton();
         RectangleButton->setFixedSize(Buttonsize);
         RectangleButton->setIcon(p);
         RectangleButton->setIconSize(Buttonsize);
+        RectangleButton->setCheckable(true);
 
         WidthLine = new QLabel();
         WidthLine->setText("Width");
-        WidthLine->setFixedSize(QSize(100,20));
+        WidthLine->setFixedSize(QSize(55,20));
 
         EditLineWidth = new QLineEdit();
         EditLineWidth->setFixedSize(QSize(50,20));
         EditLineWidth->setText("5");
         ValidatorLineWidth = new QIntValidator();
-        ValidatorLineWidth->setTop(50);
+        ValidatorLineWidth->setTop(99);
         ValidatorLineWidth->setBottom(1);
         EditLineWidth->setValidator(ValidatorLineWidth);
 
         innerAlphaLine = new QLabel();
         innerAlphaLine->setText("Inner Alpha");
-        innerAlphaLine->setFixedSize(QSize(100,20));
+        innerAlphaLine->setFixedSize(QSize(55,20));
 
         EditLineInnerAlpha = new QLineEdit();
         EditLineInnerAlpha->setFixedSize(QSize(50,20));
         EditLineInnerAlpha->setText("255");
         ValidatorInnerAlpha = new QIntValidator();
-        ValidatorInnerAlpha->setTop(255);
+        ValidatorInnerAlpha->setTop(999);
         ValidatorInnerAlpha->setBottom(0);
         EditLineInnerAlpha->setValidator(ValidatorInnerAlpha);
 
+        Farbe1 = new QLabel();
+        Farbe1->setText("");
+        QPalette Palette;
+        Palette.setColor(QPalette::Background,QColor(0,0,0));//paintingArea->colorPicker.getFirstColor());
+        Farbe1->setPalette(Palette);
+        Farbe1->setFixedSize(QSize(20,20));
+
 		// set gui elements
         mainLayout->addWidget(paintingArea,1,1,20,1);
         mainLayout->addWidget(CircleButton,1,2,1,1);
@@ -516,6 +589,7 @@ void IntelliPhotoGui::createGui(){
         mainLayout->addWidget(EditLineWidth,9,2,1,1);
         mainLayout->addWidget(innerAlphaLine,10,2,1,1);
         mainLayout->addWidget(EditLineInnerAlpha,11,2,1,1);
+        mainLayout->addWidget(Farbe1,12,2,1,1);
 }
 
 void IntelliPhotoGui::setIntelliStyle(){
diff --git a/src/GUI/IntelliPhotoGui.h b/src/GUI/IntelliPhotoGui.h
index 0cb9173..e993982 100644
--- a/src/GUI/IntelliPhotoGui.h
+++ b/src/GUI/IntelliPhotoGui.h
@@ -73,6 +73,8 @@ void slotAboutDialog();
 
 void slotEnterPressed();
 
+void slotResetTools();
+
 private:
 // Will tie user actions to functions
 void createActions();
@@ -93,6 +95,7 @@ void setDefaultToolValue();
 PaintingArea* paintingArea;
 
 const QSize Buttonsize = QSize(50,50);
+QPixmap p;
 QPushButton* CircleButton;
 QPushButton* FloodFillButton;
 QPushButton* LineButton;
@@ -107,6 +110,8 @@ QLineEdit* EditLineInnerAlpha;
 QIntValidator* ValidatorLineWidth;
 QIntValidator* ValidatorInnerAlpha;
 
+QLabel* Farbe1;
+
 // The menu widgets
 QMenu*saveAsMenu;
 QMenu*fileMenu;
@@ -135,8 +140,6 @@ QAction*actionCreateCircleTool;
 QAction*actionCreatePolygonTool;
 QAction*actionCreateFloodFillTool;
 
-QAction*actionPressEnter;
-
 // dialog actions
 QAction*actionAboutDialog;
 QAction*actionAboutQtDialog;
diff --git a/src/Layer/PaintingArea.h b/src/Layer/PaintingArea.h
index 8b65d5b..cf218e4 100644
--- a/src/Layer/PaintingArea.h
+++ b/src/Layer/PaintingArea.h
@@ -166,6 +166,7 @@ public:
     std::vector<QPoint> getPolygonDataOfRealLayer();
 
     IntelliToolsettings Toolsettings;
+    IntelliColorPicker colorPicker;
 
 public slots:
     // Events to handle
@@ -203,7 +204,6 @@ private:
     int maxHeight;
 
     IntelliTool* Tool;
-    IntelliColorPicker colorPicker;
 
     std::vector<LayerObject> layerBundle;
     int activeLayer=-1;
diff --git a/src/icons/circle-tool.svg b/src/icons/circle-tool.svg
new file mode 100644
index 0000000..a6cc0e4
--- /dev/null
+++ b/src/icons/circle-tool.svg
@@ -0,0 +1,94 @@
+<?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="256"
+   height="256"
+   viewBox="0 0 67.733332 67.733335"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="circle-tool.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient36">
+      <stop
+         style="stop-color:#d40000;stop-opacity:1;"
+         offset="0"
+         id="stop32" />
+      <stop
+         style="stop-color:#d40000;stop-opacity:0;"
+         offset="1"
+         id="stop34" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient36"
+       id="linearGradient38"
+       x1="147.98735"
+       y1="176.19795"
+       x2="-13.131983"
+       y2="106.49742"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="166.94289"
+     inkscape:cy="125.27289"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     showguides="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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,-229.26665)">
+    <circle
+       style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.85208333;stroke-miterlimit:4;stroke-dasharray:none"
+       id="circle4578"
+       cx="33.78162"
+       cy="263.02939"
+       r="2.5985863" />
+    <circle
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.11666656;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4602"
+       cx="33.781624"
+       cy="263.50183"
+       r="26.316593" />
+  </g>
+</svg>
diff --git a/src/icons/eraser-tool.svg b/src/icons/eraser-tool.svg
new file mode 100644
index 0000000..cdc518d
--- /dev/null
+++ b/src/icons/eraser-tool.svg
@@ -0,0 +1,109 @@
+<?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="256"
+   height="256"
+   viewBox="0 0 67.733332 67.733335"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="eraser-tool.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:export-filename="C:\Users\pauln\tool1.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient36">
+      <stop
+         style="stop-color:#d40000;stop-opacity:1;"
+         offset="0"
+         id="stop32" />
+      <stop
+         style="stop-color:#d40000;stop-opacity:0;"
+         offset="1"
+         id="stop34" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient36"
+       id="linearGradient38"
+       x1="147.98735"
+       y1="176.19795"
+       x2="-13.131983"
+       y2="106.49742"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="154.79235"
+     inkscape:cy="136.37674"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g4716"
+     showgrid="false"
+     units="px"
+     showguides="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata5">
+    <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,-229.26665)">
+    <g
+       id="g4716">
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.54304647;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect4775"
+         width="59.058777"
+         height="57.168896"
+         x="4.2522316"
+         y="234.16145" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:16.96439552;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 64.539433,248.9069 -8.315476,0.24173 c 0,0 -13.890625,31.06218 -29.576635,22.72253"
+         id="path4777"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:#ffaaaa;stroke-width:19.02600098;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect4779"
+         width="3.5923276"
+         height="18.439137"
+         x="100.56355"
+         y="236.22752"
+         transform="matrix(0.96477278,0.26308456,-0.30397854,0.95267888,0,0)" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/flood-fill-tool.svg b/src/icons/flood-fill-tool.svg
new file mode 100644
index 0000000..980bb7a
--- /dev/null
+++ b/src/icons/flood-fill-tool.svg
@@ -0,0 +1,194 @@
+<?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="256"
+   height="256"
+   viewBox="0 0 67.733332 67.733335"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="flood-fill-tool.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4746">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4742" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1"
+         offset="1"
+         id="stop4744" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient36">
+      <stop
+         style="stop-color:#d40000;stop-opacity:1;"
+         offset="0"
+         id="stop32" />
+      <stop
+         style="stop-color:#d40000;stop-opacity:0;"
+         offset="1"
+         id="stop34" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient36"
+       id="linearGradient38"
+       x1="147.98735"
+       y1="176.19795"
+       x2="-13.131983"
+       y2="106.49742"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4746"
+       id="linearGradient4748"
+       x1="278.75943"
+       y1="55.545975"
+       x2="278.70905"
+       y2="102.68295"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="178.00664"
+     inkscape:cy="120.50274"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g4716"
+     showgrid="false"
+     units="px"
+     showguides="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata5">
+    <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,-229.26665)">
+    <g
+       id="g4716">
+      <rect
+         style="fill:url(#linearGradient4748);fill-opacity:1;stroke:#000000;stroke-width:2.54346728;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect4736"
+         width="20.992056"
+         height="38.493938"
+         x="268.06161"
+         y="65.299561"
+         transform="matrix(0.37877425,0.9254891,-0.96183685,0.2736236,0,0)" />
+      <rect
+         y="199.89908"
+         x="116.56168"
+         height="29.387648"
+         width="34.49033"
+         id="rect4710"
+         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.11666656;stroke-miterlimit:4;stroke-dasharray:none"
+         transform="rotate(22.139383)" />
+      <ellipse
+         ry="3.6608384"
+         rx="17.12623"
+         cy="229.80646"
+         cx="133.85408"
+         id="path4712"
+         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.07105064;stroke-miterlimit:4;stroke-dasharray:none"
+         transform="rotate(22.139383)" />
+      <rect
+         style="fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:0.57643586;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect4722"
+         width="6.4093542"
+         height="5.9942107"
+         x="106.55282"
+         y="220.71335"
+         transform="matrix(0.89502052,0.44602497,-0.31493366,0.94911369,0,0)"
+         ry="2.9971054" />
+      <rect
+         ry="4.9373565"
+         transform="matrix(0.76230952,0.64721263,-0.19117303,0.98155635,0,0)"
+         y="211.36087"
+         x="91.973289"
+         height="9.8747129"
+         width="7.5251632"
+         id="rect4726"
+         style="fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:0.80167449;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         style="fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:0.68775666;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect4728"
+         width="6.9141498"
+         height="7.9099746"
+         x="106.98909"
+         y="208.27184"
+         transform="matrix(0.82967592,0.55824535,-0.238658,0.97110368,0,0)"
+         ry="3.9549873" />
+      <rect
+         style="fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:0.83867002;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect4732"
+         width="7.7389083"
+         height="10.508647"
+         x="99.318977"
+         y="206.74135"
+         transform="matrix(0.74125487,0.67122367,-0.1796405,0.98373233,0,0)"
+         ry="5.2543235" />
+      <rect
+         ry="4.9687924"
+         transform="matrix(0.76020136,0.64968753,-0.18996354,0.98179115,0,0)"
+         y="213.06801"
+         x="82.413681"
+         height="9.9375849"
+         width="7.5460315"
+         id="rect4734"
+         style="fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:0.80533689;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         ry="2.9971054"
+         transform="matrix(0.89502052,0.44602497,-0.31493366,0.94911369,0,0)"
+         y="219.89731"
+         x="128.72516"
+         height="5.9942107"
+         width="6.4093542"
+         id="rect4738"
+         style="fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:0.57643586;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         style="fill:#ff2a2a;fill-opacity:1;stroke:none;stroke-width:0.61344987;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect4740"
+         width="6.5649834"
+         height="6.6277919"
+         x="107.49622"
+         y="215.86592"
+         transform="matrix(0.87380318,0.48627976,-0.28482771,0.95857873,0,0)"
+         ry="3.3138959" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/icon.bmp b/src/icons/icon.bmp
deleted file mode 100644
index 06dda14..0000000
Binary files a/src/icons/icon.bmp and /dev/null differ
diff --git a/src/icons/icon.icns b/src/icons/icon.icns
deleted file mode 100644
index 791b4ae..0000000
Binary files a/src/icons/icon.icns and /dev/null differ
diff --git a/src/icons/magic-wand-tool.svg b/src/icons/magic-wand-tool.svg
new file mode 100644
index 0000000..71f019d
--- /dev/null
+++ b/src/icons/magic-wand-tool.svg
@@ -0,0 +1,169 @@
+<?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="256"
+   height="256"
+   viewBox="0 0 67.733332 67.733335"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="magic-wand-tool.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient36">
+      <stop
+         style="stop-color:#d40000;stop-opacity:1;"
+         offset="0"
+         id="stop32" />
+      <stop
+         style="stop-color:#d40000;stop-opacity:0;"
+         offset="1"
+         id="stop34" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient36"
+       id="linearGradient38"
+       x1="147.98735"
+       y1="176.19795"
+       x2="-13.131983"
+       y2="106.49742"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="154.79235"
+     inkscape:cy="122.64559"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g4716"
+     showgrid="false"
+     units="px"
+     showguides="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false" />
+  <metadata
+     id="metadata5">
+    <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,-229.26665)">
+    <g
+       id="g4716">
+      <g
+         id="g4767"
+         transform="translate(-4.5357143,7.0870536)">
+        <rect
+           transform="rotate(45)"
+           ry="1.889881"
+           y="137.33192"
+           x="203.35738"
+           height="53.483627"
+           width="10.299852"
+           id="rect4758"
+           style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.7175684;stroke-miterlimit:4;stroke-dasharray:none" />
+        <rect
+           transform="rotate(45)"
+           style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.8319869;stroke-miterlimit:4;stroke-dasharray:none"
+           id="rect4760"
+           width="9.7328882"
+           height="2.8348179"
+           x="203.64085"
+           y="148.6712" />
+        <rect
+           transform="rotate(45)"
+           y="141.20618"
+           x="203.64085"
+           height="2.8348179"
+           width="9.7328882"
+           id="rect4762"
+           style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.8319869;stroke-miterlimit:4;stroke-dasharray:none" />
+      </g>
+      <path
+         sodipodi:type="star"
+         style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:2.11666656;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path4769"
+         sodipodi:sides="5"
+         sodipodi:cx="44.223213"
+         sodipodi:cy="239.92558"
+         sodipodi:r1="8.624361"
+         sodipodi:r2="4.3121805"
+         sodipodi:arg1="1.0040671"
+         sodipodi:arg2="1.6323856"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m 48.853421,247.20162 -4.895624,-2.97203 -5.223697,2.348 1.313744,-5.57442 -3.847298,-4.24246 5.707563,-0.47315 2.845937,-4.96999 2.213724,5.28201 5.606183,1.17083 -4.339406,3.73761 z"
+         inkscape:transform-center-x="2.6385383"
+         inkscape:transform-center-y="1.2565374"
+         transform="rotate(-21.763247,66.493886,211.70978)" />
+      <path
+         transform="matrix(-0.16940831,-0.61726905,0.61726905,-0.16940831,-99.981719,307.02239)"
+         inkscape:transform-center-y="1.5995691"
+         inkscape:transform-center-x="-0.47805579"
+         d="m 48.853421,247.20162 -4.895624,-2.97203 -5.223697,2.348 1.313744,-5.57442 -3.847298,-4.24246 5.707563,-0.47315 2.845937,-4.96999 2.213724,5.28201 5.606183,1.17083 -4.339406,3.73761 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.6323856"
+         sodipodi:arg1="1.0040671"
+         sodipodi:r2="4.3121805"
+         sodipodi:r1="8.624361"
+         sodipodi:cy="239.92558"
+         sodipodi:cx="44.223213"
+         sodipodi:sides="5"
+         id="path4771"
+         style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:2.11666656;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="star" />
+      <path
+         sodipodi:type="star"
+         style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:2.11666656;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path4773"
+         sodipodi:sides="5"
+         sodipodi:cx="44.223213"
+         sodipodi:cy="239.92558"
+         sodipodi:r1="8.624361"
+         sodipodi:r2="4.3121805"
+         sodipodi:arg1="1.0040671"
+         sodipodi:arg2="1.6323856"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m 48.853421,247.20162 -4.895624,-2.97203 -5.223697,2.348 1.313744,-5.57442 -3.847298,-4.24246 5.707563,-0.47315 2.845937,-4.96999 2.213724,5.28201 5.606183,1.17083 -4.339406,3.73761 z"
+         inkscape:transform-center-x="0.0027046201"
+         inkscape:transform-center-y="1.1149197"
+         transform="matrix(0.25199367,-0.58840415,0.58840415,0.25199367,-99.952707,231.42813)" />
+    </g>
+  </g>
+</svg>
diff --git a/src/icons/pen-tool.svg b/src/icons/pen-tool.svg
new file mode 100644
index 0000000..5dd9782
--- /dev/null
+++ b/src/icons/pen-tool.svg
@@ -0,0 +1,105 @@
+<?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="256"
+   height="256"
+   viewBox="0 0 67.733332 67.733335"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="pen-tool.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient36">
+      <stop
+         style="stop-color:#d40000;stop-opacity:1;"
+         offset="0"
+         id="stop32" />
+      <stop
+         style="stop-color:#d40000;stop-opacity:0;"
+         offset="1"
+         id="stop34" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient36"
+       id="linearGradient38"
+       x1="147.98735"
+       y1="176.19795"
+       x2="-13.131983"
+       y2="106.49742"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="376.91553"
+     inkscape:cy="52.667178"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     showguides="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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,-229.26665)">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke-width:0.79907227"
+       inkscape:transform-center-x="2.1805457"
+       inkscape:transform-center-y="0.23135325"
+       d="m 64.660259,230.98439 c -1.469539,1.22623 -3.009608,0.3208 -4.479147,2.55438 l -35.355186,29.81232 20.997146,4.03437 16.236587,-28.5477 c 2.650564,-3.49373 1.675561,-4.59875 2.6006,-7.85337 z"
+       id="path16"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <ellipse
+       style="fill:#000000;fill-opacity:1;stroke-width:0.2446842"
+       id="path19"
+       ry="4.8653927"
+       rx="10.959454"
+       cy="259.34927"
+       cx="70.703522"
+       transform="matrix(0.99175335,0.12816118,-0.13566218,0.99075515,0,0)" />
+    <path
+       style="fill:url(#linearGradient38);fill-opacity:1;stroke:none;stroke-width:1.1613673px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 19.935603,103.02103 C 11.487015,114.14384 3.7900432,116.38626 5.1066573,144.52297 7.9154345,204.54791 22.091131,264.29315 75.056641,251.85938 127.52071,239.54339 188.58555,194.70704 177.64844,158.85742 c -12.48014,3.63122 -34.362,10.63187 -51.541,8.65662 -12.43758,-1.43999 -33.957254,-24.02776 -43.821058,-27.9929 -2.739296,6.28676 5.637281,36.28371 -21.584814,27.90384 -62.9196406,-19.36876 11.109787,-93.171912 16.121057,-90.16515 0,0 -33.485263,-5.047889 -56.887022,25.7612 z"
+       transform="matrix(0.26458333,0,0,0.26458333,0,229.26665)"
+       id="path23"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssccccscs" />
+  </g>
+</svg>
diff --git a/src/icons/polygon-tool.svg b/src/icons/polygon-tool.svg
new file mode 100644
index 0000000..7602729
--- /dev/null
+++ b/src/icons/polygon-tool.svg
@@ -0,0 +1,117 @@
+<?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="256"
+   height="256"
+   viewBox="0 0 67.733332 67.733335"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="polygon-tool.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient36">
+      <stop
+         style="stop-color:#d40000;stop-opacity:1;"
+         offset="0"
+         id="stop32" />
+      <stop
+         style="stop-color:#d40000;stop-opacity:0;"
+         offset="1"
+         id="stop34" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient36"
+       id="linearGradient38"
+       x1="147.98735"
+       y1="176.19795"
+       x2="-13.131983"
+       y2="106.49742"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="107.4786"
+     inkscape:cy="125.27289"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     showguides="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-229.26665)">
+    <path
+       style="fill:#ff0000;stroke:#000000;stroke-width:2.11666667;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:0"
+       d="M 6.7090773,250.6979 61.137648,243.51635 60.47619,288.87349 10.205357,286.13317 22.867559,260.33629 Z"
+       id="path4590"
+       inkscape:connector-curvature="0" />
+    <circle
+       style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.85208333;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4572"
+       cx="4.5829611"
+       cy="249.98918"
+       r="2.5985863" />
+    <circle
+       r="2.5985863"
+       cy="243.5636"
+       cx="61.090405"
+       id="circle4574"
+       style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.85208333;stroke-miterlimit:4;stroke-dasharray:none" />
+    <circle
+       r="2.5985863"
+       cy="260.38354"
+       cx="22.914806"
+       id="circle4576"
+       style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.85208333;stroke-miterlimit:4;stroke-dasharray:none" />
+    <circle
+       style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.85208333;stroke-miterlimit:4;stroke-dasharray:none"
+       id="circle4588"
+       cx="9.0241814"
+       cy="286.84189"
+       r="2.5985863" />
+    <circle
+       style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.85208333;stroke-miterlimit:4;stroke-dasharray:none"
+       id="circle4578"
+       cx="60.523441"
+       cy="288.82626"
+       r="2.5985863" />
+  </g>
+</svg>
diff --git a/src/icons/rectangle-tool.svg b/src/icons/rectangle-tool.svg
new file mode 100644
index 0000000..3056a02
--- /dev/null
+++ b/src/icons/rectangle-tool.svg
@@ -0,0 +1,101 @@
+<?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="256"
+   height="256"
+   viewBox="0 0 67.733332 67.733335"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="rectangle-tool.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient36">
+      <stop
+         style="stop-color:#d40000;stop-opacity:1;"
+         offset="0"
+         id="stop32" />
+      <stop
+         style="stop-color:#d40000;stop-opacity:0;"
+         offset="1"
+         id="stop34" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient36"
+       id="linearGradient38"
+       x1="147.98735"
+       y1="176.19795"
+       x2="-13.131983"
+       y2="106.49742"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="107.4786"
+     inkscape:cy="125.27289"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     showguides="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-229.26665)">
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.85208333;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect56"
+       width="54.995537"
+       height="38.648064"
+       x="6.1421127"
+       y="243.04388" />
+    <circle
+       style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.85208333;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4572"
+       cx="6.3783484"
+       cy="243.5636"
+       r="2.5985863" />
+    <circle
+       style="fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1.85208333;stroke-miterlimit:4;stroke-dasharray:none"
+       id="circle4578"
+       cx="61.090405"
+       cy="281.7392"
+       r="2.5985863" />
+  </g>
+</svg>
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 433b697..0bbafd4 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -16,7 +16,36 @@
   <property name="animated">
    <bool>true</bool>
   </property>
-  <widget class="QWidget" name="centralwidget"/>
+  <widget class="QWidget" name="centralwidget">
+   <widget class="QGraphicsView" name="graphicsView">
+    <property name="geometry">
+     <rect>
+      <x>120</x>
+      <y>100</y>
+      <width>256</width>
+      <height>192</height>
+     </rect>
+    </property>
+    <property name="backgroundBrush">
+     <brush brushstyle="SolidPattern">
+      <color alpha="255">
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+     </brush>
+    </property>
+    <property name="foregroundBrush">
+     <brush brushstyle="SolidPattern">
+      <color alpha="255">
+       <red>0</red>
+       <green>0</green>
+       <blue>0</blue>
+      </color>
+     </brush>
+    </property>
+   </widget>
+  </widget>
  </widget>
  <resources/>
  <connections/>