diff --git a/pgadmin/dlg/dlgFunction.cpp b/pgadmin/dlg/dlgFunction.cpp
index e06d879..460b18f 100644
--- a/pgadmin/dlg/dlgFunction.cpp
+++ b/pgadmin/dlg/dlgFunction.cpp
@@ -940,7 +940,7 @@ wxString dlgFunction::GetSql()
     }
     else
     {
-        if (cbOwner->GetGuessedSelection() > 0)
+        if (cbOwner->GetCurrentSelection() > 0)
             AppendOwnerNew(sql,wxT("FUNCTION ") + name);
     }
 
diff --git a/pgadmin/dlg/dlgProperty.cpp b/pgadmin/dlg/dlgProperty.cpp
index 6107d38..55e15f1 100644
--- a/pgadmin/dlg/dlgProperty.cpp
+++ b/pgadmin/dlg/dlgProperty.cpp
@@ -142,7 +142,7 @@ dlgProperty::dlgProperty(pgaFactory *f, frmMain *frame, const wxString &resName)
     txtOid = CTRL_TEXT("txtOID");
     txtComment = CTRL_TEXT("txtComment");
     cbOwner = CTRL_COMBOBOX2("cbOwner");
-    cbClusterSet = CTRL_COMBOBOX2("cbClusterSet");
+    cbClusterSet = CTRL_COMBOBOX1("cbClusterSet");
     
     wxString db = wxT("Database");
     wxString ts = wxT("Tablespace");
diff --git a/pgadmin/dlg/dlgSelectConnection.cpp b/pgadmin/dlg/dlgSelectConnection.cpp
index 37d0633..45e95e4 100644
--- a/pgadmin/dlg/dlgSelectConnection.cpp
+++ b/pgadmin/dlg/dlgSelectConnection.cpp
@@ -9,11 +9,14 @@
 //
 //////////////////////////////////////////////////////////////////////////
 
-
-
 // App headers
 #include "pgAdmin3.h"
 
+// wxWindows headers
+#include <wx/wx.h>
+#include <wx/bmpcbox.h>
+
+// App headers
 #include "frm/frmMain.h"
 #include "dlg/dlgSelectConnection.h"
 #include "dlg/dlgConnect.h"
@@ -55,12 +58,12 @@ DialogWithHelp(form)
 		txtUsername->Hide();
 		btnOK->Enable(false);
 		cbServer = new ctlComboBoxFix(this, CTRLID_CBSERVER, ConvertDialogToPixels(wxPoint(65,5)), ConvertDialogToPixels(wxSize(135,12)), wxCB_DROPDOWN | wxCB_READONLY);
