diff --git a/src/GLideNUI-wtl/ConfigDlg.cpp b/src/GLideNUI-wtl/ConfigDlg.cpp
index 0c0974cc..ab74c364 100644
--- a/src/GLideNUI-wtl/ConfigDlg.cpp
+++ b/src/GLideNUI-wtl/ConfigDlg.cpp
@@ -118,7 +118,7 @@ void CConfigDlg::OnCustomSettingsToggled(bool checked)
             Rect.right -= Move;
             UseProfile.MoveWindow(&Rect);
         }
-        uint32_t Left = Rect.right + 7;
+        uint32_t Left = Rect.right + 2;
 
         CWindow ProfileStatic = GetDlgItem(IDC_SETTINGS_PROFILE_STATIC);
         ProfileStatic.GetWindowRect(&Rect);
diff --git a/src/GLideNUI-wtl/GLideNUI.rc b/src/GLideNUI-wtl/GLideNUI.rc
index dacb6d9a..f811aad8 100644
Binary files a/src/GLideNUI-wtl/GLideNUI.rc and b/src/GLideNUI-wtl/GLideNUI.rc differ
diff --git a/src/GLideNUI-wtl/config-emulation.cpp b/src/GLideNUI-wtl/config-emulation.cpp
index d8fd4a82..0e2dfd09 100644
--- a/src/GLideNUI-wtl/config-emulation.cpp
+++ b/src/GLideNUI-wtl/config-emulation.cpp
@@ -32,8 +32,10 @@ BOOL CEmulationTab::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
     m_N64ResMultiplerSpin.SetPos(2);
     m_N64ResMultiplerSpin.SetBuddy(m_N64ResMultiplerTxt);
 
+    SIZE iconSz = { ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON) };
     m_GammaIcon.SubclassWindow(GetDlgItem(IDC_GAMMA_ICON));
-    m_GammaIcon.SetIcon(MAKEINTRESOURCE(IDI_ICON_INFO), 16, 16);
+    m_GammaIcon.SetIcon(MAKEINTRESOURCE(IDI_ICON_INFO), iconSz.cx, iconSz.cy);
+    m_GammaIcon.SetWindowPos(HWND_TOP, 0, 0, iconSz.cx, iconSz.cy, SWP_NOMOVE | SWP_NOZORDER);
     m_GammaIcon.SetBackroundBrush((HBRUSH)GetStockObject(WHITE_BRUSH));
     return true;
 }
@@ -71,7 +73,6 @@ void CEmulationTab::LoadSettings(bool blockCustomSettings)
         m_Dlg.OnCustomSettingsToggled(config.generalEmulation.enableCustomSettings != 0);
     }
     CButton(GetDlgItem(IDC_CHK_N64_STYLE_MIP_MAPPING)).SetCheck(config.generalEmulation.enableLOD != 0 ? BST_CHECKED : BST_UNCHECKED);
-    CButton(GetDlgItem(IDC_CHK_NOISE)).SetCheck(config.generalEmulation.enableNoise != 0 ? BST_CHECKED : BST_UNCHECKED);
     CButton(GetDlgItem(IDC_CHK_HWLIGHTING)).SetCheck(config.generalEmulation.enableHWLighting != 0 ? BST_CHECKED : BST_UNCHECKED);
     CButton(GetDlgItem(IDC_CHK_SHADERS_STORAGE)).SetCheck(config.generalEmulation.enableShadersStorage != 0 ? BST_CHECKED : BST_UNCHECKED);
     
