diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index ba46bbca2..016def8ee 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -107,6 +107,7 @@ MainWindow::MainWindow(const QDir &home) :
     static const QIcon showIcon(":images/toolbar/main/showside.png");
     static const QIcon tabIcon(":images/toolbar/main/tab.png");
     static const QIcon tileIcon(":images/toolbar/main/tile.png");
+    static const QIcon fullIcon(":images/toolbar/main/togglefull.png");
 
     mainwindows.append(this); // add us to the list of open windows
 
@@ -212,10 +213,10 @@ MainWindow::MainWindow(const QDir &home) :
     lspacer->setStyleSheet("background-color: rgba( 255, 255, 255, 0% ); border: 0px;");
     toolbar->addWidget(lspacer);
 
-    // show hide sidbar
+    // show hide sidebar
     side = new QPushButton(hideIcon, "", this);
     side->setFocusPolicy(Qt::NoFocus);
-    side->setIconSize(QSize(10,10));
+    side->setIconSize(QSize(15,15));
     side->setAutoFillBackground(false);
     side->setAutoDefault(false);
     side->setFlat(true);
@@ -223,17 +224,30 @@ MainWindow::MainWindow(const QDir &home) :
     lspacerLayout->addWidget(side);
     connect(side, SIGNAL(clicked()), this, SLOT(toggleSidebar()));
 
+    // switch tab/tile
     style = new QPushButton(tabIcon, "", this);
     style->setFocusPolicy(Qt::NoFocus);
-    style->setIconSize(QSize(10,10));
+    style->setIconSize(QSize(15,15));
     style->setAutoFillBackground(false);
     style->setAutoDefault(false);
     style->setFlat(true);
     style->setStyleSheet("background-color: rgba( 255, 255, 255, 0% ); border: 0px;");
     lspacerLayout->addWidget(style);
-    lspacerLayout->addStretch();
     connect(style, SIGNAL(clicked()), this, SLOT(toggleStyle()));
 
+#ifndef Q_OS_MAC // full screen is in title bar on a Mac
+    full = new QPushButton(fullIcon, "", this);
+    full->setFocusPolicy(Qt::NoFocus);
+    full->setIconSize(QSize(15,15));
+    full->setAutoFillBackground(false);
+    full->setAutoDefault(false);
+    full->setFlat(true);
+    full->setStyleSheet("background-color: rgba( 255, 255, 255, 0% ); border: 0px;");
+    lspacerLayout->addWidget(full);
+    lspacerLayout->addStretch();
+    connect(full, SIGNAL(clicked()), this, SLOT(toggleFullScreen()));
+#endif
+
     trainTool = new TrainTool(this, home);
     trainTool->hide();
     toolbar->addWidget(trainTool->getToolbarButtons());
diff --git a/src/MainWindow.h b/src/MainWindow.h
index e12a1461a..d796b92bf 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -310,7 +310,7 @@ class MainWindow : public QMainWindow
         QAction *showhideSidebar;
 
         // toolbar butttons
-        QPushButton *side, *style;
+        QPushButton *side, *style, *full;
 
         QStackedWidget *views;
         QAction *sideView;
diff --git a/src/application.qrc b/src/application.qrc
index bf33a7067..67030c362 100644
--- a/src/application.qrc
+++ b/src/application.qrc
@@ -1,6 +1,6 @@
 <!DOCTYPE RCC><RCC version="1.0">
  <qresource>
-    <file>images/toolbar/main/fullscreen.png</file>
+    <file>images/toolbar/main/togglefull.png</file>
     <file>images/toolbar/main/hideside.png</file>
     <file>images/toolbar/main/normal.png</file>
     <file>images/toolbar/main/showside.png</file>
diff --git a/src/images/toolbar/main/togglefull.png b/src/images/toolbar/main/togglefull.png
new file mode 100644
index 000000000..c0adb0571
Binary files /dev/null and b/src/images/toolbar/main/togglefull.png differ