diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt
index 27eda16cb4e0..a64912b56aba 100644
--- a/Source/Core/DolphinQt/CMakeLists.txt
+++ b/Source/Core/DolphinQt/CMakeLists.txt
@@ -1,10 +1,14 @@
-find_package(Qt5 5.9 REQUIRED COMPONENTS Gui Widgets)
+find_package(Qt5 5.9 REQUIRED COMPONENTS Gui Widgets Quick QuickWidgets)
 
 set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_FEATURES "")
 message(STATUS "Found Qt version ${Qt5Core_VERSION}")
 
 set(CMAKE_AUTOMOC ON)
 
+find_package(Qt5QuickCompiler)
+qtquick_compiler_add_resources(RCC_SOURCES Resources/Resources.qrc)
+set_property(SOURCE ${RCC_SOURCES} PROPERTY SKIP_AUTOMOC ON)
+
 add_executable(dolphin-emu
   AboutDialog.cpp
   CheatsManager.cpp
@@ -69,6 +73,7 @@ add_executable(dolphin-emu
   Config/Mapping/MappingNumeric.cpp
   Config/Mapping/MappingWidget.cpp
   Config/Mapping/MappingWindow.cpp
+  Config/Mapping/Visual/GCMappingWidget.cpp
   Config/Mapping/WiimoteEmuExtension.cpp
   Config/Mapping/WiimoteEmuGeneral.cpp
   Config/Mapping/WiimoteEmuMotionControl.cpp
@@ -128,6 +133,7 @@ add_executable(dolphin-emu
   TAS/StickWidget.cpp
   TAS/IRWidget.cpp
   Updater.cpp
+  ${RCC_SOURCES}
 )
 
 target_compile_definitions(dolphin-emu
@@ -141,12 +147,16 @@ target_include_directories(dolphin-emu
 PRIVATE
   ${CMAKE_CURRENT_BINARY_DIR}
   ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
+  ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
+  ${Qt5QuickWidgets_PRIVATE_INCLUDE_DIRS}
 )
 
 target_link_libraries(dolphin-emu
 PRIVATE
   core
   Qt5::Widgets
+  Qt5::Quick
+  Qt5::QuickWidgets
   uicommon
   imgui
 )
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
index bc582e1bd93f..35cd5b5c6ba3 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
@@ -83,6 +83,9 @@ void MappingButton::Detect()
 
   QString expression;
 
+  const auto old_text = text();
+  setText(QStringLiteral("..."));
+
   if (m_parent->GetParent()->IsMappingAllDevices())
   {
     expression = MappingCommon::DetectExpression(this, g_controller_interface,
@@ -96,6 +99,8 @@ void MappingButton::Detect()
                                                  default_device_qualifier);
   }
 
+  setText(old_text);
+
   if (expression.isEmpty())
     return;
 
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
index 01aa95d3a051..2b4932cc3713 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
@@ -13,6 +13,7 @@
 #include <QTimer>
 
 #include "DolphinQt/QtUtils/BlockUserInputFilter.h"
+#include "DolphinQt/QtUtils/QueueOnObject.h"
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerInterface/Device.h"
 
@@ -49,18 +50,16 @@ QString GetExpressionForControl(const QString& control_name,
   return expr;
 }
 
-QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& device_container,
+QString DetectExpression(QWidget* widget, ciface::Core::DeviceContainer& device_container,
                          const std::vector<std::string>& device_strings,
                          const ciface::Core::DeviceQualifier& default_device, Quote quote)
 {
-  const auto filter = new BlockUserInputFilter(button);
-
-  button->installEventFilter(filter);
-  button->grabKeyboard();
-  button->grabMouse();
-
-  const auto old_text = button->text();
-  button->setText(QStringLiteral("..."));
+  const auto filter = new BlockUserInputFilter(widget);
+  QueueOnObject(widget, [widget, filter] {
+    widget->installEventFilter(filter);
+    widget->grabKeyboard();
+    widget->grabMouse();
+  });
 
   // The button text won't be updated if we don't process events here
   QApplication::processEvents();
@@ -73,19 +72,17 @@ QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& dev
 
   std::tie(device, input) = device_container.DetectInput(INPUT_DETECT_TIME, device_strings);
 
-  const auto timer = new QTimer(button);
+  const auto timer = new QTimer(widget);
 
-  button->connect(timer, &QTimer::timeout, [button, filter] {
-    button->releaseMouse();
-    button->releaseKeyboard();
-    button->removeEventFilter(filter);
+  widget->connect(timer, &QTimer::timeout, [widget, filter] {
+    widget->releaseMouse();
+    widget->releaseKeyboard();
+    widget->removeEventFilter(filter);
   });
 
   // Prevent mappings of "space", "return", or mouse clicks from re-activating detection.
   timer->start(500);
 
-  button->setText(old_text);
-
   if (!input)
     return {};
 
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.h b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.h
index 5e213b32215b..cc403965187f 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingCommon.h
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingCommon.h
@@ -7,9 +7,12 @@
 #include <string>
 #include <vector>
 
-class QString;
 class OutputReference;
 class QPushButton;
+class QString;
+class QWidget;
+
+constexpr int INDICATOR_UPDATE_FREQ = 30;
 
 namespace ciface
 {
@@ -33,7 +36,7 @@ QString GetExpressionForControl(const QString& control_name,
                                 const ciface::Core::DeviceQualifier& default_device,
                                 Quote quote = Quote::On);
 
-QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& device_container,
+QString DetectExpression(QWidget* widget, ciface::Core::DeviceContainer& device_container,
                          const std::vector<std::string>& device_strings,
                          const ciface::Core::DeviceQualifier& default_device,
                          Quote quote = Quote::On);
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
index 72abaa2fd123..9e5ff42a5562 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
@@ -23,7 +23,7 @@
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 #include "InputCommon/ControllerInterface/Device.h"
 
-#include "DolphinQt/Config/Mapping/MappingWidget.h"
+#include "DolphinQt/Config/Mapping/MappingCommon.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/Settings.h"
 
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
index d99b198ea29a..9eee3602ea37 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
@@ -11,6 +11,7 @@
 
 #include "DolphinQt/Config/Mapping/IOWindow.h"
 #include "DolphinQt/Config/Mapping/MappingButton.h"
+#include "DolphinQt/Config/Mapping/MappingCommon.h"
 #include "DolphinQt/Config/Mapping/MappingIndicator.h"
 #include "DolphinQt/Config/Mapping/MappingNumeric.h"
 #include "DolphinQt/Config/Mapping/MappingWindow.h"
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h
index d611aa974926..48d21c174292 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.h
@@ -33,8 +33,6 @@ class Device;
 }
 }  // namespace ciface
 
-constexpr int INDICATOR_UPDATE_FREQ = 30;
-
 class MappingWidget : public QWidget
 {
   Q_OBJECT
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
index 0d280d5b7554..b016becc658c 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
@@ -32,6 +32,7 @@
 #include "DolphinQt/Config/Mapping/HotkeyStatesOther.h"
 #include "DolphinQt/Config/Mapping/HotkeyTAS.h"
 #include "DolphinQt/Config/Mapping/HotkeyWii.h"
+#include "DolphinQt/Config/Mapping/Visual/GCMappingWidget.h"
 #include "DolphinQt/Config/Mapping/WiimoteEmuExtension.h"
 #include "DolphinQt/Config/Mapping/WiimoteEmuGeneral.h"
 #include "DolphinQt/Config/Mapping/WiimoteEmuMotionControl.h"
@@ -309,10 +310,14 @@ void MappingWindow::SetMappingType(MappingWindow::Type type)
   case Type::MAPPING_GC_STEERINGWHEEL:
   case Type::MAPPING_GC_DANCEMAT:
   case Type::MAPPING_GCPAD:
+  {
     widget = new GCPadEmu(this);
+    auto* visual = new VisualGCMappingWidget(this, GetPort());
     setWindowTitle(tr("GameCube Controller at Port %1").arg(GetPort() + 1));
     AddWidget(tr("GameCube Controller"), widget);
+    AddWidget(tr("Visual Configuration"), visual);
     break;
+  }
   case Type::MAPPING_GC_MICROPHONE:
     widget = new GCMicrophone(this);
     setWindowTitle(tr("GameCube Microphone Slot %1")
diff --git a/Source/Core/DolphinQt/Config/Mapping/Visual/GCMappingWidget.cpp b/Source/Core/DolphinQt/Config/Mapping/Visual/GCMappingWidget.cpp
new file mode 100644
index 000000000000..8fd81ebe4db4
--- /dev/null
+++ b/Source/Core/DolphinQt/Config/Mapping/Visual/GCMappingWidget.cpp
@@ -0,0 +1,278 @@
+// Copyright 2019 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "DolphinQt/Config/Mapping/Visual/GCMappingWidget.h"
+
+#include <QApplication>
+#include <QMetaObject>
+#include <QQuickItem>
+#include <QQuickWidget>
+#include <QThread>
+#include <QTimer>
+#include <QVBoxLayout>
+
+#include "Common/FileUtil.h"
+
+#include "Core/HW/GCPad.h"
+#include "Core/HW/GCPadEmu.h"
+
+#include "DolphinQt/Config/Mapping/MappingCommon.h"
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/Settings.h"
+
+#include "InputCommon/ControllerEmu/Control/Control.h"
+#include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/StickGate.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+#include "InputCommon/InputConfig.h"
+
+#include <iostream>
+
+VisualGCMappingWidget::VisualGCMappingWidget(MappingWindow* parent, int port)
+    : QWidget(parent), m_parent(parent), m_port(port)
+{
+  CreateWidgets();
+
+  m_timer = new QTimer(this);
+  connect(m_timer, &QTimer::timeout, this, &VisualGCMappingWidget::RefreshControls);
+  m_timer->start(1000 / INDICATOR_UPDATE_FREQ);
+}
+
+void VisualGCMappingWidget::CreateWidgets()
+{
+  auto* layout = new QVBoxLayout;
+
+  m_widget = new QQuickWidget;
+  m_widget->setSource(QUrl(QStringLiteral("qrc:/GCPad/GCPad.qml")));
+  m_widget->setResizeMode(QQuickWidget::SizeRootObjectToView);
+  m_widget->setClearColor(Qt::transparent);
+  m_widget->setAttribute(Qt::WA_TranslucentBackground);
+  m_widget->setAttribute(Qt::WA_AlwaysStackOnTop);
+
+  layout->addWidget(m_widget);
+
+  // We need to use the old signal / slot syntax here in order to access the QML signal
+  connect(GetQMLController(), SIGNAL(detectInput(QString)), this, SLOT(DetectInput(QString)),
+          Qt::QueuedConnection);
+
+  setLayout(layout);
+}
+
+void VisualGCMappingWidget::DetectInput(QString name)
+{
+  std::cout << "NAME: " << name.toStdString() << std::endl;
+
+  auto* buttons = Pad::GetGroup(m_port, PadGroup::Buttons);
+
+  ControllerEmu::Control* map_control = nullptr;
+
+  for (auto& control : buttons->controls)
+  {
+    if (control->name == name.toStdString())
+    {
+      map_control = control.get();
+      break;
+    }
+  }
+
+  auto* dpad = Pad::GetGroup(m_port, PadGroup::DPad);
+  for (auto& control : dpad->controls)
+  {
+    if ("DPad_" + control->name == name.toStdString())
+    {
+      map_control = control.get();
+      break;
+    }
+  }
+
+  auto* triggers = Pad::GetGroup(m_port, PadGroup::Triggers);
+  for (auto& control : triggers->controls)
+  {
+    if ("Trigger_" + control->name == name.toStdString())
+    {
+      map_control = control.get();
+      break;
+    }
+  }
+
+  auto* main_stick = Pad::GetGroup(m_port, PadGroup::MainStick);
+  for (auto& control : main_stick->controls)
+  {
+    if ("Stick_Main_" + control->name == name.toStdString())
+    {
+      map_control = control.get();
+      break;
+    }
+  }
+
+  auto* c_stick = Pad::GetGroup(m_port, PadGroup::CStick);
+  for (auto& control : c_stick->controls)
+  {
+    if ("Stick_C_" + control->name == name.toStdString())
+    {
+      map_control = control.get();
+      break;
+    }
+  }
+
+  if (map_control == nullptr)
+    return;
+
+  auto* thread = QThread::create([this, map_control, name] {
+    const auto default_device_qualifier = m_parent->GetController()->GetDefaultDevice();
+
+    QString expression;
+
+    if (m_parent->IsMappingAllDevices())
+    {
+      expression = MappingCommon::DetectExpression(this, g_controller_interface,
+                                                   g_controller_interface.GetAllDeviceStrings(),
+                                                   default_device_qualifier);
+    }
+    else
+    {
+      expression = MappingCommon::DetectExpression(this, g_controller_interface,
+                                                   {default_device_qualifier.ToString()},
+                                                   default_device_qualifier);
+    }
+
+    QMetaObject::invokeMethod(GetQMLController(), "detectedInput", Qt::QueuedConnection,
+                              Q_ARG(QVariant, name));
+
+    if (expression.isEmpty())
+      return;
+
+    map_control->control_ref->SetExpression(expression.toStdString());
+    m_parent->GetController()->UpdateReferences(g_controller_interface);
+
+    Pad::GetConfig()->SaveConfig();
+  });
+
+  thread->setParent(this);
+  thread->start();
+}
+
+QObject* VisualGCMappingWidget::GetQMLController()
+{
+  return m_widget->rootObject()->findChild<QObject*>(QStringLiteral("controller"));
+}
+
+void VisualGCMappingWidget::RefreshControls()
+{
+  if (!isActiveWindow())
+    return;
+
+  auto* buttons = Pad::GetGroup(m_port, PadGroup::Buttons);
+
+  QObject* object = m_widget->rootObject()->findChild<QObject*>(QStringLiteral("controller"));
+
+  const auto lock = m_parent->GetController()->GetStateLock();
+  Settings::Instance().SetControllerStateNeeded(true);
+
+  for (auto& control : buttons->controls)
+  {
+    auto state = control->control_ref->State();
+    const bool activated = state > ControllerEmu::Buttons::ACTIVATION_THRESHOLD;
+    const std::string expression = control->control_ref->GetExpression();
+
+    QMetaObject::invokeMethod(object, "updateButton", Qt::QueuedConnection,
+                              Q_ARG(QVariant, QString::fromStdString(control->name)),
+                              Q_ARG(QVariant, activated),
+                              Q_ARG(QVariant, QString::fromStdString(expression)));
+  }
+
+  auto* dpad = Pad::GetGroup(m_port, PadGroup::DPad);
+
+  for (auto& control : dpad->controls)
+  {
+    auto state = control->control_ref->State();
+    const bool activated = state > ControllerEmu::Buttons::ACTIVATION_THRESHOLD;
+    const std::string expression = control->control_ref->GetExpression();
+
+    QMetaObject::invokeMethod(object, "updateButton", Qt::QueuedConnection,
+                              Q_ARG(QVariant, QString::fromStdString("DPad_" + control->name)),
+                              Q_ARG(QVariant, activated),
+                              Q_ARG(QVariant, QString::fromStdString(expression)));
+  }
+
+  auto* triggers = Pad::GetGroup(m_port, PadGroup::Triggers);
+
+  for (size_t i = 2; i < 4; i++)
+  {
+    auto& control = triggers->controls[i];
+
+    auto state = control->control_ref->State();
+
+    const auto name = control->name.substr(0, 1);
+
+    QMetaObject::invokeMethod(object, "updateTrigger", Qt::QueuedConnection,
+                              Q_ARG(QVariant, QString::fromStdString("Trigger_" + name)),
+                              Q_ARG(QVariant, state), Q_ARG(QVariant, QVariant()));
+  }
+
+  static bool once = true;
+
+  for (size_t i = 0; i < 2; i++)
+  {
+    auto& control = triggers->controls[i];
+
+    const bool activated =
+        control->control_ref->State() > ControllerEmu::Buttons::ACTIVATION_THRESHOLD;
+
+    if (!activated && !once)
+      continue;
+
+    const std::string expression = control->control_ref->GetExpression();
+
+    QMetaObject::invokeMethod(object, "updateTrigger", Qt::QueuedConnection,
+                              Q_ARG(QVariant, QString::fromStdString("Trigger_" + control->name)),
+                              Q_ARG(QVariant, activated),
+                              Q_ARG(QVariant, QString::fromStdString(expression)));
+  }
+
+  once = false;
+
+  auto* main_stick =
+      static_cast<ControllerEmu::ReshapableInput*>(Pad::GetGroup(m_port, PadGroup::MainStick));
+
+  auto main_state = main_stick->GetReshapableState(true);
+
+  QMetaObject::invokeMethod(object, "updateStick",
+                            Q_ARG(QVariant, QString::fromStdString("Stick_Main")),
+                            Q_ARG(QVariant, main_state.x), Q_ARG(QVariant, main_state.y));
+
+  auto* main_stick_group = Pad::GetGroup(m_port, PadGroup::MainStick);
+
+  for (auto& control : main_stick_group->controls)
+  {
+    const std::string expression = control->control_ref->GetExpression();
+    QMetaObject::invokeMethod(object, "updateStickExpression",
+                              Q_ARG(QVariant, QString::fromStdString("Stick_Main")),
+                              Q_ARG(QVariant, QString::fromStdString(control->name)),
+                              Q_ARG(QVariant, QString::fromStdString(expression)));
+  }
+
+  auto* c_stick =
+      static_cast<ControllerEmu::ReshapableInput*>(Pad::GetGroup(m_port, PadGroup::CStick));
+
+  auto c_state = c_stick->GetReshapableState(true);
+
+  QMetaObject::invokeMethod(object, "updateStick",
+                            Q_ARG(QVariant, QString::fromStdString("Stick_C")),
+                            Q_ARG(QVariant, c_state.x), Q_ARG(QVariant, c_state.y));
+
+  auto* c_stick_group = Pad::GetGroup(m_port, PadGroup::CStick);
+
+  for (auto& control : c_stick_group->controls)
+  {
+    const std::string expression = control->control_ref->GetExpression();
+    QMetaObject::invokeMethod(object, "updateStickExpression",
+                              Q_ARG(QVariant, QString::fromStdString("Stick_C")),
+                              Q_ARG(QVariant, QString::fromStdString(control->name)),
+                              Q_ARG(QVariant, QString::fromStdString(expression)));
+  }
+
+  Settings::Instance().SetControllerStateNeeded(false);
+}
diff --git a/Source/Core/DolphinQt/Config/Mapping/Visual/GCMappingWidget.h b/Source/Core/DolphinQt/Config/Mapping/Visual/GCMappingWidget.h
new file mode 100644
index 000000000000..9bfcff0961b3
--- /dev/null
+++ b/Source/Core/DolphinQt/Config/Mapping/Visual/GCMappingWidget.h
@@ -0,0 +1,37 @@
+// Copyright 2019 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <QString>
+#include <QWidget>
+
+class QTimer;
+class QQuickWidget;
+
+class MappingWindow;
+
+class VisualGCMappingWidget : public QWidget
+{
+  Q_OBJECT
+public:
+  explicit VisualGCMappingWidget(MappingWindow* parent, int port);
+
+private slots:
+  void DetectInput(QString name);
+
+private:
+  void CreateWidgets();
+  void ConnectWidgets();
+  void RefreshControls();
+
+  QObject* GetQMLController();
+
+  QTimer* m_timer;
+
+  QQuickWidget* m_widget;
+
+  MappingWindow* m_parent;
+  int m_port;
+};
diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj
index f5f1742c6727..65c9b55fc2fe 100644
--- a/Source/Core/DolphinQt/DolphinQt.vcxproj
+++ b/Source/Core/DolphinQt/DolphinQt.vcxproj
@@ -44,7 +44,7 @@
       <AdditionalDependencies>avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;Shlwapi.lib;discord-rpc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;$(ProjectDir)GameList;$(ProjectDir)Debugger;$(ProjectDir)Settings;$(ProjectDir)Config;$(ProjectDir)Config\Mapping;$(ProjectDir)Config\Graphics;$(ProjectDir)NetPlay;$(ProjectDir)QtUtils;$(ProjectDir)TAS;$(ProjectDir)FIFO;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;$(ProjectDir)GameList;$(ProjectDir)Debugger;$(ProjectDir)Settings;$(ProjectDir)Config;$(ProjectDir)Config\Mapping;$(ProjectDir)Config\Mapping\Visual;$(ProjectDir)Config\Graphics;$(ProjectDir)NetPlay;$(ProjectDir)QtUtils;$(ProjectDir)TAS;$(ProjectDir)FIFO;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Manifest>
       <AdditionalManifestFiles>DolphinQt.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -86,6 +86,7 @@
     <QtMoc Include="Config\Mapping\MappingNumeric.h" />
     <QtMoc Include="Config\Mapping\MappingWidget.h" />
     <QtMoc Include="Config\Mapping\MappingWindow.h" />
+    <QtMoc Include="Config\Mapping\Visual\GCMappingWidget.h" />
     <QtMoc Include="Config\Mapping\WiimoteEmuExtension.h" />
     <QtMoc Include="Config\Mapping\WiimoteEmuGeneral.h" />
     <QtMoc Include="Config\Mapping\WiimoteEmuMotionControl.h" />
@@ -168,8 +169,12 @@
     <QtMoc Include="ToolBar.h" />
     <QtMoc Include="Updater.h" />
   </ItemGroup>
+  <ItemGroup>
+    <QtResource Include="Resources\Resources.qrc" />
+  </ItemGroup>
   <!--TODO figure out how to get QtMoc to add outputs to ClCompile's inputs...-->
   <ItemGroup>
+    <ClCompile Include="$(QtToolOutDir)res_Resources.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)ARCodeWidget.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)AboutDialog.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)AdvancedPane.cpp" />
@@ -195,6 +200,7 @@
     <ClCompile Include="$(QtMocOutPrefix)FIFOPlayerWindow.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)FilesystemWidget.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)GCKeyboardEmu.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)GCMappingWidget.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)GCMemcardManager.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)GCMicrophone.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)GCPadEmu.cpp" />
@@ -324,6 +330,7 @@
     <ClCompile Include="Config\Mapping\MappingNumeric.cpp" />
     <ClCompile Include="Config\Mapping\MappingWidget.cpp" />
     <ClCompile Include="Config\Mapping\MappingWindow.cpp" />
+    <ClCompile Include="Config\Mapping\Visual\GCMappingWidget.cpp" />
     <ClCompile Include="Config\Mapping\WiimoteEmuExtension.cpp" />
     <ClCompile Include="Config\Mapping\WiimoteEmuGeneral.cpp" />
     <ClCompile Include="Config\Mapping\WiimoteEmuMotionControl.cpp" />
diff --git a/Source/Core/DolphinQt/Main.cpp b/Source/Core/DolphinQt/Main.cpp
index 038fed9c8944..8e0c11990991 100644
--- a/Source/Core/DolphinQt/Main.cpp
+++ b/Source/Core/DolphinQt/Main.cpp
@@ -5,6 +5,7 @@
 #ifdef _WIN32
 #include <Windows.h>
 #include <cstdio>
+#include <QDir>
 
 #include "Common/StringUtil.h"
 #endif
@@ -88,6 +89,8 @@ int main(int argc, char* argv[])
     freopen("CONOUT$", "w", stdout);
     freopen("CONOUT$", "w", stderr);
   }
+
+  Q_INIT_RESOURCE(Resources);
 #endif
 
   QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
diff --git a/Source/Core/DolphinQt/Resources/GCPad/A.svg b/Source/Core/DolphinQt/Resources/GCPad/A.svg
new file mode 100644
index 000000000000..b49888e488c5
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/A.svg
@@ -0,0 +1,81 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="80.569901"
+   height="80.569901"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="a_button.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4538721"
+     inkscape:cx="-223.60673"
+     inkscape:cy="-49.121295"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-552.65624,-390.11645)">
+    <circle
+       transform="matrix(-0.3231504,0,0,0.3231504,644.64525,289.28941)"
+       id="path3203"
+       style="opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:6.18906879;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       cx="160"
+       cy="436.6759"
+       r="121.56863" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28px;line-height:-200%;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:0.64088398;stroke:none;stroke-width:3pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 592.93433,420.276 -2.91211,10.44531 h 5.82422 L 592.93433,420.276 m -1.66797,-2.43359 h 3.34961 l 6.24804,20.41211 h -2.85742 l -1.5039,-5.31836 h -7.1504 l -1.47656,5.31836 h -2.85742 l 6.24805,-20.41211"
+       id="text3303"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/B.svg b/Source/Core/DolphinQt/Resources/GCPad/B.svg
new file mode 100644
index 000000000000..4b7e17df86d3
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/B.svg
@@ -0,0 +1,81 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="49.597366"
+   height="49.597366"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="B.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.2243426"
+     inkscape:cx="20.517485"
+     inkscape:cy="39.6023"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0.2"
+     fit-margin-left="0.2"
+     fit-margin-right="0.2"
+     fit-margin-bottom="0.2" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-494.41701,-445.60274)">
+    <circle
+       style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:10.3030014;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3205"
+       transform="matrix(-0.1941182,0,0,0.1941182,550.2746,385.63468)"
+       cx="160"
+       cy="436.6759"
+       r="121.56863" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28px;line-height:-200%;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:0.64088398;stroke:none;stroke-width:3pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 515.53113,470.85944 v 7.47851 h 3.26758 c 1.60415,0 2.74803,-0.27799 3.43164,-0.83398 0.68358,-0.5651 1.02537,-1.49023 1.02539,-2.77539 -2e-5,-1.33073 -0.36004,-2.30598 -1.08008,-2.92578 -0.72006,-0.6289 -1.84571,-0.94335 -3.37695,-0.94336 h -3.26758 m 0,-8.39454 v 6.15235 h 3.21289 c 1.33072,10e-6 2.29231,-0.2552 2.88476,-0.76563 0.60155,-0.5104 0.90234,-1.33527 0.90235,-2.47461 -10e-6,-1.02993 -0.29624,-1.77277 -0.88867,-2.22851 -0.58335,-0.45571 -1.54949,-0.68358 -2.89844,-0.6836 h -3.21289 m -2.77539,-2.26953 h 6.04297 c 2.08723,2e-5 3.69595,0.4512 4.82617,1.35352 1.13019,0.90236 1.6953,2.1784 1.69531,3.82812 -10e-6,1.24872 -0.3008,2.23309 -0.90234,2.95313 -0.59246,0.72006 -1.48569,1.17123 -2.67969,1.35351 1.33983,0.20054 2.38801,0.77475 3.14453,1.72266 0.76561,0.93881 1.14842,2.13738 1.14844,3.5957 -2e-5,1.85027 -0.60614,3.24936 -1.81836,4.19727 -1.21225,0.9388 -3.01694,1.4082 -5.41406,1.4082 h -6.04297 v -20.41211"
+       id="text3307"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/Button.qml b/Source/Core/DolphinQt/Resources/GCPad/Button.qml
new file mode 100644
index 000000000000..726e95884f33
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/Button.qml
@@ -0,0 +1,45 @@
+import QtQuick 2.0
+import QtGraphicalEffects 1.0
+import QtQuick.Controls 2.0
+
+Image {
+    property string name
+    property int box_x : image.width / 2
+    property int box_y : image.height - 10
+
+    signal detectInput(string name)
+    
+    id: image
+    source: name+".svg"
+
+    objectName: "button"
+    
+    ColorOverlay
+    {
+        id: hover_overlay
+        anchors.fill: image
+        source: image
+        color: "transparent"
+    }
+    
+    function buttonPressed(pressed, expression)
+    {
+        input_box.setValue(expression)
+        input_box.setPressed(pressed)
+        hover_overlay.color = pressed ? Qt.rgba(1, 1, 0, 0.6) : "transparent";
+    }
+
+    function detectedInput()
+    {
+        input_box.detectedInput();
+    }
+    
+    InputBox
+    {
+        onDetectInput: image.detectInput(image.name)
+        id: input_box
+        x: box_x - width/2
+        y: box_y + 10
+        z: 1
+    }
+}
diff --git a/Source/Core/DolphinQt/Resources/GCPad/DPad_Down.svg b/Source/Core/DolphinQt/Resources/GCPad/DPad_Down.svg
new file mode 100644
index 000000000000..24521d62fbf5
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/DPad_Down.svg
@@ -0,0 +1,74 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20.59572"
+   height="18.176769"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="dpad_down.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4538721"
+     inkscape:cx="89.82792"
+     inkscape:cy="106.65604"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-256.76095,-608.28692)">
+    <path
+       id="path2452"
+       d="m 266.98793,626.46179 c -0.43558,-0.0224 -0.8303,-0.26349 -1.0491,-0.6408 l -9.00521,-15.60033 c -0.2303,-0.39898 -0.23022,-0.89054 2.3e-4,-1.28943 0.23045,-0.39891 0.65624,-0.64453 1.11692,-0.64431 h 18.01608 c 0.46069,-2.2e-4 0.88648,0.2454 1.11692,0.64431 0.23046,0.39889 0.23054,0.89045 2.3e-4,1.28943 l -9.01088,15.60033 c -0.24314,0.41947 -0.70107,0.66705 -1.18519,0.6408 z"
+       style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/DPad_Left.svg b/Source/Core/DolphinQt/Resources/GCPad/DPad_Left.svg
new file mode 100644
index 000000000000..73819a0b1bcb
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/DPad_Left.svg
@@ -0,0 +1,254 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="18.176769"
+   height="20.59572"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="dpad_left.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3287">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop3289" />
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:0;"
+         offset="1"
+         id="stop3291" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2390"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <clipPath
+       id="clp43">
+      <path
+         id="path17725"
+         d="M 564.1,1054.8 H 660 v 26.2 h -95.9 z"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp44">
+      <path
+         id="path17731"
+         d="m 570.68,1072.3 -0.01,-9.3 8.11,-4.7 v 2.9 l -5.61,3.2 v 6.4 l -2.49,1.5"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp38">
+      <path
+         id="path17691"
+         d="M 564.1,1054.8 H 660 v 26.2 h -95.9 z"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp39">
+      <path
+         id="path17697"
+         d="m 578.75,1067.6 -3.77,2.2 3.77,2.2 3.54,-2.1 4.28,2.5 0.27,-0.1 -8.09,-4.7"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp33">
+      <path
+         id="path17657"
+         d="M 564.1,1054.8 H 660 v 26.2 h -95.9 z"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp34">
+      <path
+         id="path17663"
+         d="m 578.75,1067.6 8.09,4.7 v -9.3 l -8.06,-4.7 v 2.9 l 5.6,3.2 v 3.4 l -1.83,-1.1 v -1.3 l -3.8,-2.1 v 4.3"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp28">
+      <path
+         id="path17623"
+         d="M 564.1,1054.8 H 660 v 26.2 h -95.9 z"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp29">
+      <path
+         id="path17629"
+         d="m 578.75,1063.3 v 4.3 l -3.77,2.2 v -4.4 l 3.77,-2.1"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp23">
+      <path
+         id="path17589"
+         d="M 564.1,1054.8 H 660 v 26.2 h -95.9 z"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp24">
+      <path
+         id="path17595"
+         d="m 584.38,1064.4 v 3.4 l -0.28,-0.2 v -3.1 l 0.28,-0.1"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp18">
+      <path
+         id="path17555"
+         d="M 564.1,1054.8 H 660 v 26.2 h -95.9 z"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp19">
+      <path
+         id="path17561"
+         d="m 573.17,1064.4 5.61,-3.2 5.6,3.2 -0.28,0.2 -5.35,-3.1 -5.3,3.1 -0.28,-0.2"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp13">
+      <path
+         id="path17521"
+         d="M 564.1,1054.8 H 660 v 26.2 h -95.9 z"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp14">
+      <path
+         id="path17527"
+         d="m 584.85,1073.4 -6.11,3.6 -8.06,-4.7 2.49,-1.5 5.59,3.3 3.63,-2.1 2.46,1.4"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp8">
+      <path
+         id="path17485"
+         d="M 564.1,1054.8 H 660 v 26.2 h -95.9 z"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clp9">
+      <path
+         id="path17491"
+         d="m 582.39,1071.7 -3.63,2.1 v 0.3 l 3.63,-2.1 v -0.3"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <inkscape:perspective
+       id="perspective3517"
+       inkscape:persp3d-origin="389.49554 : 70.713852 : 1"
+       inkscape:vp_z="778.99109 : 106.07078 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 106.07078 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <clipPath
+       id="clipPath107145">
+      <path
+         d="M 564.1,1054.8 H 660 v 26.2 h -95.9 z"
+         id="path107147"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clipPath107115">
+      <path
+         d="M 564.1,1054.8 H 660 v 26.2 h -95.9 z"
+         id="path107117"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clipPath107100">
+      <path
+         d="M 564.1,1054.8 H 660 v 26.2 h -95.9 z"
+         id="path107102"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clipPath107085">
+      <path
+         d="M 564.1,1054.8 H 660 v 26.2 h -95.9 z"
+         id="path107087"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <clipPath
+       id="clipPath107054">
+      <path
+         d="M 564.1,1054.8 H 660 v 26.2 h -95.9 z"
+         id="path107056"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4538721"
+     inkscape:cx="119.12182"
+     inkscape:cy="77.362146"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-227.46705,-576.57407)">
+    <path
+       style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 227.46895,586.80105 c 0.0224,-0.43558 0.26349,-0.8303 0.6408,-1.0491 l 15.60033,-9.00521 c 0.39898,-0.2303 0.89054,-0.23022 1.28943,2.3e-4 0.39891,0.23045 0.64453,0.65624 0.64431,1.11692 v 18.01608 c 2.2e-4,0.46069 -0.2454,0.88648 -0.64431,1.11692 -0.39889,0.23046 -0.89045,0.23054 -1.28943,2.3e-4 l -15.60033,-9.01088 c -0.41947,-0.24314 -0.66705,-0.70107 -0.6408,-1.18519 z"
+       id="path3233"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/DPad_Right.svg b/Source/Core/DolphinQt/Resources/GCPad/DPad_Right.svg
new file mode 100644
index 000000000000..efac443fae5a
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/DPad_Right.svg
@@ -0,0 +1,74 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="18.176769"
+   height="20.59572"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="dpad_right.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4538721"
+     inkscape:cx="40.575715"
+     inkscape:cy="104.87488"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-288.47379,-576.57407)">
+    <path
+       id="path3230"
+       d="m 306.64866,586.80105 c -0.0224,-0.43558 -0.26349,-0.8303 -0.6408,-1.0491 l -15.60033,-9.00521 c -0.39898,-0.2303 -0.89054,-0.23022 -1.28943,2.3e-4 -0.39891,0.23045 -0.64453,0.65624 -0.64431,1.11692 v 18.01608 c -2.2e-4,0.46069 0.2454,0.88648 0.64431,1.11692 0.39889,0.23046 0.89045,0.23054 1.28943,2.3e-4 l 15.60033,-9.01088 c 0.41947,-0.24314 0.66705,-0.70107 0.6408,-1.18519 z"
+       style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/DPad_Up.svg b/Source/Core/DolphinQt/Resources/GCPad/DPad_Up.svg
new file mode 100644
index 000000000000..2e3be487b5ff
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/DPad_Up.svg
@@ -0,0 +1,74 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="20.59572"
+   height="18.176769"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="dpad_up.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4538721"
+     inkscape:cx="89.82792"
+     inkscape:cy="45.649302"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-256.76095,-547.28018)">
+    <path
+       style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 266.98793,547.28208 c -0.43558,0.0224 -0.8303,0.26349 -1.0491,0.6408 l -9.00521,15.60033 c -0.2303,0.39898 -0.23022,0.89054 2.3e-4,1.28943 0.23045,0.39891 0.65624,0.64453 1.11692,0.64431 h 18.01608 c 0.46069,2.2e-4 0.88648,-0.2454 1.11692,-0.64431 0.23046,-0.39889 0.23054,-0.89045 2.3e-4,-1.28943 l -9.01088,-15.60033 c -0.24314,-0.41947 -0.70107,-0.66705 -1.18519,-0.6408 z"
+       id="path2449"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/GCPad.qml b/Source/Core/DolphinQt/Resources/GCPad/GCPad.qml
new file mode 100644
index 000000000000..7e86182a2226
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/GCPad.qml
@@ -0,0 +1,205 @@
+// Copyright 2019 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+import QtQuick 2.0
+
+Rectangle
+{
+    id: rect
+    color: "transparent"
+
+    Rectangle
+    {
+        objectName: "controller"
+        id: controller
+
+        signal detectInput(string name)
+
+        function updateButton(name, value, expression)
+        {
+            for (var i = 0; i < controller.children.length; i++)
+            {
+                var item = controller.children[i];
+
+                if (item.name == name && item.objectName == "button")
+                {
+                    item.buttonPressed(value, expression);
+                    return;
+                }
+            }
+        }
+
+        function updateTrigger(name, value, expression)
+        {
+            for (var i = 0; i < controller.children.length; i++)
+            {
+                var item = controller.children[i];
+
+                if (item.name == name && item.objectName == "trigger")
+                {
+                    item.triggerPressed(value, expression);
+                    return;
+                }
+            }
+        }
+
+        function updateStick(name, x, y)
+        {
+            for (var i = 0; i < controller.children.length; i++)
+            {
+                var item = controller.children[i];
+
+                if (item.name == name && item.objectName == "stick")
+                {
+                    item.setPosition(x, y);
+                    return;
+                }
+            }
+        }
+
+        function updateStickExpression(name, direction, expression)
+        {
+            for (var i = 0; i < controller.children.length; i++)
+            {
+                var item = controller.children[i];
+
+                if (item.name == name && item.objectName == "stick")
+                {
+                    item.setExpression(direction, expression);
+                    return;
+                }
+            }
+        }
+
+        function detectedInput(name)
+        {
+            if (name.startsWith("Stick_Main_")) {
+                stick_main.detectedInput(name.substr(11))
+                return;
+            }
+            if (name.startsWith("Stick_C_")) {
+                stick_c.detectedInput(name.substr(8))
+                return;
+            }
+            for (var i = 0; i < controller.children.length; i++)
+            {
+                var item = controller.children[i];
+                if (item.name == name)
+                {
+                    item.detectedInput();
+                    return;
+                }
+            }            
+        }
+        
+        Image {
+            source: "base.svg"
+        }
+
+        x: (rect.width - 650) / 2
+        y: (rect.height - 500) / 2        
+        
+        Trigger {
+            name: "Trigger_R"
+            x: 505
+            y: 20
+            z: -2
+            onDetectInput: controller.detectInput(name)
+        }
+        Button {
+            name: "Z"
+            x: 495
+            y: 30
+            z: -1
+            box_x: 155
+            box_y: 20
+            onDetectInput: controller.detectInput(name)
+        }
+        Trigger {
+            name: "Trigger_L"
+            x: 60
+            y: 30
+            z: -1
+            onDetectInput: controller.detectInput(name)
+        }
+        Button {
+            name: "A"
+            x: 510
+            y: 135
+            onDetectInput: controller.detectInput(name)
+        }
+        Button {
+            name: "B"
+            x: 460
+            y: 190
+            onDetectInput: controller.detectInput(name)
+        }
+        Button {
+            name: "X"
+            x: 605
+            y: 120
+            onDetectInput: controller.detectInput(name)
+
+        }
+        Button {
+            name: "Y"
+            x: 500
+            y: 85
+            onDetectInput: controller.detectInput(name)
+        }
+        Button {
+            name: "Start"
+            x: 320
+            y: 165
+            onDetectInput: controller.detectInput(name)
+        }
+        Stick {
+            id: stick_c
+            name: "Stick_C"
+            radius: 50
+            x: 420
+            y: 300
+            shift_input_x: -5
+            onDetectInput: controller.detectInput(name)
+        }
+        Stick {
+            id: stick_main
+            name: "Stick_Main"
+            radius: 60
+            x: 75
+            y: 128
+            onDetectInput: controller.detectInput(name)
+        }
+        Button {
+            name: "DPad_Up"
+            x: 214
+            y: 293
+            box_y: -45
+            onDetectInput: controller.detectInput(name)
+        }
+        Button {
+            onDetectInput: controller.detectInput(name)
+            name: "DPad_Down"
+            x: 214
+            y: 358
+            box_y: 15
+        }
+        Button {
+            name: "DPad_Left"
+            x: 185
+            y: 323
+            box_x: -50
+            box_y: -12
+            onDetectInput: controller.detectInput(name)
+        }
+        Button {
+            name: "DPad_Right"
+            x: 245
+            y: 323
+            box_x: 70
+            box_y: -12
+            onDetectInput: controller.detectInput(name)
+        }
+    }
+}
diff --git a/Source/Core/DolphinQt/Resources/GCPad/InputBox.qml b/Source/Core/DolphinQt/Resources/GCPad/InputBox.qml
new file mode 100644
index 000000000000..f44e7f20c25a
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/InputBox.qml
@@ -0,0 +1,60 @@
+// Copyright 2019 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+import QtQuick 2.0
+
+Rectangle
+{
+    signal detectInput()
+
+    property bool detecting_input : false
+    
+    id: input_box
+    color: Qt.rgba(0, 0, 0, 0.5)
+    radius: 15
+    width: 80
+    height: 25
+    z: 1
+
+    function setValue(value)
+    {
+        if (input_box.detecting_input)
+            return;
+ 
+        expression.text = value == "" ? "<Unmapped>" : value;
+    }
+
+
+    function detectedInput()
+    {
+        input_box.detecting_input = false;
+    }
+
+    function setPressed(pressed)
+    {
+        expression.font.bold = pressed;
+    }
+    
+    Text {
+        id: expression
+        anchors.centerIn: input_box
+        width: input_box.width - 10
+        text: "<Uninitialized>"
+        color: "white"
+        elide: Text.ElideRight
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+    }
+
+
+    MouseArea
+    {
+        anchors.fill: input_box
+        onClicked: {
+            input_box.detecting_input = true;
+            expression.text = "...";
+            input_box.detectInput();
+        }
+    }
+}
diff --git a/Source/Core/DolphinQt/Resources/GCPad/Start.svg b/Source/Core/DolphinQt/Resources/GCPad/Start.svg
new file mode 100644
index 000000000000..7699b195507c
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/Start.svg
@@ -0,0 +1,75 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="33.772552"
+   height="33.772552"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="start_button.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4538721"
+     inkscape:cx="-252.94252"
+     inkscape:cy="-100.28235"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0.2"
+     fit-margin-left="0.2"
+     fit-margin-right="0.2"
+     fit-margin-bottom="0.2" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-364.29023,-416.6524)">
+    <circle
+       style="opacity:1;fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3207"
+       cx="381.86432"
+       cy="433.53867"
+       r="15.686275" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/Stick.qml b/Source/Core/DolphinQt/Resources/GCPad/Stick.qml
new file mode 100644
index 000000000000..fa604ed0fee1
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/Stick.qml
@@ -0,0 +1,106 @@
+// Copyright 2019 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+import QtQuick 2.0
+import QtGraphicalEffects 1.0
+Rectangle {
+    id: base
+
+    property string name
+    property int radius
+    
+    property int org_x: x
+    property int org_y: y
+
+    property int shift_input_x: 0
+    property int shift_input_y: 0
+    
+    signal detectInput(string name)
+    
+    objectName: "stick"
+
+    Component.onCompleted: { org_x = org_x; org_y = org_y; }
+    
+    Image {
+        id: image
+                
+        opacity: 0.5
+        
+        source: base.name+".svg"
+        
+        ColorOverlay
+        {
+            id: hover_overlay
+            anchors.fill: image
+            source: image
+            color: "transparent"
+        }
+    }
+    
+    function setPosition(new_x, new_y)
+    {
+        image.x = new_x * radius;
+        image.y = -new_y * radius;
+    }
+
+    function detectedInput(direction)
+    {
+        if (direction == "Up")
+            input_box_up.detectedInput();
+        if (direction == "Down")
+            input_box_down.detectedInput();
+        if (direction == "Left")
+            input_box_left.detectedInput();
+        if (direction == "Right")
+            input_box_right.detectedInput();
+        if (direction == "Down")
+            input_box_down.detectedInput();
+    }
+
+    function setExpression(direction, expression)
+    {
+        if (direction == "Up")
+            input_box_up.setValue(expression)
+        if (direction == "Down")
+            input_box_down.setValue(expression)
+        if (direction == "Left")
+            input_box_left.setValue(expression)
+        if (direction == "Right")
+            input_box_right.setValue(expression)
+        if (direction == "Down")
+            input_box_down.setValue(expression)
+    }
+    
+    InputBox
+    {
+        id: input_box_up
+        x: base.radius - width/2 - 10 + shift_input_x
+        y: -30 + shift_input_y
+        onDetectInput: base.detectInput(base.name+"_Up")
+    }
+
+    InputBox
+    {
+        id: input_box_down
+        x: base.radius - width/2 - 10 + shift_input_x
+        y: base.radius*2 + shift_input_y
+        onDetectInput: base.detectInput(base.name+"_Down")
+    }
+
+    InputBox
+    {
+        id: input_box_left
+        x: -10 - width + shift_input_x
+        y: base.radius - height + shift_input_y
+        onDetectInput: base.detectInput(base.name+"_Left")
+    }
+
+    InputBox
+    {
+        id: input_box_right
+        x: base.radius*2 - 10 + shift_input_x
+        y: base.radius - height + shift_input_y
+        onDetectInput: base.detectInput(base.name+"_Right")
+    }
+}
diff --git a/Source/Core/DolphinQt/Resources/GCPad/Stick_C.svg b/Source/Core/DolphinQt/Resources/GCPad/Stick_C.svg
new file mode 100644
index 000000000000..61d6baf3593a
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/Stick_C.svg
@@ -0,0 +1,79 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="65.233978"
+   height="65.233994"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="Stick_C.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.630977"
+     inkscape:cx="23.18428"
+     inkscape:cy="33.465949"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0.2"
+     fit-margin-left="0.2"
+     fit-margin-right="0.2"
+     fit-margin-bottom="0.2" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-461.10844,-554.16889)">
+    <path
+       style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 493.72641,555.36889 a 31.416281,31.416281 0 0 0 -31.41797,31.41797 31.416281,31.416281 0 0 0 31.41797,31.41602 31.416281,31.416281 0 0 0 31.41601,-31.41602 31.416281,31.416281 0 0 0 -31.41601,-31.41797 z"
+       id="path3247"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28px;line-height:-200%;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:0.64088398;stroke:none;stroke-width:3pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 500.11026,595.65192 c -0.70184,0.37369 -1.42189,0.65169 -2.16016,0.83398 -0.73829,0.19141 -1.52214,0.28711 -2.35156,0.28711 -2.61589,0 -4.64844,-0.92513 -6.09765,-2.77539 -1.44011,-1.85026 -2.16016,-4.45247 -2.16016,-7.80664 0,-3.33592 0.72461,-5.93358 2.17383,-7.79297 1.45832,-1.86847 3.48632,-2.80271 6.08398,-2.80273 0.82942,2e-5 1.61327,0.0957 2.35156,0.28711 0.73827,0.18231 1.45832,0.4603 2.16016,0.83398 v 2.83008 c -0.67449,-0.55597 -1.3991,-0.9798 -2.17383,-1.27149 -0.77475,-0.29164 -1.55405,-0.43748 -2.33789,-0.4375 -1.79558,2e-5 -3.13998,0.69273 -4.0332,2.07813 -0.89324,1.38543 -1.33985,3.47722 -1.33985,6.27539 0,2.78907 0.44661,4.87631 1.33985,6.26172 0.89322,1.38542 2.23762,2.07812 4.0332,2.07812 0.80207,0 1.58593,-0.14583 2.35156,-0.4375 0.77473,-0.29166 1.49478,-0.71549 2.16016,-1.27148 v 2.83008"
+       id="text4053"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/Stick_Main.svg b/Source/Core/DolphinQt/Resources/GCPad/Stick_Main.svg
new file mode 100644
index 000000000000..b92acc9f8491
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/Stick_Main.svg
@@ -0,0 +1,97 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="99.254898"
+   height="99.254898"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="main_stick.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4538721"
+     inkscape:cx="210.83382"
+     inkscape:cy="-34.838376"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-118.21569,-380.77394)">
+    <circle
+       transform="matrix(0.4,0,0,0.4,103.84314,255.73103)"
+       id="path3258"
+       style="opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       cx="160"
+       cy="436.6759"
+       r="121.56863" />
+    <circle
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#797979;stroke-width:6.23914528;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3295"
+       transform="matrix(0.3205567,0,0,0.3205567,116.55407,290.42201)"
+       cx="160"
+       cy="436.6759"
+       r="121.56863" />
+    <circle
+       transform="matrix(0.2255379,0,0,0.2255379,131.75708,331.91444)"
+       id="path3297"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#797979;stroke-width:8.86769104;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       cx="160"
+       cy="436.6759"
+       r="121.56863" />
+    <circle
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#797979;stroke-width:17.92542648;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3301"
+       transform="matrix(0.1115734,0,0,0.1115734,149.9914,381.67999)"
+       cx="160"
+       cy="436.6759"
+       r="121.56863" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/Trigger.qml b/Source/Core/DolphinQt/Resources/GCPad/Trigger.qml
new file mode 100644
index 000000000000..5c0269c11eb7
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/Trigger.qml
@@ -0,0 +1,63 @@
+import QtQuick 2.0
+import QtGraphicalEffects 1.0
+import QtQuick.Controls 2.0
+
+Image {
+    property string name
+    property int box_x : image.width / 2
+    property int box_y : 0
+
+    id: image
+    
+    source: name+".svg"
+
+    objectName: "trigger"
+
+    signal detectInput(string name)
+    
+    ColorOverlay
+    {
+        id: hover_overlay
+        anchors.fill: image
+        source: image
+        color: "transparent"
+    }
+
+    ProgressBar
+    {
+        id: progress
+        value: 0
+        y: -25
+        anchors.horizontalCenter: image.horizontalCenter
+        width: image.width
+    }
+
+    function detectedInput()
+    {
+        input_box.detectedInput();
+    }
+    
+    function triggerPressed(value, expression)
+    {
+        if (expression != null)
+            input_box.setValue(expression)
+        
+        progress.value = value;
+
+        var pressed = value == 1
+
+        hover_overlay.color = pressed ? Qt.rgba(1, 1, 0, 0.6) : "transparent";
+
+        input_box.setPressed(value)
+    }
+
+    InputBox
+    {
+        onDetectInput: image.detectInput(image.name)
+        id: input_box
+        x: box_x - width/2
+        y: box_y - height - 20
+        z: 1
+    }
+
+}
diff --git a/Source/Core/DolphinQt/Resources/GCPad/Trigger_L.svg b/Source/Core/DolphinQt/Resources/GCPad/Trigger_L.svg
new file mode 100644
index 000000000000..a661196ae25b
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/Trigger_L.svg
@@ -0,0 +1,74 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="101.38926"
+   height="52.959049"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="left_trigger.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4538721"
+     inkscape:cx="237.28141"
+     inkscape:cy="-160.23254"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-109.30746,-274.91294)">
+    <path
+       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 110.58824,326.87199 c 11.7647,-47.05883 46.27451,-59.60785 90.19607,-45.4902 43.92157,14.11765 -88.62745,45.4902 -90.19607,45.4902 z"
+       id="path3209"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/Trigger_R.svg b/Source/Core/DolphinQt/Resources/GCPad/Trigger_R.svg
new file mode 100644
index 000000000000..6f91b637614f
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/Trigger_R.svg
@@ -0,0 +1,74 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="101.38926"
+   height="52.959049"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="right_trigger.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4538721"
+     inkscape:cx="-201.43417"
+     inkscape:cy="-160.23254"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-548.02305,-274.91294)">
+    <path
+       id="path3273"
+       d="m 648.13153,326.87199 c -11.7647,-47.05883 -46.27451,-59.60785 -90.19607,-45.4902 -43.92157,14.11765 88.62745,45.4902 90.19607,45.4902 z"
+       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/X.svg b/Source/Core/DolphinQt/Resources/GCPad/X.svg
new file mode 100644
index 000000000000..a0d79ca4c369
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/X.svg
@@ -0,0 +1,80 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="42.795143"
+   height="70.249237"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="x_button.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4538721"
+     inkscape:cx="-319.97653"
+     inkscape:cy="-72.307728"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-649.02603,-377.25068)">
+    <path
+       sodipodi:nodetypes="czzzz"
+       id="path3237"
+       d="m 661.92886,434.59306 c 0.8207,17.21293 22.54087,14.68263 27.09699,-0.66434 4.55611,-15.34697 0.42368,-39.86039 -12.45034,-50.98157 -12.87403,-11.12118 -31.6648,-0.54334 -25.26684,11.41665 6.39794,11.95998 9.7995,23.01634 10.62019,40.22926 z"
+       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28px;line-height:-200%;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:0.64088398;stroke:none;stroke-width:3pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 666.90375,401.75043 h 2.96679 l 4.48438,7.69726 4.56641,-7.69726 h 2.96679 l -6.11133,9.59765 6.54883,10.81446 h -2.96679 l -5.00391,-8.79102 -5.40039,8.79102 h -2.98047 l 6.83594,-10.81446 -5.90625,-9.59765"
+       id="text3315"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/Y.svg b/Source/Core/DolphinQt/Resources/GCPad/Y.svg
new file mode 100644
index 000000000000..302b808ef18a
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/Y.svg
@@ -0,0 +1,80 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="70.384567"
+   height="42.311584"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="y_button.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4538721"
+     inkscape:cx="-213.79131"
+     inkscape:cy="-143.54875"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-542.84082,-333.94731)">
+    <path
+       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 600.14073,364.06741 c 17.22373,-0.54917 15.03625,-22.30654 -0.23696,-27.1041 -15.27322,-4.79756 -39.84876,-1.05219 -51.17157,11.64487 -11.3228,12.69705 -1.04259,31.65228 11.0168,25.44372 12.05939,-6.20855 23.16801,-9.43533 40.39173,-9.98449 z"
+       id="path3232"
+       sodipodi:nodetypes="czzzz"
+       inkscape:connector-curvature="0" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28px;line-height:-200%;font-family:'DejaVu Sans Mono';-inkscape-font-specification:'DejaVu Sans Mono';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:0.64088398;stroke:none;stroke-width:3pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 569.33893,341.75397 h 2.93945 l 4.97656,9.00976 4.96289,-9.00976 h 2.9668 l -6.54883,11.25195 v 9.16016 h -2.77539 v -9.16016 l -6.52148,-11.25195"
+       id="text3311"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/Z.svg b/Source/Core/DolphinQt/Resources/GCPad/Z.svg
new file mode 100644
index 000000000000..d5b4c48694b6
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/Z.svg
@@ -0,0 +1,75 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="110.45518"
+   height="49.868469"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="z_button.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4538721"
+     inkscape:cx="-191.80462"
+     inkscape:cy="-191.28864"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-538.3935,-278.65054)">
+    <path
+       style="fill:#0000c0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 539.08253,282.80368 c 2.06143,-4.06635 6.217,-3.84473 16.99062,-3.45054 28.49855,1.04271 73.20647,20.48669 85.05021,29.88459 7.84426,6.22435 8.67294,10.40042 5.4767,18.62179 z"
+       id="path3275"
+       sodipodi:nodetypes="csscc"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/GCPad/base.svg b/Source/Core/DolphinQt/Resources/GCPad/base.svg
new file mode 100644
index 000000000000..7c9190cfe8e0
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/GCPad/base.svg
@@ -0,0 +1,356 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="675.185"
+   height="478.66144"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="base.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   style="display:inline">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3287">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1;"
+         offset="0"
+         id="stop3289" />
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:0;"
+         offset="1"
+         id="stop3291" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2390"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <clipPath
+       id="clp43">
+      <path
+         id="path17725"
+         d="M 564.1,1054.8 L 660,1054.8 L 660,1081 L 564.1,1081 L 564.1,1054.8 z" />
+    </clipPath>
+    <clipPath
+       id="clp44">
+      <path
+         id="path17731"
+         d="M 570.68,1072.3 L 570.67,1063 L 578.78,1058.3 L 578.78,1061.2 L 573.17,1064.4 L 573.17,1070.8 L 570.68,1072.3" />
+    </clipPath>
+    <clipPath
+       id="clp38">
+      <path
+         id="path17691"
+         d="M 564.1,1054.8 L 660,1054.8 L 660,1081 L 564.1,1081 L 564.1,1054.8 z" />
+    </clipPath>
+    <clipPath
+       id="clp39">
+      <path
+         id="path17697"
+         d="M 578.75,1067.6 L 574.98,1069.8 L 578.75,1072 L 582.29,1069.9 L 586.57,1072.4 L 586.84,1072.3 L 578.75,1067.6" />
+    </clipPath>
+    <clipPath
+       id="clp33">
+      <path
+         id="path17657"
+         d="M 564.1,1054.8 L 660,1054.8 L 660,1081 L 564.1,1081 L 564.1,1054.8 z" />
+    </clipPath>
+    <clipPath
+       id="clp34">
+      <path
+         id="path17663"
+         d="M 578.75,1067.6 L 586.84,1072.3 L 586.84,1063 L 578.78,1058.3 L 578.78,1061.2 L 584.38,1064.4 L 584.38,1067.8 L 582.55,1066.7 L 582.55,1065.4 L 578.75,1063.3 L 578.75,1067.6" />
+    </clipPath>
+    <clipPath
+       id="clp28">
+      <path
+         id="path17623"
+         d="M 564.1,1054.8 L 660,1054.8 L 660,1081 L 564.1,1081 L 564.1,1054.8 z" />
+    </clipPath>
+    <clipPath
+       id="clp29">
+      <path
+         id="path17629"
+         d="M 578.75,1063.3 L 578.75,1067.6 L 574.98,1069.8 L 574.98,1065.4 L 578.75,1063.3" />
+    </clipPath>
+    <clipPath
+       id="clp23">
+      <path
+         id="path17589"
+         d="M 564.1,1054.8 L 660,1054.8 L 660,1081 L 564.1,1081 L 564.1,1054.8 z" />
+    </clipPath>
+    <clipPath
+       id="clp24">
+      <path
+         id="path17595"
+         d="M 584.38,1064.4 L 584.38,1067.8 L 584.1,1067.6 L 584.1,1064.5 L 584.38,1064.4" />
+    </clipPath>
+    <clipPath
+       id="clp18">
+      <path
+         id="path17555"
+         d="M 564.1,1054.8 L 660,1054.8 L 660,1081 L 564.1,1081 L 564.1,1054.8 z" />
+    </clipPath>
+    <clipPath
+       id="clp19">
+      <path
+         id="path17561"
+         d="M 573.17,1064.4 L 578.78,1061.2 L 584.38,1064.4 L 584.1,1064.6 L 578.75,1061.5 L 573.45,1064.6 L 573.17,1064.4" />
+    </clipPath>
+    <clipPath
+       id="clp13">
+      <path
+         id="path17521"
+         d="M 564.1,1054.8 L 660,1054.8 L 660,1081 L 564.1,1081 L 564.1,1054.8 z" />
+    </clipPath>
+    <clipPath
+       id="clp14">
+      <path
+         id="path17527"
+         d="M 584.85,1073.4 L 578.74,1077 L 570.68,1072.3 L 573.17,1070.8 L 578.76,1074.1 L 582.39,1072 L 584.85,1073.4" />
+    </clipPath>
+    <clipPath
+       id="clp8">
+      <path
+         id="path17485"
+         d="M 564.1,1054.8 L 660,1054.8 L 660,1081 L 564.1,1081 L 564.1,1054.8 z" />
+    </clipPath>
+    <clipPath
+       id="clp9">
+      <path
+         id="path17491"
+         d="M 582.39,1071.7 L 578.76,1073.8 L 578.76,1074.1 L 582.39,1072 L 582.39,1071.7" />
+    </clipPath>
+    <inkscape:perspective
+       id="perspective3517"
+       inkscape:persp3d-origin="389.49554 : 70.713852 : 1"
+       inkscape:vp_z="778.99109 : 106.07078 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 106.07078 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <clipPath
+       id="clipPath107145">
+      <path
+         d="M 564.1,1054.8 L 660,1054.8 L 660,1081 L 564.1,1081 L 564.1,1054.8 z"
+         id="path107147" />
+    </clipPath>
+    <clipPath
+       id="clipPath107115">
+      <path
+         d="M 564.1,1054.8 L 660,1054.8 L 660,1081 L 564.1,1081 L 564.1,1054.8 z"
+         id="path107117" />
+    </clipPath>
+    <clipPath
+       id="clipPath107100">
+      <path
+         d="M 564.1,1054.8 L 660,1054.8 L 660,1081 L 564.1,1081 L 564.1,1054.8 z"
+         id="path107102" />
+    </clipPath>
+    <clipPath
+       id="clipPath107085">
+      <path
+         d="M 564.1,1054.8 L 660,1054.8 L 660,1081 L 564.1,1081 L 564.1,1054.8 z"
+         id="path107087" />
+    </clipPath>
+    <clipPath
+       id="clipPath107054">
+      <path
+         d="M 564.1,1054.8 L 660,1054.8 L 660,1081 L 564.1,1081 L 564.1,1054.8 z"
+         id="path107056" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4538721"
+     inkscape:cx="380.30106"
+     inkscape:cy="243.48772"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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"
+     style="display:inline"
+     transform="translate(-42.979567,-252.93081)">
+    <path
+       sodipodi:nodetypes="csssc"
+       id="path2516"
+       d="M 713.31414,433.02735 C 722.36162,553.66051 715.03691,638.996 695.83293,687.44687 C 667.72544,758.36091 621.37094,730.00407 605.35805,686.84371 C 594.40587,657.32373 592.08841,540.27442 591.48524,531.8301 C 590.88208,523.38578 713.9173,433.63051 713.31414,433.02735 z"
+       style="fill:#3c3760;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path3211"
+       style="fill:#463f6f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 115.29412,324.51905 L 198.47104,521.3818 C 261.74101,485.87076 338.85344,474.32298 380.00001,474.32298 C 421.14657,474.32298 497.8296,485.62975 561.52897,521.3818 L 644.70588,324.51905 C 551.81933,270.89097 440,253.93081 380,253.93081 C 348.1566,253.93081 301.54102,258.80976 251.01061,271.3516 C 206.33058,282.44135 158.58976,299.5223 115.29412,324.51905 z"
+       sodipodi:nodetypes="ccsccssc" />
+    <path
+       style="fill:#59518e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 283.12001,486.95405 C 348.115,469.51451 406.47627,466.70922 466.18485,486.02753 L 469.3914,484.10623 C 419.99435,460.03888 338.49264,462.33759 282.43501,484.66743 L 283.12001,486.95405 z"
+       id="path3610"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccsccssc"
+       d="M 115.29412,325.30337 L 168.66711,308.96735 C 231.93708,273.45631 339.63775,261.90853 380.78432,261.90853 C 421.93088,261.90853 524.49626,273.2153 588.19563,308.96735 L 644.70588,325.30337 C 551.81933,271.67529 440,254.71513 380,254.71513 C 348.1566,254.71513 301.54102,259.59408 251.01061,272.13592 C 206.33058,283.22567 158.58976,300.30662 115.29412,325.30337 z"
+       style="fill:#6b61ab;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3319" />
+    <path
+       style="fill:#3c3760;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 47.830001,433.02735 C 38.782514,553.66051 46.107225,638.996 65.311212,687.44687 C 93.418699,758.36091 139.7732,730.00407 155.78609,686.84371 C 166.73827,657.32373 169.05573,540.27442 169.6589,531.8301 C 170.26206,523.38578 47.226836,433.63051 47.830001,433.02735 z"
+       id="path3241"
+       sodipodi:nodetypes="csssc" />
+    <path
+       sodipodi:nodetypes="ccscccssc"
+       d="M 649.02907,537.01198 C 611.41296,557.68834 583.35903,571.70322 573.34352,609.79461 C 563.32801,647.886 530.40572,671.96999 491.37254,671.96999 C 444.39843,671.96999 406.27451,633.84607 406.27451,586.87196 C 406.27451,566.17478 413.67572,547.19573 425.97413,532.43884 C 438.27254,517.68195 469.0196,497.50727 469.0196,430.40139 C 469.0196,363.29551 523.48235,308.83277 590.58823,308.83277 C 657.69411,308.83277 712.15686,363.29551 712.15686,430.40139 C 712.15686,476.32969 686.64519,516.33562 649.02907,537.01198 z"
+       style="fill:#4e477c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3263" />
+    <path
+       id="path3187"
+       style="fill:#4e477c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 109.4023,537.01198 C 147.01841,557.68834 175.07234,571.70322 185.08785,609.79461 C 195.10336,647.886 228.02565,671.96999 267.05883,671.96999 C 314.03294,671.96999 352.15686,633.84607 352.15686,586.87196 C 352.15686,566.17478 344.75565,547.19573 332.45724,532.43884 C 320.15883,517.68195 289.41177,497.50727 289.41177,430.40139 C 289.41177,363.29551 234.94902,308.83277 167.84314,308.83277 C 100.73726,308.83277 46.274511,363.29551 46.274511,430.40139 C 46.274511,476.32969 71.786184,516.33562 109.4023,537.01198 z"
+       sodipodi:nodetypes="ccscccssc" />
+    <path
+       transform="matrix(0.6715375,0,0,0.6715375,60.397139,137.15715)"
+       d="M 281.56863,436.6759 A 121.56863,121.56863 0 1 1 38.431374,436.6759 A 121.56863,121.56863 0 1 1 281.56863,436.6759 z"
+       sodipodi:ry="121.56863"
+       sodipodi:rx="121.56863"
+       sodipodi:cy="436.6759"
+       sodipodi:cx="160"
+       id="path3191"
+       style="opacity:1;fill:#5a518f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.97824025;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.6741443,0,0,0.6741443,82.263964,191.76429)"
+       d="M 359.21568,586.08765 A 85.098038,85.098038 0 1 1 189.01961,586.08765 A 85.098038,85.098038 0 1 1 359.21568,586.08765 z"
+       sodipodi:ry="85.098038"
+       sodipodi:rx="85.098038"
+       sodipodi:cy="586.08765"
+       sodipodi:cx="274.11765"
+       id="path3193"
+       style="opacity:1;fill:#3b365f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.96672392;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#5b5290;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.27435923;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3199"
+       sodipodi:cx="160"
+       sodipodi:cy="436.6759"
+       sodipodi:rx="121.56863"
+       sodipodi:ry="121.56863"
+       d="M 281.56863,436.6759 A 121.56863,121.56863 0 1 1 38.431374,436.6759 A 121.56863,121.56863 0 1 1 281.56863,436.6759 z"
+       transform="matrix(-0.6108065,0,0,0.6108065,690.67022,163.6769)" />
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#5a5a5a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.22303748;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3243"
+       sodipodi:sides="5"
+       sodipodi:cx="163.45793"
+       sodipodi:cy="428.68875"
+       sodipodi:r1="98.985367"
+       sodipodi:r2="99.460846"
+       sodipodi:arg1="0"
+       sodipodi:arg2="0.62831853"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 262.4433,428.68875 L 243.92345,487.15037 L 194.04609,522.82943 L 132.72284,523.28164 L 83.377088,486.87089 L 63.997086,428.68875 L 83.377088,370.50661 L 132.72284,334.09587 L 194.04609,334.54807 L 243.92345,370.22713 L 262.4433,428.68875 z"
+       transform="matrix(0,-0.6207128,0.6203526,0,-98.095042,531.71426)" />
+    <path
+       transform="matrix(0,-0.5800062,0.5794667,0,245.31464,681.54066)"
+       d="M 262.4433,428.68875 L 243.92345,487.15037 L 194.04609,522.82943 L 132.72284,523.28164 L 83.377088,486.87089 L 63.997086,428.68875 L 83.377088,370.50661 L 132.72284,334.09587 L 194.04609,334.54807 L 243.92345,370.22713 L 262.4433,428.68875 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="0.62831853"
+       sodipodi:arg1="0"
+       sodipodi:r2="99.460846"
+       sodipodi:r1="98.985367"
+       sodipodi:cy="428.68875"
+       sodipodi:cx="163.45793"
+       sodipodi:sides="5"
+       id="path3245"
+       style="opacity:1;fill:#c2c200;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.44984341;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="star" />
+    <path
+       style="fill:#9e9e9e;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 255.09006,540.10631 C 253.08514,540.10631 251.49631,541.57143 251.49631,543.38756 L 251.49631,571.29381 L 223.59006,571.29381 C 221.77395,571.29381 220.30881,572.91386 220.30881,574.91881 L 220.30881,598.82506 C 220.30881,600.82998 221.77396,602.45006 223.59006,602.45006 L 251.49631,602.45006 L 251.49631,630.35631 C 251.49631,632.17242 253.08514,633.63759 255.09006,633.63756 L 279.02756,633.63756 C 281.03248,633.63756 282.65254,632.17241 282.65256,630.35631 L 282.65256,602.45006 L 310.52756,602.45006 C 312.34367,602.45006 313.80881,600.83001 313.80881,598.82506 L 313.80881,574.91881 C 313.80881,572.91389 312.34366,571.29381 310.52756,571.29381 L 282.65256,571.29381 L 282.65256,543.38756 C 282.65256,541.57145 281.03249,540.10631 279.02756,540.10631 L 255.09006,540.10631 z"
+       id="rect3249" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-3.6088684"
+       inkscape:original="M 255.09375 540.09375 C 253.08883 540.09374 251.5 541.55887 251.5 543.375 L 251.5 571.28125 L 223.59375 571.28125 C 221.77764 571.28124 220.3125 572.9013 220.3125 574.90625 L 220.3125 598.8125 C 220.3125 600.81741 221.77765 602.4375 223.59375 602.4375 L 251.5 602.4375 L 251.5 630.34375 C 251.5 632.15985 253.08883 633.62503 255.09375 633.625 L 279.03125 633.625 C 281.03617 633.62499 282.65623 632.15985 282.65625 630.34375 L 282.65625 602.4375 L 310.53125 602.4375 C 312.34736 602.43749 313.8125 600.81745 313.8125 598.8125 L 313.8125 574.90625 C 313.8125 572.90132 312.34735 571.28125 310.53125 571.28125 L 282.65625 571.28125 L 282.65625 543.375 C 282.65625 541.55888 281.03618 540.09375 279.03125 540.09375 L 255.09375 540.09375 z "
+       style="fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4071"
+       d="M 279.0625,543.375 C 279.0625,543.70507 279.27803,543.6875 279.03125,543.6875 L 255.09375,543.6875 L 255.09375,571.28125 C 255.08527,573.2625 253.48125,574.86652 251.5,574.875 L 223.59375,574.875 C 223.92384,574.875 223.90625,574.65945 223.90625,574.90625 L 223.90625,598.8125 C 223.90625,599.05922 223.92389,598.84375 223.59375,598.84375 L 251.5,598.84375 C 253.48125,598.85223 255.08527,600.45625 255.09375,602.4375 L 255.09375,630.03125 L 279.03125,630.03125 C 279.27801,630.03125 279.0625,630.01367 279.0625,630.34375 L 279.0625,602.4375 C 279.07098,600.45625 280.675,598.85223 282.65625,598.84375 L 310.53125,598.84375 C 310.2012,598.84375 310.21875,599.0593 310.21875,598.8125 L 310.21875,574.90625 C 310.21875,574.6595 310.20113,574.875 310.53125,574.875 L 282.65625,574.875 C 280.675,574.86652 279.07098,573.2625 279.0625,571.28125 L 279.0625,543.375 z" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.79166675;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3254"
+       sodipodi:cx="265.37897"
+       sodipodi:cy="588.15552"
+       sodipodi:rx="15.811819"
+       sodipodi:ry="15.811819"
+       d="M 281.19079,588.15552 A 15.811819,15.811819 0 1 1 249.56715,588.15552 A 15.811819,15.811819 0 1 1 281.19079,588.15552 z"
+       transform="matrix(0.7164179,0,0,0.7164179,76.93657,165.50679)" />
+    <path
+       style="font-size:12.66273212px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:-200%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans Mono;-inkscape-font-specification:DejaVu Sans Mono"
+       d="M 345.50999,394.92427 L 345.50999,396.19178 C 345.13076,395.94859 344.74947,395.76516 344.36613,395.64149 C 343.98691,395.51784 343.60356,395.45601 343.2161,395.456 C 342.62665,395.45601 342.16087,395.5941 341.81875,395.87026 C 341.47662,396.14232 341.30556,396.51124 341.30556,396.97702 C 341.30556,397.3851 341.41685,397.69631 341.63944,397.91065 C 341.86615,398.12499 342.28659,398.3043 342.90077,398.44856 L 343.55617,398.59696 C 344.42178,398.79894 345.05244,399.11633 345.44816,399.54913 C 345.84386,399.98195 346.04171,400.57139 346.04172,401.31746 C 346.04171,402.19545 345.76966,402.86527 345.22557,403.32693 C 344.68146,403.78859 343.89004,404.01942 342.85131,404.01942 C 342.41849,404.01942 341.98363,403.97202 341.5467,403.87722 C 341.10977,403.78653 340.67078,403.64845 340.22972,403.46296 L 340.22972,402.13362 C 340.70375,402.43452 341.15099,402.65505 341.57143,402.7952 C 341.99599,402.93534 342.42262,403.00542 342.85131,403.00542 C 343.48197,403.00542 343.97248,402.86527 344.32285,402.58497 C 344.67322,402.30056 344.8484,401.90485 344.84841,401.39784 C 344.8484,400.93618 344.7268,400.58376 344.48361,400.34055 C 344.24453,400.09736 343.82615,399.90981 343.22847,399.7779 L 342.56071,399.62333 C 341.70333,399.4296 341.08091,399.13694 340.69345,398.74535 C 340.30598,398.35376 340.11225,397.82821 340.11225,397.16869 C 340.11225,396.3443 340.38842,395.68478 340.94077,395.19014 C 341.49723,394.69139 342.23507,394.44201 343.15427,394.442 C 343.50876,394.44201 343.8818,394.48323 344.27339,394.56566 C 344.66497,394.64398 345.07717,394.76352 345.50999,394.92427 M 347.16084,394.60894 L 354.20325,394.60894 L 354.20325,395.66004 L 351.3158,395.66004 L 351.3158,403.84012 L 350.06065,403.84012 L 350.06065,395.66004 L 347.16084,395.66004 L 347.16084,394.60894 M 358.29638,395.70951 L 356.9794,400.4333 L 359.61335,400.4333 L 358.29638,395.70951 M 357.54205,394.60894 L 359.05688,394.60894 L 361.8825,403.84012 L 360.59026,403.84012 L 359.91013,401.43494 L 356.67644,401.43494 L 356.00868,403.84012 L 354.71643,403.84012 L 357.54205,394.60894 M 366.80415,399.48112 C 367.12566,399.56357 367.39977,399.7202 367.62649,399.95103 C 367.85319,400.17774 368.13555,400.63322 368.47355,401.31746 L 369.7287,403.84012 L 368.38699,403.84012 L 367.28642,401.50914 C 366.96903,400.8455 366.68255,400.41888 366.42699,400.22926 C 366.17554,400.03553 365.84579,399.93867 365.43771,399.93866 L 364.2444,399.93866 L 364.2444,403.84012 L 362.98926,403.84012 L 362.98926,394.60894 L 365.56137,394.60894 C 366.57538,394.60895 367.35237,394.83772 367.89235,395.29525 C 368.43233,395.7528 368.70232,396.41437 368.70232,397.27998 C 368.70232,397.89004 368.53538,398.3888 368.2015,398.77626 C 367.87174,399.15961 367.40596,399.39456 366.80415,399.48112 M 364.2444,395.63531 L 364.2444,398.91229 L 365.61084,398.91229 C 366.20852,398.91229 366.65369,398.77833 366.94636,398.51039 C 367.23902,398.24247 367.38535,397.83233 367.38535,397.27998 C 367.38535,396.74825 367.22871,396.34224 366.91544,396.06194 C 366.60629,395.77753 366.15493,395.63532 365.56137,395.63531 L 364.2444,395.63531 M 370.01311,394.60894 L 377.05552,394.60894 L 377.05552,395.66004 L 374.16807,395.66004 L 374.16807,403.84012 L 372.91293,403.84012 L 372.91293,395.66004 L 370.01311,395.66004 L 370.01311,394.60894 M 382.8366,394.60894 L 384.01137,394.60894 L 379.15155,405.01488 L 377.9706,405.01488 L 382.8366,394.60894 M 387.42437,395.63531 L 387.42437,399.10396 L 388.87119,399.10396 C 389.44826,399.10396 389.89756,398.95145 390.21908,398.64642 C 390.54471,398.3414 390.70753,397.91477 390.70753,397.36654 C 390.70753,396.81833 390.54677,396.39376 390.22526,396.09285 C 389.90374,395.78783 389.45238,395.63532 388.87119,395.63531 L 387.42437,395.63531 M 386.17541,394.60894 L 388.87119,394.60894 C 389.90168,394.60895 390.6828,394.8439 391.21454,395.3138 C 391.74627,395.77959 392.01213,396.46384 392.01214,397.36654 C 392.01213,398.27751 391.74627,398.96588 391.21454,399.43166 C 390.68692,399.89745 389.9058,400.13034 388.87119,400.13033 L 387.42437,400.13033 L 387.42437,403.84012 L 386.17541,403.84012 L 386.17541,394.60894 M 396.3835,395.70951 L 395.06653,400.4333 L 397.70048,400.4333 L 396.3835,395.70951 M 395.62918,394.60894 L 397.14401,394.60894 L 399.96963,403.84012 L 398.67739,403.84012 L 397.99726,401.43494 L 394.76356,401.43494 L 394.0958,403.84012 L 392.80356,403.84012 L 395.62918,394.60894 M 401.10111,400.29727 L 401.10111,394.60894 L 402.35626,394.60894 L 402.35626,400.86611 C 402.35625,401.31541 402.36862,401.63692 402.39335,401.83065 C 402.41808,402.02026 402.46136,402.16659 402.5232,402.26964 C 402.6551,402.51284 402.84471,402.69627 403.09203,402.81993 C 403.34347,402.94359 403.64643,403.00542 404.00093,403.00542 C 404.35954,403.00542 404.6625,402.94359 404.90982,402.81993 C 405.15714,402.69627 405.34881,402.51284 405.48484,402.26964 C 405.54667,402.16659 405.58995,402.02026 405.61468,401.83065 C 405.63941,401.64104 405.65178,401.32365 405.65178,400.87847 L 405.65178,394.60894 L 406.90074,394.60894 L 406.90074,400.29727 C 406.90074,401.24121 406.84097,401.91309 406.72144,402.31292 C 406.60601,402.70864 406.40404,403.03633 406.1155,403.29602 C 405.84345,403.53921 405.53224,403.72058 405.18188,403.84012 C 404.8315,403.95966 404.43785,404.01942 404.00093,404.01942 C 403.56812,404.01942 403.17653,403.95966 402.82616,403.84012 C 402.47579,403.72058 402.16252,403.53921 401.88635,403.29602 C 401.60193,403.04045 401.39995,402.7107 401.28042,402.30674 C 401.16088,401.89867 401.10111,401.22884 401.10111,400.29727 M 414.06681,394.92427 L 414.06681,396.19178 C 413.68758,395.94859 413.3063,395.76516 412.92296,395.64149 C 412.54373,395.51784 412.16039,395.45601 411.77293,395.456 C 411.18348,395.45601 410.71769,395.5941 410.37557,395.87026 C 410.03345,396.14232 409.86238,396.51124 409.86239,396.97702 C 409.86238,397.3851 409.97368,397.69631 410.19627,397.91065 C 410.42297,398.12499 410.84342,398.3043 411.45759,398.44856 L 412.11299,398.59696 C 412.9786,398.79894 413.60926,399.11633 414.00498,399.54913 C 414.40068,399.98195 414.59854,400.57139 414.59854,401.31746 C 414.59854,402.19545 414.32649,402.86527 413.78239,403.32693 C 413.23828,403.78859 412.44686,404.01942 411.40813,404.01942 C 410.97532,404.01942 410.54045,403.97202 410.10352,403.87722 C 409.66659,403.78653 409.2276,403.64845 408.78655,403.46296 L 408.78655,402.13362 C 409.26058,402.43452 409.70781,402.65505 410.12825,402.7952 C 410.55282,402.93534 410.97944,403.00542 411.40813,403.00542 C 412.03879,403.00542 412.5293,402.86527 412.87968,402.58497 C 413.23004,402.30056 413.40522,401.90485 413.40523,401.39784 C 413.40522,400.93618 413.28363,400.58376 413.04044,400.34055 C 412.80136,400.09736 412.38297,399.90981 411.78529,399.7779 L 411.11753,399.62333 C 410.26015,399.4296 409.63774,399.13694 409.25027,398.74535 C 408.8628,398.35376 408.66907,397.82821 408.66907,397.16869 C 408.66907,396.3443 408.94524,395.68478 409.49759,395.19014 C 410.05406,394.69139 410.79189,394.44201 411.7111,394.442 C 412.06558,394.44201 412.43862,394.48323 412.83021,394.56566 C 413.2218,394.64398 413.63399,394.76352 414.06681,394.92427 M 416.64511,394.60894 L 422.12322,394.60894 L 422.12322,395.66004 L 417.89407,395.66004 L 417.89407,398.39292 L 421.93773,398.39292 L 421.93773,399.44402 L 417.89407,399.44402 L 417.89407,402.78901 L 422.2407,402.78901 L 422.2407,403.84012 L 416.64511,403.84012 L 416.64511,394.60894"
+       id="text4027" />
+    <path
+       transform="matrix(0.4684029,0,0,0.4684029,142.75454,311.37819)"
+       d="M 281.19079,588.15552 A 15.811819,15.811819 0 1 1 249.56715,588.15552 A 15.811819,15.811819 0 1 1 281.19079,588.15552 z"
+       sodipodi:ry="15.811819"
+       sodipodi:rx="15.811819"
+       sodipodi:cy="588.15552"
+       sodipodi:cx="265.37897"
+       id="path4073"
+       style="fill:#6a6a6a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.79166675;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/Source/Core/DolphinQt/Resources/Resources.qrc b/Source/Core/DolphinQt/Resources/Resources.qrc
new file mode 100644
index 000000000000..ae570f4177bd
--- /dev/null
+++ b/Source/Core/DolphinQt/Resources/Resources.qrc
@@ -0,0 +1,26 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+  <!-- QML -->
+  <file>GCPad/GCPad.qml</file>
+  <file>GCPad/Button.qml</file>
+  <file>GCPad/InputBox.qml</file>
+  <file>GCPad/Stick.qml</file>
+  <file>GCPad/Trigger.qml</file>
+  <!-- Images -->
+  <file>GCPad/base.svg</file>
+  <file>GCPad/A.svg</file>
+  <file>GCPad/B.svg</file>
+  <file>GCPad/X.svg</file>
+  <file>GCPad/Y.svg</file>
+  <file>GCPad/Z.svg</file>
+  <file>GCPad/Start.svg</file>
+  <file>GCPad/Trigger_L.svg</file>
+  <file>GCPad/Trigger_R.svg</file>
+  <file>GCPad/Stick_Main.svg</file>
+  <file>GCPad/Stick_C.svg</file>
+  <file>GCPad/DPad_Up.svg</file>
+  <file>GCPad/DPad_Down.svg</file>
+  <file>GCPad/DPad_Left.svg</file>
+  <file>GCPad/DPad_Right.svg</file>
+</qresource>
+</RCC>
diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props
index a09f0d11780e..38a6d0c37d46 100644
--- a/Source/VSProps/QtCompile.props
+++ b/Source/VSProps/QtCompile.props
@@ -27,6 +27,9 @@
       <AdditionalIncludeDirectories>$(QtIncludeDir)QtCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(QtIncludeDir)QtGui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(QtIncludeDir)QtWidgets;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(QtIncludeDir)QtQml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(QtIncludeDir)QtQuick;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(QtIncludeDir)QtQuickWidgets;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <!--
       Negate the previously enabled warning (set in Base.props). Not compatible with QtCore\qtmap.h
       This isn't too bad since we live with the fact that Qt-using projects will have different compiler args already.
