diff --git a/src/common/cell_renderer_image.py b/src/cell_renderer_image.py
similarity index 100%
rename from src/common/cell_renderer_image.py
rename to src/cell_renderer_image.py
diff --git a/src/config.py b/src/config.py
index 78aa477fb..30c76b41c 100644
--- a/src/config.py
+++ b/src/config.py
@@ -24,11 +24,10 @@ import os
 import common.sleepy
 
 import dialogs
-import gtkgui
+import cell_renderer_image
 from common import gajim
 from common import connection
 from common import i18n
-from common import cell_renderer_image
 
 _ = i18n._
 APP = i18n.APP
diff --git a/src/dialogs.py b/src/dialogs.py
index 9c5d064bf..94cc74f82 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -27,8 +27,6 @@ APP = i18n.APP
 gtk.glade.bindtextdomain (APP, i18n.DIR)
 gtk.glade.textdomain (APP)
 
-import gtkgui
-
 GTKGUI_GLADE='gtkgui.glade'
 
 class Vcard_information_window:
diff --git a/src/groupchat_window.py b/src/groupchat_window.py
index e032d84e7..72ffdf589 100644
--- a/src/groupchat_window.py
+++ b/src/groupchat_window.py
@@ -24,9 +24,9 @@ import gobject
 import time
 import dialogs
 import chat
+import cell_renderer_image
 from common import gajim
 from common import i18n
-from common import cell_renderer_image
 
 _ = i18n._
 APP = i18n.APP
diff --git a/src/roster_window.py b/src/roster_window.py
index 5461d12c1..12b8fa0d3 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -30,10 +30,10 @@ import groupchat_window
 import history_window
 import dialogs
 import config
+import cell_renderer_image
 
 from gtkgui import User
 from common import gajim
-from common import cell_renderer_image
 from common import i18n
 
 _ = i18n._