diff --git a/media/noggit.ico b/media/noggit.ico
index 5bdcaa44..e2dd6c6b 100644
Binary files a/media/noggit.ico and b/media/noggit.ico differ
diff --git a/media/noggit_icon.png b/media/noggit_icon.png
index abca297f..04f28e6f 100644
Binary files a/media/noggit_icon.png and b/media/noggit_icon.png differ
diff --git a/resources/noggit_font.ttf b/resources/noggit_font.ttf
index b3567047..98af643b 100644
Binary files a/resources/noggit_font.ttf and b/resources/noggit_font.ttf differ
diff --git a/src/noggit/Red/MapCreationWizard/UI/MapCreationWizard.cpp b/src/noggit/Red/MapCreationWizard/UI/MapCreationWizard.cpp
index 15ce248d..194b69a6 100644
--- a/src/noggit/Red/MapCreationWizard/UI/MapCreationWizard.cpp
+++ b/src/noggit/Red/MapCreationWizard/UI/MapCreationWizard.cpp
@@ -83,14 +83,12 @@ MapCreationWizard::MapCreationWizard(QWidget* parent) : noggit::ui::widget(paren
   layout_selector->addWidget(add_btn);
 
   add_btn->setAccessibleName("map_wizard_add_button");
-  add_btn->setFixedSize(36, 22);
 
   auto remove_btn = new QPushButton("Remove",this);
   remove_btn->setIcon(noggit::ui::font_awesome_icon(noggit::ui::font_awesome::times));
   layout_selector->addWidget(remove_btn);
   
   remove_btn->setAccessibleName("map_wizard_remove_button");
-  remove_btn->setFixedSize(36, 22);
 
   _map_settings = new QGroupBox("Map settings", this);
   layout_right->addWidget(_map_settings);
@@ -179,6 +177,8 @@ MapCreationWizard::MapCreationWizard(QWidget* parent) : noggit::ui::widget(paren
   auto discard_btn = new QPushButton("Discard", this);
   btn_row_layout->addWidget(save_btn);
   btn_row_layout->addWidget(discard_btn);
+  save_btn->setAccessibleName("map_wizard_save_button");
+  discard_btn->setAccessibleName("map_wizard_discard_button");
 
   layout_right->addItem(btn_row_layout);
 
diff --git a/src/noggit/Red/ViewToolbar/Ui/ViewToolbar.cpp b/src/noggit/Red/ViewToolbar/Ui/ViewToolbar.cpp
index d08b1cb7..0b6be70b 100644
--- a/src/noggit/Red/ViewToolbar/Ui/ViewToolbar.cpp
+++ b/src/noggit/Red/ViewToolbar/Ui/ViewToolbar.cpp
@@ -13,16 +13,18 @@ ViewToolbar::ViewToolbar(MapView* mapView)
   setAllowedAreas(Qt::TopToolBarArea | Qt::BottomToolBarArea);
 
   add_tool_icon(&mapView->_draw_models, tr("Doodads"), font_noggit::VISIBILITY_DOODADS);
+  add_tool_icon(&mapView->_draw_wmo, tr("WMOs"), font_noggit::VISIBILITY_WMO);
   add_tool_icon(&mapView->_draw_wmo_doodads, tr("WMO doodads"), font_noggit::VISIBILITY_WMO_DOODADS);
   add_tool_icon(&mapView->_draw_terrain, tr("Terrain"), font_noggit::VISIBILITY_TERRAIN);
   add_tool_icon(&mapView->_draw_water, tr("Water"), font_noggit::VISIBILITY_WATER);
-  add_tool_icon(&mapView->_draw_wmo, tr("WMOs"), font_noggit::VISIBILITY_WMO);
+  
   addSeparator();
 
   add_tool_icon(&mapView->_draw_lines, tr("Lines"), font_noggit::VISIBILITY_LINES);
-  add_tool_icon(&mapView->_draw_contour, tr("Contours"), font_noggit::VISIBILITY_CONTOURS);
-  add_tool_icon(&mapView->_draw_wireframe, tr("Wireframe"), font_noggit::VISIBILITY_WIREFRAME);
   add_tool_icon(&mapView->_draw_hole_lines, tr("Hole lines"), font_noggit::VISIBILITY_HOLE_LINES);
+  add_tool_icon(&mapView->_draw_wireframe, tr("Wireframe"), font_noggit::VISIBILITY_WIREFRAME);
+  add_tool_icon(&mapView->_draw_contour, tr("Contours"), font_noggit::VISIBILITY_CONTOURS);
+  
   addSeparator();
 
   // Animation
diff --git a/src/noggit/ui/About.cpp b/src/noggit/ui/About.cpp
index 35a5810b..08afcda2 100644
--- a/src/noggit/ui/About.cpp
+++ b/src/noggit/ui/About.cpp
@@ -1,42 +1,41 @@
-// This file is part of Noggit3, licensed under GNU General Public License (version 3).
-
-#include <noggit/ui/About.h>
-#include <noggit/TextureManager.h>
-
-#include "revision.h"
-
-#include <QIcon>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QVBoxLayout>
-
-namespace noggit
-{
-  namespace ui
-  {
-    about::about(QWidget* parent)
-      : QDialog(parent)
-    {
-      setWindowIcon(QIcon(":/icon"));
-      setWindowTitle("About");
-
-      //! \todo make nice looking again, I don't care currently
-      new QVBoxLayout (this);
-
-      auto icon (new QLabel (this));
-      icon->setPixmap (*BLPRenderer::getInstance().render_blp_to_pixmap ("interface/icons/inv_potion_83.blp"));
-      layout()->addWidget (icon);
-      //! \todo was Skurri32
-      layout()->addWidget (new QLabel ("Noggit Studio", this));
-      layout()->addWidget (new QLabel ("a wow map editor for 3.3.5a", this));
-      layout()->addWidget ( new QLabel ( "Ufoz [...], Cryect, Beket, Schlumpf, "
-                                         "Tigurius, Steff, Garthog, Glararan, Cromon, "
-                                         "Hanfer, Skarn, AxelSheva, Valium, Kaev, "
-                                         "Adspartan", this
-                                       )
-                          );
-      layout()->addWidget (new QLabel ("World of Warcraft is (C) Blizzard Entertainment", this));
-      layout()->addWidget (new QLabel (STRPRODUCTVER, this));
-      layout()->addWidget (new QLabel (__DATE__ ", " __TIME__, this));
-    }
-  }
-}
+// This file is part of Noggit3, licensed under GNU General Public License (version 3).
+
+#include <noggit/ui/About.h>
+#include <noggit/TextureManager.h>
+
+#include "revision.h"
+
+#include <QIcon>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QVBoxLayout>
+
+namespace noggit
+{
+  namespace ui
+  {
+    about::about(QWidget* parent)
+      : QDialog(parent)
+    {
+      setWindowIcon(QIcon(":/icon"));
+      setWindowTitle("About");
+
+      new QHBoxLayout (this);
+
+      auto icon (new QLabel (this));
+      auto pixmap = QPixmap::fromImage(QImage(":/icon"));
+      icon->setPixmap(pixmap.scaled(128,128));
+
+      layout()->addWidget (icon);
+
+      layout()->addWidget (new QLabel ("Noggit Studio Red", this));
+      layout()->addWidget (new QLabel ("WoW map editor for 3.3.5a", this));
+      layout()->addWidget (new QLabel ("Ufoz [...], Cryect, Beket, Schlumpf, "
+                                       "Tigurius, Steff, Garthog, Glararan, Cromon, "
+                                       "Hanfer, Skarn, AxelSheva, Valium, Kaev, "
+                                       "Adspartan", this));
+      layout()->addWidget (new QLabel ("World of Warcraft is (C) Blizzard Entertainment", this));
+      layout()->addWidget (new QLabel (STRPRODUCTVER, this));
+      layout()->addWidget (new QLabel (__DATE__ ", " __TIME__, this));
+    }
+  }
+}