diff --git a/AUTHORS.md b/AUTHORS.md
index eaf4bde4ce..67be756f33 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -217,6 +217,7 @@ Programmers
     tlmullis
     tri4ng1e
     Thoronador
+    Tom Lowe (Vulpen)
     Tom Mason (wheybags)
     Torben Leif Carrington (TorbenC)
     unelsson
diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index af1fa255db..d09704851a 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -118,6 +118,10 @@ bool Launcher::AdvancedPage::loadSettings()
         loadSettingBool(bumpMapLocalLightingCheckBox, "apply lighting to environment maps", "Shaders");
         loadSettingBool(radialFogCheckBox, "radial fog", "Shaders");
         loadSettingBool(softParticlesCheckBox, "soft particles", "Shaders");
+        loadSettingBool(antialiasAlphaTestCheckBox, "antialias alpha test", "Shaders");
+        if (Settings::Manager::getInt("antialiasing", "Video") == 0) {
+            antialiasAlphaTestCheckBox->setCheckState(Qt::Unchecked);
+        }
         loadSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
         connect(animSourcesCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotAnimSourcesToggled(bool)));
         loadSettingBool(animSourcesCheckBox, "use additional anim sources", "Game");
@@ -268,6 +272,7 @@ void Launcher::AdvancedPage::saveSettings()
         saveSettingBool(bumpMapLocalLightingCheckBox, "apply lighting to environment maps", "Shaders");
         saveSettingBool(radialFogCheckBox, "radial fog", "Shaders");
         saveSettingBool(softParticlesCheckBox, "soft particles", "Shaders");
+        saveSettingBool(antialiasAlphaTestCheckBox, "antialias alpha test", "Shaders");
         saveSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game");
         saveSettingBool(animSourcesCheckBox, "use additional anim sources", "Game");
         saveSettingBool(weaponSheathingCheckBox, "weapon sheathing", "Game");
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 8359834ddb..e6d857a943 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -47,7 +47,6 @@ Launcher::GraphicsPage::GraphicsPage(QWidget *parent)
     connect(screenComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(screenChanged(int)));
     connect(framerateLimitCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotFramerateLimitToggled(bool)));
     connect(shadowDistanceCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotShadowDistLimitToggled(bool)));
-
 }
 
 bool Launcher::GraphicsPage::setupSDL()
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 75d4464b68..d335d7cded 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -146,7 +146,6 @@ void Launcher::MainDialog::createPages()
     connect(mDataFilesPage, SIGNAL(signalProfileChanged(int)), mPlayPage, SLOT(setProfilesIndex(int)));
     // Using Qt::QueuedConnection because signal is emitted in a subthread and slot is in the main thread
     connect(mDataFilesPage, SIGNAL(signalLoadedCellsChanged(QStringList)), mAdvancedPage, SLOT(slotLoadedCellsChanged(QStringList)), Qt::QueuedConnection);
-
 }
 
 Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 0e80f02700..3a2e7c49fc 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -14,7 +14,7 @@
    <item>
     <widget class="QTabWidget" name="AdvancedTabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="GameMechanics">
       <attribute name="title">
@@ -281,8 +281,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>645</width>
-            <height>413</height>
+            <width>665</width>
+            <height>525</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout">
@@ -454,6 +454,16 @@
                 </property>
                </widget>
               </item>
+              <item row="3" column="1">
+               <widget class="QCheckBox" name="antialiasAlphaTestCheckBox">
+                <property name="toolTip">
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Allows MSAA to work with alpha-tested meshes, producing better-looking edges without pixelation. Can negatively impact performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                </property>
+                <property name="text">
+                 <string>Use anti-alias alpha testing</string>
+                </property>
+               </widget>
+              </item>
              </layout>
             </widget>
            </item>