diff --git a/gajim/filetransfers_window.py b/gajim/filetransfers_window.py
index 0609b46d0..e4d541643 100644
--- a/gajim/filetransfers_window.py
+++ b/gajim/filetransfers_window.py
@@ -33,7 +33,6 @@ from gi.repository import Pango
 from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5
 
 from gajim import gtkgui_helpers
-from gajim import tooltips
 
 from gajim.common import app
 from gajim.common import helpers
@@ -50,6 +49,7 @@ from gajim.gtk.dialogs import FTOverwriteConfirmationDialog
 from gajim.gtk.dialogs import NonModalConfirmationDialog
 from gajim.gtk.filechoosers import FileSaveDialog
 from gajim.gtk.filechoosers import FileChooserDialog
+from gajim.gtk.tooltips import FileTransfersTooltip
 
 log = logging.getLogger('gajim.filetransfer_window')
 
@@ -152,7 +152,7 @@ class FileTransfersWindow:
         # Tooltip
         self.tree.connect('query-tooltip', self._query_tooltip)
         self.tree.set_has_tooltip(True)
-        self.tooltip = tooltips.FileTransfersTooltip()
+        self.tooltip = FileTransfersTooltip()
 
         self.file_transfers_menu = self.xml.get_object('file_transfers_menu')
         self.open_folder_menuitem = self.xml.get_object('open_folder_menuitem')
diff --git a/gajim/groupchat_control.py b/gajim/groupchat_control.py
index 33754bcda..51cd5cd68 100644
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -43,7 +43,6 @@ from gi.repository import Gio
 from gajim import gtkgui_helpers
 from gajim import gui_menu_builder
 from gajim import message_control
-from gajim import tooltips
 from gajim import config
 from gajim import vcard
 from gajim import dataforms_widget
@@ -77,6 +76,7 @@ from gajim.gtk.dialogs import InputDialog
 from gajim.gtk.dialogs import ChangeNickDialog
 from gajim.gtk.filechoosers import AvatarChooserDialog
 from gajim.gtk.add_contact import AddNewContactWindow
+from gajim.gtk.tooltips import GCTooltip
 
 
 log = logging.getLogger('gajim.groupchat_control')
@@ -495,7 +495,7 @@ class GroupchatControl(ChatControlBase):
         self.banner_actionbar.pack_start(self.subject_button)
 
         # GC Roster tooltip
-        self.gc_tooltip = tooltips.GCTooltip()
+        self.gc_tooltip = GCTooltip()
 
         self.control_menu = gui_menu_builder.get_groupchat_menu(self.control_id)
         settings_menu = self.xml.get_object('settings_menu')
diff --git a/gajim/gtk/statusicon.py b/gajim/gtk/statusicon.py
index ba2c05c27..e69d4b4ff 100644
--- a/gajim/gtk/statusicon.py
+++ b/gajim/gtk/statusicon.py
@@ -24,13 +24,13 @@ import os
 from gi.repository import Gtk
 
 from gajim import dialogs
-from gajim import tooltips
 from gajim import gtkgui_helpers
 from gajim.common import app
 from gajim.common import helpers
 from gajim.common.i18n import _
 from gajim.gtk.util import get_builder
 from gajim.gtk.single_message import SingleMessageWindow
+from gajim.gtk.tooltips import NotificationAreaTooltip
 
 
 class StatusIcon:
@@ -50,7 +50,7 @@ class StatusIcon:
         self._ui.connect_signals(self)
         self.popup_menus = []
         self.status_icon = None
-        self.tooltip = tooltips.NotificationAreaTooltip()
+        self.tooltip = NotificationAreaTooltip()
 
     def subscribe_events(self):
         """
diff --git a/gajim/tooltips.py b/gajim/gtk/tooltips.py
similarity index 99%
rename from gajim/tooltips.py
rename to gajim/gtk/tooltips.py
index cdd84e297..ec146eaa1 100644
--- a/gajim/tooltips.py
+++ b/gajim/gtk/tooltips.py
@@ -41,7 +41,7 @@ from gajim.common import helpers
 from gajim.common.i18n import Q_
 from gajim.common.i18n import _
 
-log = logging.getLogger('gajim.tooltips')
+log = logging.getLogger('gajim.gtk.tooltips')
 
 
 class StatusTable:
diff --git a/gajim/roster_window.py b/gajim/roster_window.py
index 0b7c309bb..07f0ff035 100644
--- a/gajim/roster_window.py
+++ b/gajim/roster_window.py
@@ -50,7 +50,6 @@ from gajim import disco
 from gajim import gtkgui_helpers
 from gajim import gui_menu_builder
 from gajim import cell_renderer_image
-from gajim import tooltips
 from gajim import message_control
 from gajim import adhoc_commands
 
@@ -82,6 +81,7 @@ from gajim.gtk.account_wizard import AccountCreationWizard
 from gajim.gtk.service_registration import ServiceRegistration
 from gajim.gtk.history import HistoryWindow
 from gajim.gtk.accounts import AccountsWindow
+from gajim.gtk.tooltips import RosterTooltip
 
 
 log = logging.getLogger('gajim.roster')
@@ -5841,7 +5841,7 @@ class RosterWindow:
 
         self.collapsed_rows = app.config.get('collapsed_rows').split('\t')
         self.tree.set_has_tooltip(True)
-        self.tree.set_tooltip_window(tooltips.RosterTooltip(self.window))
+        self.tree.set_tooltip_window(RosterTooltip(self.window))
         self.current_tooltip = None
         self.tree.connect('query-tooltip', self.query_tooltip)
         # Workaround: For strange reasons signal is behaving like row-changed