diff --git a/src/deluge_core.cpp b/src/deluge_core.cpp
index 551a5e046..f5c5fa709 100644
--- a/src/deluge_core.cpp
+++ b/src/deluge_core.cpp
@@ -1313,7 +1313,7 @@ static PyObject *torrent_proxy_settings(PyObject *self, PyObject *args)
 	libtorrent::proxy_settings::proxy_type	proxytype;
 	bool peerproxy, webseedproxy, trackerproxy, dhtproxy;
 
-	PyArg_ParseTuple(args, "sssii", &server, &login, &pasw, &portnum, &proxytype, &peerproxy, &webseedproxy, &trackerproxy, &dhtproxy);
+	PyArg_ParseTuple(args, "sssiibbbb", &server, &login, &pasw, &portnum, &proxytype, &peerproxy, &webseedproxy, &trackerproxy, &dhtproxy);
     
 	M_proxy_settings->type = proxytype;
 	M_proxy_settings->username = login;
@@ -1321,20 +1321,20 @@ static PyObject *torrent_proxy_settings(PyObject *self, PyObject *args)
 	M_proxy_settings->hostname = server;
 	M_proxy_settings->port = portnum;
 	
-	if (peerproxy){
-	M_ses->set_peer_proxy(*M_proxy_settings);
+	if (peerproxy) {
+		M_ses->set_peer_proxy(*M_proxy_settings);
 	}
 
-	if (webseedproxy){
-	M_ses->set_web_seed_proxy(*M_proxy_settings);
+	if (webseedproxy) {
+		M_ses->set_web_seed_proxy(*M_proxy_settings);
 	}
 
-	if (trackerproxy){
-	M_ses->set_tracker_proxy(*M_proxy_settings);
+	if (trackerproxy) {
+		M_ses->set_tracker_proxy(*M_proxy_settings);
 	}
 
-	if (dhtproxy){
-	M_ses->set_dht_proxy(*M_proxy_settings);
+	if (dhtproxy) {
+		M_ses->set_dht_proxy(*M_proxy_settings);
 	}
 
 	Py_INCREF(Py_None); return Py_None;
diff --git a/src/dgtk.py b/src/dgtk.py
index 0772d4205..99ac2ec63 100644
--- a/src/dgtk.py
+++ b/src/dgtk.py
@@ -105,6 +105,9 @@ def add_toggle_column(view, header, cid, toggled_signal=None):
 
 def add_texticon_column(view, header, icon_col, text_col):
 	column = gtk.TreeViewColumn(header)
+	column.set_clickable(True)
+	column.set_resizable(True)
+	column.set_expand(False)
 	render = gtk.CellRendererPixbuf()
 	column.pack_start(render, expand=False)
 	column.add_attribute(render, 'pixbuf', icon_col)