diff --git a/rpcs3/Emu/state.h b/rpcs3/Emu/state.h
index 3abdbef957..08475ba818 100644
--- a/rpcs3/Emu/state.h
+++ b/rpcs3/Emu/state.h
@@ -12,4 +12,4 @@ namespace rpcs3
 	};
 
 	extern state_t state;
-}
\ No newline at end of file
+}
diff --git a/rpcs3/Gui/GSFrame.cpp b/rpcs3/Gui/GSFrame.cpp
index f49721974e..210fac10a4 100644
--- a/rpcs3/Gui/GSFrame.cpp
+++ b/rpcs3/Gui/GSFrame.cpp
@@ -6,10 +6,6 @@
 #include "rpcs3.h"
 #include "Utilities/Timer.h"
 
-#ifndef _WIN32
-#include "frame_icon.xpm"
-#endif
-
 BEGIN_EVENT_TABLE(GSFrame, wxFrame)
 	EVT_PAINT(GSFrame::OnPaint)
 	EVT_SIZE(GSFrame::OnSize)
@@ -17,7 +13,7 @@ END_EVENT_TABLE()
 
 GSFrame::GSFrame(const wxString& title) : wxFrame(nullptr, wxID_ANY, "GSFrame[" + title + "]")
 {
-	SetIcon(wxICON(frame_icon));
+	SetIcon(wxGetApp().m_MainFrame->GetIcon());
 
 	CellVideoOutResolution res = ResolutionTable[ResolutionIdToNum((u32)rpcs3::state.config.rsx.resolution.value())];
 	SetClientSize(res.width, res.height);
diff --git a/rpcs3/Gui/KernelExplorer.cpp b/rpcs3/Gui/KernelExplorer.cpp
index 2de5a2e031..0d1a9f3508 100644
--- a/rpcs3/Gui/KernelExplorer.cpp
+++ b/rpcs3/Gui/KernelExplorer.cpp
@@ -23,7 +23,7 @@
 #include "KernelExplorer.h"
 
 KernelExplorer::KernelExplorer(wxWindow* parent) 
-	: wxFrame(parent, wxID_ANY, "Kernel Explorer", wxDefaultPosition, wxSize(700, 450))
+	: wxDialog(parent, wxID_ANY, "Kernel Explorer", wxDefaultPosition, wxSize(700, 450))
 {
 	this->SetBackgroundColour(wxColour(240,240,240)); //This fix the ugly background color under Windows
 	wxBoxSizer* s_panel = new wxBoxSizer(wxVERTICAL);
diff --git a/rpcs3/Gui/KernelExplorer.h b/rpcs3/Gui/KernelExplorer.h
index 85316badf4..195fe52cdd 100644
--- a/rpcs3/Gui/KernelExplorer.h
+++ b/rpcs3/Gui/KernelExplorer.h
@@ -2,7 +2,7 @@
 
 #include <wx/treectrl.h>
 
-class KernelExplorer : public wxFrame
+class KernelExplorer : public wxDialog
 {
 	wxTreeCtrl* m_tree;
 
diff --git a/rpcs3/Gui/LLEModulesManager.cpp b/rpcs3/Gui/LLEModulesManager.cpp
index 7f105ad5df..fc9eb85a7e 100644
--- a/rpcs3/Gui/LLEModulesManager.cpp
+++ b/rpcs3/Gui/LLEModulesManager.cpp
@@ -8,7 +8,8 @@
 #include "Emu/state.h"
 #include "Emu/FS/VFS.h"
 
-LLEModulesManagerFrame::LLEModulesManagerFrame(wxWindow* parent) : wxFrame(parent, wxID_ANY, "LLEModulesManagerFrame")
+LLEModulesManagerFrame::LLEModulesManagerFrame(wxWindow* parent)
+	: wxDialog(parent, wxID_ANY, "LLEModulesManagerFrame", wxDefaultPosition, wxSize(480, 640))
 {
 	wxBoxSizer *s_panel = new wxBoxSizer(wxVERTICAL);
 	wxBoxSizer *s_p_panel = new wxBoxSizer(wxVERTICAL);
@@ -108,4 +109,4 @@ void LLEModulesManagerFrame::OnSelectAll(wxCommandEvent& WXUNUSED(event), bool i
 		m_check_list->Check(i, is_checked);
 		UpdateSelection(i);
 	}
-}
\ No newline at end of file
+}
diff --git a/rpcs3/Gui/LLEModulesManager.h b/rpcs3/Gui/LLEModulesManager.h
index 24b268e685..c95516e393 100644
--- a/rpcs3/Gui/LLEModulesManager.h
+++ b/rpcs3/Gui/LLEModulesManager.h
@@ -2,7 +2,7 @@
 #include "Gui/FrameBase.h"
 #include <wx/checklst.h>
 
-class LLEModulesManagerFrame : public wxFrame
+class LLEModulesManagerFrame : public wxDialog
 {
 	wxCheckListBox *m_check_list;
 	std::vector<std::string> m_funcs;
@@ -12,4 +12,4 @@ public:
 	void Refresh();
 	void UpdateSelection(int index);
 	void OnSelectAll(wxCommandEvent& WXUNUSED(event), bool is_checked);
-};
\ No newline at end of file
+};
diff --git a/rpcs3/Gui/MemoryStringSearcher.cpp b/rpcs3/Gui/MemoryStringSearcher.cpp
index 479a884807..2138a1ece2 100644
--- a/rpcs3/Gui/MemoryStringSearcher.cpp
+++ b/rpcs3/Gui/MemoryStringSearcher.cpp
@@ -9,7 +9,7 @@
 #include <wx/notebook.h>
 
 MemoryStringSearcher::MemoryStringSearcher(wxWindow* parent)
-	: wxFrame(parent, wxID_ANY, "String Searcher", wxDefaultPosition, wxSize(545, 64))
+	: wxDialog(parent, wxID_ANY, "String Searcher", wxDefaultPosition, wxSize(545, 64))
 	, exit(false)
 {
 	this->SetBackgroundColour(wxColour(240,240,240));
diff --git a/rpcs3/Gui/MemoryStringSearcher.h b/rpcs3/Gui/MemoryStringSearcher.h
index f0928afe2d..109b4d761c 100644
--- a/rpcs3/Gui/MemoryStringSearcher.h
+++ b/rpcs3/Gui/MemoryStringSearcher.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <wx/listctrl.h>
 
-class MemoryStringSearcher : public wxFrame
+class MemoryStringSearcher : public wxDialog
 {
 	wxTextCtrl* t_addr;
 	wxBoxSizer* s_panel;
diff --git a/rpcs3/Gui/MemoryViewer.cpp b/rpcs3/Gui/MemoryViewer.cpp
index 856fbb8090..3489f2a33c 100644
--- a/rpcs3/Gui/MemoryViewer.cpp
+++ b/rpcs3/Gui/MemoryViewer.cpp
@@ -5,7 +5,7 @@
 #include "MemoryViewer.h"
 
 MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent) 
-	: wxFrame(parent, wxID_ANY, "Memory Viewer", wxDefaultPosition, wxSize(700, 450))
+	: wxDialog(parent, wxID_ANY, "Memory Viewer", wxDefaultPosition, wxSize(700, 450))
 {
 	exit = false;
 	m_addr = 0;
@@ -22,7 +22,7 @@ MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent)
 	wxStaticBoxSizer* s_tools_mem = new wxStaticBoxSizer(wxHORIZONTAL, this, "Memory Viewer Options");
 
 	wxStaticBoxSizer* s_tools_mem_addr = new wxStaticBoxSizer(wxHORIZONTAL, this, "Address");
-	t_addr = new wxTextCtrl(this, wxID_ANY, "00000000", wxDefaultPosition, wxSize(60, -1));
+	t_addr = new wxTextCtrl(this, wxID_ANY, "00000000", wxDefaultPosition, wxSize(60, -1), wxTE_PROCESS_ENTER);
 	t_addr->SetMaxLength(8);
 	s_tools_mem_addr->Add(t_addr);
 
@@ -124,8 +124,8 @@ MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent)
 	//Events
 	t_addr  ->Bind(wxEVT_TEXT_ENTER, &MemoryViewerPanel::OnChangeToolsAddr, this);
 	sc_bytes->Bind(wxEVT_TEXT_ENTER, &MemoryViewerPanel::OnChangeToolsBytes, this);
-	t_addr  ->Bind(wxEVT_TEXT_ENTER, &MemoryViewerPanel::OnChangeToolsAddr, this);
-	sc_bytes->Bind(wxEVT_TEXT_ENTER, &MemoryViewerPanel::OnChangeToolsBytes, this);
+	//t_addr  ->Bind(wxEVT_TEXT_ENTER, &MemoryViewerPanel::OnChangeToolsAddr, this);
+	//sc_bytes->Bind(wxEVT_TEXT_ENTER, &MemoryViewerPanel::OnChangeToolsBytes, this);
 	sc_bytes->Bind(wxEVT_SPINCTRL,   &MemoryViewerPanel::OnChangeToolsBytes, this);
 
 	b_prev ->Bind(wxEVT_BUTTON, &MemoryViewerPanel::Prev, this);
@@ -225,8 +225,7 @@ void MemoryViewerPanel::ShowImage(wxWindow* parent, u32 addr, int mode, u32 widt
 {
 	wxString title = wxString::Format("Raw Image @ 0x%x", addr);
 	
-	wxFrame* f_image_viewer = new wxFrame(parent, wxID_ANY,  title, wxDefaultPosition, wxDefaultSize,
-		wxSYSTEM_MENU | wxMINIMIZE_BOX | wxCLOSE_BOX | wxCAPTION | wxCLIP_CHILDREN);
+	wxDialog* f_image_viewer = new wxDialog(parent, wxID_ANY,  title, wxDefaultPosition, wxDefaultSize, wxMINIMIZE_BOX | wxCLOSE_BOX | wxCAPTION | wxCLIP_CHILDREN);
 	f_image_viewer->SetBackgroundColour(wxColour(240,240,240)); //This fix the ugly background color under Windows
 	f_image_viewer->SetAutoLayout(true);
 	f_image_viewer->SetClientSize(wxSize(width, height));
diff --git a/rpcs3/Gui/MemoryViewer.h b/rpcs3/Gui/MemoryViewer.h
index 3f73d368c4..877dd7a3b6 100644
--- a/rpcs3/Gui/MemoryViewer.h
+++ b/rpcs3/Gui/MemoryViewer.h
@@ -2,7 +2,7 @@
 
 #include <wx/listctrl.h>
 
-class MemoryViewerPanel : public wxFrame
+class MemoryViewerPanel : public wxDialog
 {
 	u32 m_addr;
 	u32 m_colcount;
diff --git a/rpcs3/Gui/MsgDialog.cpp b/rpcs3/Gui/MsgDialog.cpp
index 8f63aaed04..6013db337e 100644
--- a/rpcs3/Gui/MsgDialog.cpp
+++ b/rpcs3/Gui/MsgDialog.cpp
@@ -28,10 +28,10 @@ void MsgDialogFrame::Create(const std::string& msg)
 	m_button_yes = nullptr;
 	m_button_no = nullptr;
 
-	m_dialog = new wxDialog(nullptr, wxID_ANY, type.se_normal ? "" : "Error", wxDefaultPosition, wxDefaultSize);
+	m_dialog = new wxDialog(nullptr, wxID_ANY, type.se_normal ? "Normal dialog" : "Error dialog", wxDefaultPosition, wxDefaultSize);
 
 	m_dialog->SetExtraStyle(m_dialog->GetExtraStyle() | wxWS_EX_TRANSIENT);
-	m_dialog->SetTransparent(type.bg_invisible ? 255 : 160);
+	m_dialog->SetTransparent(type.bg_invisible ? 255 : 192);
 
 	m_sizer1 = new wxBoxSizer(wxVERTICAL);
 
diff --git a/rpcs3/Gui/RSXDebugger.cpp b/rpcs3/Gui/RSXDebugger.cpp
index cbba399569..47d6d7f611 100644
--- a/rpcs3/Gui/RSXDebugger.cpp
+++ b/rpcs3/Gui/RSXDebugger.cpp
@@ -28,7 +28,7 @@ enum GCMEnumTypes
 };
 
 RSXDebugger::RSXDebugger(wxWindow* parent) 
-	: wxFrame(parent, wxID_ANY, "RSX Debugger", wxDefaultPosition, wxSize(700, 450))
+	: wxDialog(parent, wxID_ANY, "RSX Debugger", wxDefaultPosition, wxSize(700, 450))
 	, m_item_count(37)
 	, m_addr(0x0)
 	, m_cur_texture(0)
diff --git a/rpcs3/Gui/RSXDebugger.h b/rpcs3/Gui/RSXDebugger.h
index 5b8a5e82b0..c0baafe715 100644
--- a/rpcs3/Gui/RSXDebugger.h
+++ b/rpcs3/Gui/RSXDebugger.h
@@ -2,7 +2,7 @@
 
 #include <wx/listctrl.h>
 
-class RSXDebugger : public wxFrame
+class RSXDebugger : public wxDialog
 {
 	u32 m_addr;
 
diff --git a/rpcs3/config.cpp b/rpcs3/config.cpp
index 3544217485..83307285a9 100644
--- a/rpcs3/config.cpp
+++ b/rpcs3/config.cpp
@@ -51,4 +51,4 @@ namespace rpcs3
 	}
 
 	config_t config{ "rpcs3.new.ini" };
-}
\ No newline at end of file
+}
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index 98edb9baf5..5f0dc350ed 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -345,8 +345,10 @@
     <ClInclude Include="Gui\KernelExplorer.h" />
     <ClInclude Include="Gui\LLEModulesManager.h" />
     <ClInclude Include="Gui\MainFrame.h" />
+    <ClInclude Include="Gui\MemoryStringSearcher.h" />
     <ClInclude Include="Gui\MemoryViewer.h" />
     <ClInclude Include="Gui\MsgDialog.h" />
+    <ClInclude Include="Gui\PADManager.h" />
     <ClInclude Include="Gui\RegisterEditor.h" />
     <ClInclude Include="Gui\RSXDebugger.h" />
     <ClInclude Include="Gui\SaveDataDialog.h" />
diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters
index 14de4716da..8d15491186 100644
--- a/rpcs3/rpcs3.vcxproj.filters
+++ b/rpcs3/rpcs3.vcxproj.filters
@@ -219,6 +219,12 @@
     <ClInclude Include="Gui\SignInDialog.h">
       <Filter>Gui</Filter>
     </ClInclude>
+    <ClInclude Include="Gui\MemoryStringSearcher.h">
+      <Filter>Gui</Filter>
+    </ClInclude>
+    <ClInclude Include="Gui\PADManager.h">
+      <Filter>Gui</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="rpcs3.ico" />