-		cbDatabase = new ctlComboBoxFix(this, CTRLID_CBDATABASE, ConvertDialogToPixels(wxPoint(65,20)), ConvertDialogToPixels(wxSize(135,12)), wxCB_DROPDOWN | wxCB_READONLY);
+		cbDatabase = new wxComboBox(this, CTRLID_CBDATABASE, wxEmptyString, ConvertDialogToPixels(wxPoint(65,20)), ConvertDialogToPixels(wxSize(135,12)), NULL, wxCB_DROPDOWN | wxCB_READONLY);
 	}
 	else
 	{
 		cbServer = new ctlComboBoxFix(this, CTRLID_CBSERVER, ConvertDialogToPixels(wxPoint(65,5)), ConvertDialogToPixels(wxSize(135,12)), wxCB_DROPDOWN);
-		cbDatabase = new ctlComboBoxFix(this, CTRLID_CBDATABASE, ConvertDialogToPixels(wxPoint(65,20)), ConvertDialogToPixels(wxSize(135,12)), wxCB_DROPDOWN);
+		cbDatabase = new wxComboBox(this, CTRLID_CBDATABASE, wxEmptyString, ConvertDialogToPixels(wxPoint(65,20)), ConvertDialogToPixels(wxSize(135,12)), NULL, wxCB_DROPDOWN);
 		cbServer->SetValue(settings->Read(wxT("QuickConnect/server"), wxEmptyString));
 		cbDatabase->SetValue(settings->Read(wxT("QuickConnect/database"), wxEmptyString));
 		txtUsername->SetValue(settings->Read(wxT("QuickConnect/username"), wxEmptyString));
@@ -245,7 +248,7 @@ pgConn *dlgSelectConnection::CreateConn(wxString& server, wxString& dbname, wxSt
 	return newconn;
 }
 
-int dlgSelectConnection::Go(pgConn *conn, ctlComboBoxFix *cb)
+int dlgSelectConnection::Go(pgConn *conn, wxBitmapComboBox *cb)
 {
     cbConnection=cb;
 	if (mainForm != NULL)
diff --git a/pgadmin/frm/frmEditGrid.cpp b/pgadmin/frm/frmEditGrid.cpp
index 1323961..5fe642b 100644
--- a/pgadmin/frm/frmEditGrid.cpp
+++ b/pgadmin/frm/frmEditGrid.cpp
@@ -145,9 +145,9 @@ frmEditGrid::frmEditGrid(frmMain *form, const wxString& _title, pgConn *_conn, p
 
     // Setup the limit bar
 #ifndef __WXMAC__
-    cbLimit = new ctlComboBoxFix(this, CTRLID_LIMITCOMBO, wxPoint(0, 0), wxSize(GetCharWidth()*12, -1), wxCB_DROPDOWN);
+    cbLimit = new wxComboBox(this, CTRLID_LIMITCOMBO, wxEmptyString, wxPoint(0, 0), wxSize(GetCharWidth()*12, -1), NULL, wxCB_DROPDOWN);
 #else
-    cbLimit = new ctlComboBoxFix(this, CTRLID_LIMITCOMBO, wxPoint(0, 0), wxSize(GetCharWidth()*24, -1), wxCB_DROPDOWN);
+    cbLimit = new wxComboBox(this, CTRLID_LIMITCOMBO, wxEmptyString, wxPoint(0, 0), wxSize(GetCharWidth()*24, -1), NULL, wxCB_DROPDOWN);
 #endif
     cbLimit->Append(_("No limit"));
     cbLimit->Append(_("1000 rows"));
diff --git a/pgadmin/frm/frmQuery.cpp b/pgadmin/frm/frmQuery.cpp
index 8b6c9e3..e9f4d64 100644
--- a/pgadmin/frm/frmQuery.cpp
+++ b/pgadmin/frm/frmQuery.cpp
@@ -22,6 +22,7 @@
 #include <wx/textctrl.h>
 #include <wx/timer.h>
 #include <wx/aui/aui.h>
+#include <wx/bmpcbox.h>
 
 // App headers
 #include "frm/frmMain.h"
@@ -388,9 +389,9 @@ pgsTimer(new pgScriptTimer(this))
     toolBar->Realize();
 
     // Add the database selection bar
-    cbConnection = new ctlComboBoxFix(this, CTRLID_CONNECTION, wxDefaultPosition, wxSize(-1, -1), wxCB_READONLY|wxCB_DROPDOWN);
-    cbConnection->Append(conn->GetName(), (void*)conn);
-    cbConnection->Append(_("<new connection>"), (void*)0);
+    cbConnection = new wxBitmapComboBox(this, CTRLID_CONNECTION, wxEmptyString, wxDefaultPosition, wxSize(-1, -1), NULL, wxCB_READONLY|wxCB_DROPDOWN);
+    cbConnection->Append(conn->GetName(), CreateBitmap(GetServerColour()), (void*)conn);
+    cbConnection->Append(_("<new connection>"), wxNullBitmap, (void*)0);
 
     //Create SQL editor notebook
     sqlNotebook = new wxNotebook(this, CTL_NTBKCENTER, wxDefaultPosition, wxDefaultSize);
@@ -897,7 +898,7 @@ void frmQuery::OnChangeConnection(wxCommandEvent &ev)
     if(!IsVisible() && !loading)
         return;
 
-    unsigned int sel=cbConnection->GetCurrentSelection();
+    unsigned int sel=cbConnection->GetSelection();
     if (sel == cbConnection->GetCount()-1)
     {
         // new Connection
@@ -908,7 +909,7 @@ void frmQuery::OnChangeConnection(wxCommandEvent &ev)
             conn = dlg.CreateConn();
             if (conn)
             {
-                cbConnection->Insert(conn->GetName(), sel, (void*)conn);
+                cbConnection->Insert(conn->GetName(), CreateBitmap(GetServerColour()), sel, (void*)conn);
                 cbConnection->SetSelection(sel);
                 OnChangeConnection(ev);
             }
@@ -2550,6 +2551,38 @@ void frmQuery::OnUncommentText(wxCommandEvent& event)
     sqlQuery->BlockComment(true);
 }
 
+wxBitmap frmQuery::CreateBitmap(const wxColour& colour)
+{
+    const int w = 10, h = 10;
+
+    wxMemoryDC dc;
+    wxBitmap bmp(w, h);
+    dc.SelectObject(bmp);
+    dc.SetBrush(wxBrush(colour));
+    dc.DrawRectangle(0, 0, w, h);
+
+    return bmp;
+}
+
+wxColour frmQuery::GetServerColour()
+{
+    wxColour tmp = wxNullColour;
+    if (mainForm != NULL)
+    {
+        treeObjectIterator servers(mainForm->GetBrowser(), mainForm->GetServerCollection());
+        pgServer *s;
+
+        while ((s=(pgServer*)servers.GetNextObject()) != 0)
+        {
+            if (s->GetConnected() && s->GetConnection()->GetHost() == conn->GetHost() && s->GetConnection()->GetPort() == conn->GetPort())
+            {
+                tmp = wxColour(s->GetColour());
+            }
+        }
+    }
+    return tmp;
+}
+
 ///////////////////////////////////////////////////////
 
 wxWindow *queryToolBaseFactory::StartDialogSql(frmMain *form, pgObject *obj, const wxString &sql)
diff --git a/pgadmin/frm/frmStatus.cpp b/pgadmin/frm/frmStatus.cpp
index 51b26f3..87778be 100644
--- a/pgadmin/frm/frmStatus.cpp
+++ b/pgadmin/frm/frmStatus.cpp
@@ -247,7 +247,7 @@ frmStatus::frmStatus(frmMain *form, const wxString& _title, pgConn *conn) : pgFr
     btnRotateLog = new wxButton(toolBar, CTL_ROTATEBTN, _("Rotate"));
     toolBar->AddControl(btnRotateLog);
     toolBar->AddSeparator();
-    cbRate = new ctlComboBoxFix(toolBar, CTL_RATECBO, wxDefaultPosition, wxSize(-1, -1), wxCB_READONLY|wxCB_DROPDOWN);
+    cbRate = new wxComboBox(toolBar, CTL_RATECBO, wxEmptyString, wxDefaultPosition, wxSize(-1, -1), NULL, wxCB_READONLY|wxCB_DROPDOWN);
     toolBar->AddControl(cbRate);
     toolBar->AddSeparator();
     cbDatabase = new ctlComboBoxFix(toolBar, CTRLID_DATABASE, wxDefaultPosition, wxSize(-1, -1), wxCB_READONLY|wxCB_DROPDOWN);
diff --git a/pgadmin/include/dlg/dlgProperty.h b/pgadmin/include/dlg/dlgProperty.h
index 0565128..3ba7419 100644
--- a/pgadmin/include/dlg/dlgProperty.h
+++ b/pgadmin/include/dlg/dlgProperty.h
@@ -128,7 +128,7 @@ protected:
     wxNotebook *nbNotebook;
     wxTextCtrl *txtName, *txtOid, *txtComment;
     ctlComboBox *cbOwner;
-    ctlComboBox *cbClusterSet;
+    wxComboBox *cbClusterSet;
     wxCheckBox *chkReadOnly;
     ctlSQLBox *sqlTextField1;
     ctlSQLBox *sqlTextField2;
diff --git a/pgadmin/include/dlg/dlgSelectConnection.h b/pgadmin/include/dlg/dlgSelectConnection.h
index b032ee5..41607c6 100644
--- a/pgadmin/include/dlg/dlgSelectConnection.h
+++ b/pgadmin/include/dlg/dlgSelectConnection.h
@@ -12,6 +12,7 @@
 #ifndef DLGSELECTCONNECTION_H
 #define DLGSELECTCONNECTION_H
 
+#include <wx/bmpcbox.h>
 #include "dlg/dlgClasses.h"
 
 class pgServer;
@@ -28,7 +29,7 @@ public:
 	wxString GetServerName();
     wxString GetDatabase();
 
-    int Go(pgConn *conn, ctlComboBoxFix *cb);
+    int Go(pgConn *conn, wxBitmapComboBox *cb);
     
 private:
     void OnChangeServer(wxCommandEvent& ev);
@@ -38,9 +39,9 @@ private:
     void OnCancel(wxCommandEvent& ev);
 
     pgServer *remoteServer;
-    ctlComboBoxFix *cbConnection;
+    wxBitmapComboBox *cbConnection;
 	ctlComboBoxFix *cbServer;
-	ctlComboBoxFix *cbDatabase;
+	wxComboBox     *cbDatabase;
 
     DECLARE_EVENT_TABLE()
 };
diff --git a/pgadmin/include/frm/frmEditGrid.h b/pgadmin/include/frm/frmEditGrid.h
index 3b51944..a5f6434 100644
--- a/pgadmin/include/frm/frmEditGrid.h
+++ b/pgadmin/include/frm/frmEditGrid.h
@@ -241,7 +241,7 @@ private:
     pgQueryThread *thread;
     wxMenu *fileMenu, *editMenu, *viewMenu, *toolsMenu, *helpMenu;
     ctlMenuToolbar *toolBar;
-    ctlComboBoxFix *cbLimit;
+    wxComboBox *cbLimit;
     wxTextCtrl *scratchPad;
 
     char relkind;
diff --git a/pgadmin/include/frm/frmQuery.h b/pgadmin/include/frm/frmQuery.h
index 5a70f82..886e483 100644
--- a/pgadmin/include/frm/frmQuery.h
+++ b/pgadmin/include/frm/frmQuery.h
@@ -21,6 +21,7 @@
 
 #include <wx/sstream.h>
 #include <wx/txtstrm.h>
+#include <wx/bmpcbox.h>
 
 // wxAUI
 #include <wx/aui/aui.h>
@@ -80,7 +81,7 @@ private:
     ctlSQLResult *sqlResult;
     ExplainCanvas *explainCanvas;
     wxTextCtrl *msgResult, *msgHistory;
-    ctlComboBoxFix *cbConnection;
+    wxBitmapComboBox *cbConnection;
     wxTextCtrl *scratchPad;
 
 	// Query timing/status update
@@ -188,6 +189,10 @@ private:
     void OnMacroInvoke(wxCommandEvent& event);
     void OnMacroManage(wxCommandEvent& event);
     void UpdateMacrosList();
+
+    wxBitmap CreateBitmap(const wxColour& colour);
+    wxColour GetServerColour();
+
     wxWindow *currentControl();
     wxMenu *queryMenu;
     wxMenu *favouritesMenu;
diff --git a/pgadmin/include/frm/frmStatus.h b/pgadmin/include/frm/frmStatus.h
index 92c3ad9..bc82e6d 100644
--- a/pgadmin/include/frm/frmStatus.h
+++ b/pgadmin/include/frm/frmStatus.h
@@ -115,7 +115,7 @@ private:
     
     int currentPane;
 
-    ctlComboBoxFix    *cbRate;
+    wxComboBox    *cbRate;
     wxComboBox    *cbLogfiles;
     wxButton      *btnRotateLog;
     ctlComboBoxFix *cbDatabase;
diff --git a/pgadmin/include/utils/misc.h b/pgadmin/include/utils/misc.h
index 5072e19..b671606 100644
--- a/pgadmin/include/utils/misc.h
+++ b/pgadmin/include/utils/misc.h
@@ -68,6 +68,7 @@ extern sysSettings *settings;
 #define CTRL_LISTBOX(id)        (XRCCTRL(*this, id, wxListBox))
 #define CTRL_LISTCTRL(id)       (XRCCTRL(*this, id, wxListCtrl))
 #define CTRL_COMBOBOX(id)       ((ctlComboBoxFix*)(XRCCTRL(*this, id, wxComboBox)))
+#define CTRL_COMBOBOX1(id)      (XRCCTRL(*this, id, wxComboBox))
 #define CTRL_LISTVIEW(id)       ((ctlListView*)(XRCCTRL(*this, id, wxListCtrl)))
 #define CTRL_COMBOBOX2(id)      (XRCCTRL(*this, id, ctlComboBox))
 #define CTRL_CHOICE(id)         (XRCCTRL(*this, id, wxChoice))