@@ -104,7 +105,6 @@ void CEmulationTab::SaveSettings()
 {
     config.generalEmulation.enableCustomSettings = CButton(GetDlgItem(IDC_CHK_USE_PER_GAME)).GetCheck() == BST_CHECKED ? 1 : 0;
     config.generalEmulation.enableLOD = CButton(GetDlgItem(IDC_CHK_N64_STYLE_MIP_MAPPING)).GetCheck() == BST_CHECKED ? 1 : 0;
-    config.generalEmulation.enableNoise = CButton(GetDlgItem(IDC_CHK_NOISE)).GetCheck() == BST_CHECKED ? 1 : 0;
     config.generalEmulation.enableHWLighting = CButton(GetDlgItem(IDC_CHK_HWLIGHTING)).GetCheck() == BST_CHECKED ? 1 : 0;
     config.generalEmulation.enableShadersStorage = CButton(GetDlgItem(IDC_CHK_SHADERS_STORAGE)).GetCheck() == BST_CHECKED ? 1 : 0;
     
diff --git a/src/GLideNUI-wtl/config-framebuffer.cpp b/src/GLideNUI-wtl/config-framebuffer.cpp
index 7f1d38bb..623a927b 100644
--- a/src/GLideNUI-wtl/config-framebuffer.cpp
+++ b/src/GLideNUI-wtl/config-framebuffer.cpp
@@ -9,8 +9,10 @@ CFrameBufferTab::CFrameBufferTab() :
 
 BOOL CFrameBufferTab::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
 {
+    SIZE iconSz = { ::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON) };
     m_EmulateFBIcon.SubclassWindow(GetDlgItem(IDC_EMULATE_FB_ICON));
-    m_EmulateFBIcon.SetIcon(MAKEINTRESOURCE(IDI_ICON_WARNING), 16, 16);
+    m_EmulateFBIcon.SetIcon(MAKEINTRESOURCE(IDI_ICON_WARNING), iconSz.cx, iconSz.cy);
+    m_EmulateFBIcon.SetWindowPos(HWND_TOP, 0, 0, iconSz.cx, iconSz.cy, SWP_NOMOVE | SWP_NOZORDER);
     m_EmulateFBIcon.SetBackroundBrush((HBRUSH)GetStockObject(WHITE_BRUSH));
 
     CComboBox frameBufferSwapComboBox(GetDlgItem(IDC_CMB_FRAMEBUFFER_SWAP));
diff --git a/src/GLideNUI-wtl/config-texture.cpp b/src/GLideNUI-wtl/config-texture.cpp
index 0edd411c..cde14eef 100644
--- a/src/GLideNUI-wtl/config-texture.cpp
+++ b/src/GLideNUI-wtl/config-texture.cpp
@@ -84,11 +84,11 @@ LRESULT CTextureEnhancementTab::OnScroll(UINT /*uMsg*/, WPARAM /*wParam*/, LPARA
         int Pos = m_TextureFilterCacheSpin.GetPos();
         if (Pos == 20)
         {
-            m_TextureFilterCacheTxt.SetWindowText(L"999 mb");
+            m_TextureFilterCacheTxt.SetWindowText(L"999 MB");
         }
         else
         {
-            m_TextureFilterCacheTxt.SetWindowText(FormatStrW(L"%d mb", Pos * 50).c_str());
+            m_TextureFilterCacheTxt.SetWindowText(FormatStrW(L"%d MB", Pos * 50).c_str());
         }
     }
     return 0;
diff --git a/src/GLideNUI-wtl/config-video.cpp b/src/GLideNUI-wtl/config-video.cpp
index 9582d846..ad1d534d 100644
--- a/src/GLideNUI-wtl/config-video.cpp
+++ b/src/GLideNUI-wtl/config-video.cpp
@@ -53,7 +53,7 @@ BOOL CVideoTab::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
     m_AliasingSlider.SetRangeMax(3);
 
     m_AnisotropicSlider.Attach(GetDlgItem(IDC_ANISOTROPIC_SLIDER));
-    m_AnisotropicSlider.SetTicFreq(1);
+    m_AnisotropicSlider.SetTicFreq(2);
     m_AnisotropicSlider.SetRangeMin(0);
     m_AnisotropicSlider.SetRangeMax(16);
 
@@ -63,8 +63,10 @@ BOOL CVideoTab::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
     aspectComboBox.AddString(L"Stretch");
     aspectComboBox.AddString(L"Try to adjust game to fit");
 
+    SIZE iconSz = { ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON) };
     m_AAInfoIcon.SubclassWindow(GetDlgItem(IDC_AA_INFO_ICON));
-    m_AAInfoIcon.SetIcon(MAKEINTRESOURCE(IDI_ICON_INFO), 16, 16);
+    m_AAInfoIcon.SetIcon(MAKEINTRESOURCE(IDI_ICON_INFO), iconSz.cx, iconSz.cy);
+    m_AAInfoIcon.SetWindowPos(HWND_TOP, 0, 0, iconSz.cx, iconSz.cy, SWP_NOMOVE | SWP_NOZORDER);
     m_AAInfoIcon.SetBackroundBrush((HBRUSH)GetStockObject(WHITE_BRUSH));
     return true;
 }
diff --git a/src/GLideNUI-wtl/config-video.h b/src/GLideNUI-wtl/config-video.h
index 70db50d3..6f79dc1b 100644
--- a/src/GLideNUI-wtl/config-video.h
+++ b/src/GLideNUI-wtl/config-video.h
@@ -13,6 +13,7 @@ public:
         MSG_WM_INITDIALOG(OnInitDialog)
         MESSAGE_HANDLER(WM_CTLCOLORDLG, OnColorStatic)
         MESSAGE_HANDLER(WM_CTLCOLORSTATIC, OnColorStatic)
+        MESSAGE_HANDLER(WM_PRINTCLIENT, OnColorStatic)
         NOTIFY_HANDLER_EX(IDC_TAB_OVERSCAN, TCN_SELCHANGE, OnOverscanTabChange)
         COMMAND_HANDLER_EX(IDC_CMB_FULL_SCREEN_RES, CBN_SELCHANGE, OnFullScreenChanged)
         COMMAND_HANDLER_EX(IDC_CHK_OVERSCAN, BN_CLICKED, OnOverscan)
diff --git a/src/GLideNUI-wtl/resource.h b/src/GLideNUI-wtl/resource.h
index 607f483f..d12151b3 100644
Binary files a/src/GLideNUI-wtl/resource.h and b/src/GLideNUI-wtl/resource.h differ