@@ -35,7 +38,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(QtLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>qtmain$(QtLibSuffix).lib;Qt5Core$(QtLibSuffix).lib;Qt5Gui$(QtLibSuffix).lib;Qt5Widgets$(QtLibSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>qtmain$(QtLibSuffix).lib;Qt5Core$(QtLibSuffix).lib;Qt5Gui$(QtLibSuffix).lib;Qt5Widgets$(QtLibSuffix).lib;Qt5Quick$(QtLibSuffix).lib;Qt5QuickWidgets$(QtLibSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
       <!--
       <AdditionalOptions>"/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\" %(AdditionalOptions)</AdditionalOptions>
@@ -56,7 +59,7 @@
         "-I$(SomeDir)"
         in order to prevent the trailing slash from escaping the doublequote after value replacement.
         -->
-    <MocIncludes>"-I$(QtIncludeDir)QtWidgets" "-I$(QtIncludeDir)QtGui" "-I$(QtIncludeDir)QtCore" "-I$(QtIncludeDir) " "-I$(QtToolOutDir) " -I.</MocIncludes>
+    <MocIncludes>"-I$(QtIncludeDir)QtWidgets" "-I$(QtIncludeDir)QtGui" "-I$(QtIncludeDir)QtCore" "-I$(QtIncludeDir) " "-I$(QtToolOutDir) " "-I$(QtIncludeDir)QtQML" "-I$(QtIncludeDir)QtQuick" "-I$(QtIncludeDir)QtQuickWidgets" -I.</MocIncludes>
     <MocIncludes>"-I$(ExternalsDir)xxhash" "-I$(ExternalsDir)zlib" "-I$(ExternalsDir)SFML\include" "-I$(ExternalsDir)mbedtls\include" "-I$(ExternalsDir)miniupnpc\src" "-I$(ExternalsDir)LZO" "-I$(ExternalsDir)libusbx\libusb" "-I$(ExternalsDir)libpng" "-I$(ExternalsDir)GL" "-I$(ExternalsDir)Bochs_disasm" "-I$(ExternalsDir) " "-I$(CoreDir) " $(MocIncludes)</MocIncludes>
   </PropertyGroup>
   <Target Name="QtMoc"
@@ -70,6 +73,18 @@
     <Exec Command="&quot;$(QtBinDir)moc.exe&quot; &quot;%(QtMoc.FullPath)&quot; -o &quot;$(QtToolOutDir)moc_%(QtMoc.Filename).cpp&quot; -f%(QtMoc.Filename)%(QtMoc.Extension) $(MocDefines) $(MocIncludes)" />
   </Target>
 
+  <Target Name="QtResource"
+    BeforeTargets="ClCompile"
+    Condition="'@(QtResource)'!=''"
+    Inputs="%(QtResource.Identity);$(MSBuildProjectFile)"
+    Outputs="$(QtToolOutDir)res_%(QtResource.Filename).cpp">
+    <Message Text="rcc %(QtResource.Filename)" Importance="High" />
+    <Error Condition="!$(QtDirValid)" Text="QTDIR not set or non-existent (pull the submodule?)" />
+    <MakeDir Directories="$(QtToolOutDir)" />
+    <Exec Command="&quot;$(QtBinDir)rcc.exe&quot; &quot;%(QtResource.FullPath)&quot; -o &quot;$(QtToolOutDir)res_%(QtResource.Filename).cpp&quot; --name &quot;%(QtResource.Filename)&quot;" />
+  </Target>
+
+
   <ItemGroup>
     <MocOutputs Include="$(QtToolOutDir)moc_*.cpp" />
   </ItemGroup>
@@ -77,17 +92,27 @@
     <Delete Files="@(MocOutputs)" />
   </Target>
 
+  <ItemGroup>
+    <ResourceOutputs Include="$(QtToolOutDir)res*.cpp" />
+  </ItemGroup>
+  <Target Name="QtResourceClean">
+    <Delete Files="@(ResourceOutputs)" />
+  </Target>
+
   <!--Expose the new targets to VS-->
   <ItemGroup>
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
     <AvailableItemName Include="QtMoc">
       <Targets>QtMoc</Targets>
+    </AvailableItemName>
+	<AvailableItemName Include="QtResource">
+      <Targets>QtResource</Targets>
     </AvailableItemName>
   </ItemGroup>
 
   <!--Copy the needed dlls-->
   <ItemGroup>
-    <QtLibNames Include="Qt5Core$(QtLibSuffix);Qt5Gui$(QtLibSuffix);Qt5Widgets$(QtLibSuffix)" />
+    <QtLibNames Include="Qt5Core$(QtLibSuffix);Qt5Gui$(QtLibSuffix);Qt5Widgets$(QtLibSuffix);Qt5Quick$(QtLibSuffix);Qt5QuickWidgets$(QtLibSuffix);" />
     <QtDlls Include="@(QtLibNames -> '$(QtBinDir)%(Identity).dll')" />
     <!--Filter plugins to copy based on the observation that all debug versions end in "d"-->
     <QtAllPlugins Include="$(QtPluginsDir)**\*$(QtLibSuffix).dll" />