diff --git a/gui/src/mainwindow.cpp b/gui/src/mainwindow.cpp
index c2d162a..d894d0e 100644
--- a/gui/src/mainwindow.cpp
+++ b/gui/src/mainwindow.cpp
@@ -79,7 +79,7 @@ class IconEngine : public QIconEngine
 					color_group = QPalette::ColorGroup::Normal;
 					break;
 			}
-			painter->fillRect(rect, qApp->palette().brush(color_group, QPalette::ColorRole::ButtonText));
+			painter->fillRect(rect, qApp->palette().brush(color_group, QPalette::ColorRole::Text));
 		}
 };
 
@@ -87,6 +87,8 @@ MainWindow::MainWindow(Settings *settings, QWidget *parent)
 	: QMainWindow(parent),
 	settings(settings)
 {
+	setWindowTitle(qApp->applicationName());
+
 	auto main_widget = new QWidget(this);
 	auto layout = new QVBoxLayout();
 	main_widget->setLayout(layout);
@@ -100,6 +102,7 @@ MainWindow::MainWindow(Settings *settings, QWidget *parent)
 	auto tool_bar = new QToolBar(this);
 	tool_bar->setMovable(false);
 	addToolBar(tool_bar);
+	setUnifiedTitleAndToolBarOnMac(true);
 
 	discover_action = new QAction(tr("Automatically Search for Consoles"), this);
 	discover_action->setIcon(LoadIcon(":/icons/discover-24px.svg"));
diff --git a/gui/src/serveritemwidget.cpp b/gui/src/serveritemwidget.cpp
index c789fca..1771478 100644
--- a/gui/src/serveritemwidget.cpp
+++ b/gui/src/serveritemwidget.cpp
@@ -27,7 +27,7 @@
 
 ServerItemWidget::ServerItemWidget(QWidget *parent) : QFrame(parent)
 {
-	setFrameStyle(QFrame::Panel | QFrame::Raised);
+	setFrameStyle(QFrame::Panel);
 
 	auto layout = new QVBoxLayout(this);
 	this->setLayout(layout);
diff --git a/gui/src/sessionlog.cpp b/gui/src/sessionlog.cpp
index 1f6c5f7..b9ddadc 100644
--- a/gui/src/sessionlog.cpp
+++ b/gui/src/sessionlog.cpp
@@ -23,6 +23,8 @@
 #include <QRegularExpression>
 #include <QDateTime>
 #include <QFile>
+#include <QPair>
+#include <QVector>
 
 
 static void LogCb(ChiakiLogLevel level, const char *msg, void *user);