diff --git a/syncplay/constants.py b/syncplay/constants.py
index 3a8753f..53bd345 100644
--- a/syncplay/constants.py
+++ b/syncplay/constants.py
@@ -18,6 +18,7 @@ SHOW_DIFFERENT_ROOM_OSD = False # Show OSD notifications for events relating to
 LIST_RELATIVE_CONFIGS = True # Print list of relative configs loaded
 SHOW_CONTACT_INFO = True # Displays dev contact details below list in GUI
 SHOW_BUTTON_LABELS = True # If disabled, only shows icons for main GUI buttons
+SHOW_TOOLTIPS = True
 
 #Changing these might be ok
 REWIND_THRESHOLD = 4
@@ -31,7 +32,6 @@ RECONNECT_RETRIES = 10
 SERVER_STATE_INTERVAL = 1
 WARNING_OSD_MESSAGES_LOOP_INTERVAL = 1
 SHOW_REWIND_ON_DESYNC_CHECKBOX = False
-SHOW_TOOLTIPS = True
 MERGE_PLAYPAUSE_BUTTONS = False
 SYNC_ON_PAUSE = True # Client seek to global position - subtitles may disappear on some media players
 #Usually there's no need to adjust these
diff --git a/syncplay/messages.py b/syncplay/messages.py
index 24a0f7e..e534525 100644
--- a/syncplay/messages.py
+++ b/syncplay/messages.py
@@ -135,12 +135,12 @@ en = {
 
       "contact-label" : "Have an idea, bug report or feedback? E-mail <a href=\"mailto:dev@syncplay.pl\">dev@syncplay.pl</a>, chat via the <a href=\"https://webchat.freenode.net/?channels=#syncplay\">#Syncplay IRC channel</a> on irc.freenode.net or <a href=\"https://github.com/Uriziel/syncplay/issues/new\">raise an issue via GitHub</a>. Also check out <a href=\"http://syncplay.pl/\">http://syncplay.pl/</a> for info, help and updates.",
 
-      "joinroom-label" : "Join room",
-      "seektime-label" : "Seek to time",
-      "undoseek-label" : "Undo seek",
-      "togglepause-label" : "Toggle pause",
-      "play-label" : "Play",
-      "pause-label" : "Play",
+      "joinroom-guibuttonlabel" : "Join room",
+      "seektime-guibuttonlabel" : "Seek to time",
+      "undoseek-guibuttonlabel" : "Undo seek",
+      "togglepause-guibuttonlabel" : "Toggle pause",
+      "play-guibuttonlabel" : "Play",
+      "pause-guibuttonlabel" : "Play",
 
       "roomuser-heading-label" : "Room / User",
       "fileplayed-heading-label" : "File being played",
@@ -277,11 +277,12 @@ messages = {
            "pl": pl
            }
 
-buttonlabels = ["joinroom-label", "seektime-label", "undoseek-label", "togglepause-label", "play-label", "pause-label"]
-
 def getMessage(locale, type_):
     if(constants.SHOW_BUTTON_LABELS == False):
-        if(type_ in buttonlabels):
+        if("-guibuttonlabel" in type_):
+            return ""
+    if(constants.SHOW_TOOLTIPS == False):
+        if("-tooltip" in type_):
             return ""
     if(messages.has_key(locale)):
         if(messages[locale].has_key(type_)):
diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py
index fa7956a..1140dfa 100644
--- a/syncplay/ui/GuiConfiguration.py
+++ b/syncplay/ui/GuiConfiguration.py
@@ -306,15 +306,14 @@ class ConfigDialog(QtGui.QDialog):
         self.serverpassTextbox = QLineEdit(config['password'], self)
         self.defaultroomLabel = QLabel(getMessage("en", "room-label"), self)
 
-        if (constants.SHOW_TOOLTIPS == True):
-            self.hostLabel.setToolTip(getMessage("en", "host-tooltip"))
-            self.hostTextbox.setToolTip(getMessage("en", "host-tooltip"))
-            self.usernameLabel.setToolTip(getMessage("en", "username-tooltip"))
-            self.usernameTextbox.setToolTip(getMessage("en", "username-tooltip"))
-            self.serverpassLabel.setToolTip(getMessage("en", "password-tooltip"))
-            self.serverpassTextbox.setToolTip(getMessage("en", "password-tooltip"))
-            self.defaultroomLabel.setToolTip(getMessage("en", "room-tooltip"))
-            self.defaultroomTextbox.setToolTip(getMessage("en", "room-tooltip"))
+        self.hostLabel.setToolTip(getMessage("en", "host-tooltip"))
+        self.hostTextbox.setToolTip(getMessage("en", "host-tooltip"))
+        self.usernameLabel.setToolTip(getMessage("en", "username-tooltip"))
+        self.usernameTextbox.setToolTip(getMessage("en", "username-tooltip"))
+        self.serverpassLabel.setToolTip(getMessage("en", "password-tooltip"))
+        self.serverpassTextbox.setToolTip(getMessage("en", "password-tooltip"))
+        self.defaultroomLabel.setToolTip(getMessage("en", "room-tooltip"))
+        self.defaultroomTextbox.setToolTip(getMessage("en", "room-tooltip"))
 
         self.connectionSettingsLayout = QtGui.QGridLayout()
         self.connectionSettingsLayout.addWidget(self.hostLabel, 0, 0)
@@ -347,16 +346,14 @@ class ConfigDialog(QtGui.QDialog):
         self.mediabrowseButton = QtGui.QPushButton(QtGui.QIcon(resourcespath + 'folder_explore.png'), getMessage("en", "browse-label"))
         self.mediabrowseButton.clicked.connect(self.browseMediapath)
 
-        if (constants.SHOW_TOOLTIPS == True):
-            self.executablepathLabel.setToolTip(getMessage("en", "executable-path-tooltip"))
-            self.executablepathCombobox.setToolTip(getMessage("en", "executable-path-tooltip"))
-            self.mediapathLabel.setToolTip(getMessage("en", "media-path-tooltip"))
-            self.mediapathTextbox.setToolTip(getMessage("en", "media-path-tooltip"))
+        self.executablepathLabel.setToolTip(getMessage("en", "executable-path-tooltip"))
+        self.executablepathCombobox.setToolTip(getMessage("en", "executable-path-tooltip"))
+        self.mediapathLabel.setToolTip(getMessage("en", "media-path-tooltip"))
+        self.mediapathTextbox.setToolTip(getMessage("en", "media-path-tooltip"))
 
         if constants.SHOW_REWIND_ON_DESYNC_CHECKBOX == True:
             self.rewindCheckbox = QCheckBox(getMessage("en", "rewind-label"))
-            if (constants.SHOW_TOOLTIPS == True):
-                self.rewindCheckbox.setToolTip(getMessage("en", "rewind-tooltip"))
+            self.rewindCheckbox.setToolTip(getMessage("en", "rewind-tooltip"))
         self.mediaplayerSettingsLayout = QtGui.QGridLayout()
         self.mediaplayerSettingsLayout.addWidget(self.executablepathLabel, 0, 0)
         self.mediaplayerSettingsLayout.addWidget(self.executableiconLabel, 0, 1)
@@ -421,22 +418,21 @@ class ConfigDialog(QtGui.QDialog):
         if config['pauseOnLeave'] == True:
             self.pauseonleaveCheckbox.setChecked(True)
 
-        if (constants.SHOW_TOOLTIPS == True):
-            self.filenameprivacyLabel.setToolTip(getMessage("en", "filename-privacy-tooltip"))
-            self.filenameprivacySendRawOption.setToolTip(getMessage("en", "privacy-sendraw-tooltip"))
-            self.filenameprivacySendHashedOption.setToolTip(getMessage("en", "privacy-sendhashed-tooltip"))
-            self.filenameprivacyDontSendOption.setToolTip(getMessage("en", "privacy-dontsend-tooltip"))
-            self.filesizeprivacyLabel.setToolTip(getMessage("en", "filesize-privacy-tooltip"))
-            self.filesizeprivacySendRawOption.setToolTip(getMessage("en", "privacy-sendraw-tooltip"))
-            self.filesizeprivacySendHashedOption.setToolTip(getMessage("en", "privacy-sendhashed-tooltip"))
-            self.filesizeprivacyDontSendOption.setToolTip(getMessage("en", "privacy-dontsend-tooltip"))
+        self.filenameprivacyLabel.setToolTip(getMessage("en", "filename-privacy-tooltip"))
+        self.filenameprivacySendRawOption.setToolTip(getMessage("en", "privacy-sendraw-tooltip"))
+        self.filenameprivacySendHashedOption.setToolTip(getMessage("en", "privacy-sendhashed-tooltip"))
+        self.filenameprivacyDontSendOption.setToolTip(getMessage("en", "privacy-dontsend-tooltip"))
+        self.filesizeprivacyLabel.setToolTip(getMessage("en", "filesize-privacy-tooltip"))
+        self.filesizeprivacySendRawOption.setToolTip(getMessage("en", "privacy-sendraw-tooltip"))
+        self.filesizeprivacySendHashedOption.setToolTip(getMessage("en", "privacy-sendhashed-tooltip"))
+        self.filesizeprivacyDontSendOption.setToolTip(getMessage("en", "privacy-dontsend-tooltip"))
 
-            self.slowdownCheckbox.setToolTip(getMessage("en", "slowdown-tooltip"))
-            self.dontslowwithmeCheckbox.setToolTip(getMessage("en", "dontslowwithme-tooltip"))
-            self.pauseonleaveCheckbox.setToolTip(getMessage("en", "pauseonleave-tooltip"))
-            self.alwaysshowCheckbox.setToolTip(getMessage("en", "alwayshow-tooltip"))
-            self.donotstoreCheckbox.setToolTip(getMessage("en", "donotstore-tooltip"))
-            self.slowdownCheckbox.setToolTip(getMessage("en", "slowdown-tooltip"))
+        self.slowdownCheckbox.setToolTip(getMessage("en", "slowdown-tooltip"))
+        self.dontslowwithmeCheckbox.setToolTip(getMessage("en", "dontslowwithme-tooltip"))
+        self.pauseonleaveCheckbox.setToolTip(getMessage("en", "pauseonleave-tooltip"))
+        self.alwaysshowCheckbox.setToolTip(getMessage("en", "alwayshow-tooltip"))
+        self.donotstoreCheckbox.setToolTip(getMessage("en", "donotstore-tooltip"))
+        self.slowdownCheckbox.setToolTip(getMessage("en", "slowdown-tooltip"))
 
         self.moreSettingsLayout = QtGui.QGridLayout()
 
@@ -480,8 +476,7 @@ class ConfigDialog(QtGui.QDialog):
         if config['forceGuiPrompt'] == True:
             self.alwaysshowCheckbox.setChecked(True)
 
-        if (constants.SHOW_TOOLTIPS == True):
-            self.showmoreCheckbox.setToolTip(getMessage("en", "more-tooltip"))
+        self.showmoreCheckbox.setToolTip(getMessage("en", "more-tooltip"))
 
         self.donotstoreCheckbox.toggled.connect(self.runButtonTextUpdate)
 
@@ -501,8 +496,7 @@ class ConfigDialog(QtGui.QDialog):
 
         self.topLayout = QtGui.QHBoxLayout()
         self.helpButton = QtGui.QPushButton(QtGui.QIcon(resourcespath + 'help.png'), getMessage("en", "help-label"))
-        if (constants.SHOW_TOOLTIPS == True):
-            self.helpButton.setToolTip(getMessage("en", "help-tooltip"))
+        self.helpButton.setToolTip(getMessage("en", "help-tooltip"))
         self.helpButton.setMaximumSize(self.helpButton.sizeHint())
         self.helpButton.pressed.connect(self.openHelp)
         self.runButton = QtGui.QPushButton(QtGui.QIcon(resourcespath + 'accept.png'), getMessage("en", "storeandrun-label"))
diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py
index 22a3600..fbcaa7c 100644
--- a/syncplay/ui/gui.py
+++ b/syncplay/ui/gui.py
@@ -290,13 +290,12 @@ class MainWindow(QtGui.QMainWindow):
         
         window.roomInput = QtGui.QLineEdit()
         window.roomInput.returnPressed.connect(self.joinRoom)
-        window.roomButton = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'door_in.png'), getMessage("en", "joinroom-label"))
+        window.roomButton = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'door_in.png'), getMessage("en", "joinroom-guibuttonlabel"))
         window.roomButton.pressed.connect(self.joinRoom)
         window.roomLayout = QtGui.QHBoxLayout()
         window.roomInput.setMaximumWidth(150)
 
-        if (constants.SHOW_TOOLTIPS == True):
-            self.roomButton.setToolTip(getMessage("en", "joinroom-tooltip"))
+        self.roomButton.setToolTip(getMessage("en", "joinroom-tooltip"))
         
         window.roomLayout.addWidget(window.roomInput)
         window.roomLayout.addWidget(window.roomButton)
@@ -309,11 +308,10 @@ class MainWindow(QtGui.QMainWindow):
         
         window.seekInput = QtGui.QLineEdit()
         window.seekInput.returnPressed.connect(self.seekPosition)
-        window.seekButton = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'clock_go.png'),getMessage("en", "seektime-label"))
+        window.seekButton = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'clock_go.png'),getMessage("en", "seektime-guibuttonlabel"))
         window.seekButton.pressed.connect(self.seekPosition)
 
-        if (constants.SHOW_TOOLTIPS == True):
-            self.seekButton.setToolTip(getMessage("en", "seektime-tooltip"))
+        self.seekButton.setToolTip(getMessage("en", "seektime-tooltip"))
         
         window.seekLayout = QtGui.QHBoxLayout()
         window.seekInput.setMaximumWidth(50)
@@ -328,31 +326,28 @@ class MainWindow(QtGui.QMainWindow):
     def addMiscBox(self, window):
         window.miscGroup = QtGui.QGroupBox(getMessage("en", "othercommands-heading-label"))
         
-        window.unseekButton = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'arrow_undo.png'),getMessage("en", "undoseek-label"))
+        window.unseekButton = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'arrow_undo.png'),getMessage("en", "undoseek-guibuttonlabel"))
         window.unseekButton.pressed.connect(self.undoSeek)
-        if (constants.SHOW_TOOLTIPS == True):
-            self.unseekButton.setToolTip(getMessage("en", "undoseek-tooltip"))
+        self.unseekButton.setToolTip(getMessage("en", "undoseek-tooltip"))
 
         window.miscLayout = QtGui.QHBoxLayout()
         window.miscLayout.addWidget(window.unseekButton)
         if constants.MERGE_PLAYPAUSE_BUTTONS == True:
-            window.playpauseButton = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'control_pause_blue.png'),getMessage("en", "togglepause-label"))
+            window.playpauseButton = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'control_pause_blue.png'),getMessage("en", "togglepause-guibuttonlabel"))
             window.playpauseButton.pressed.connect(self.togglePause)
             window.miscLayout.addWidget(window.playpauseButton)
-            if (constants.SHOW_TOOLTIPS == True):
-                self.playpauseButton.setToolTip(getMessage("en", "togglepause-tooltip"))
+            self.playpauseButton.setToolTip(getMessage("en", "togglepause-tooltip"))
         else:
-            window.playButton = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'control_play_blue.png'),getMessage("en", "play-label"))
+            window.playButton = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'control_play_blue.png'),getMessage("en", "play-guibuttonlabel"))
             window.playButton.pressed.connect(self.play)
             window.playButton.setMaximumWidth(60)
             window.miscLayout.addWidget(window.playButton)
-            window.pauseButton = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'control_pause_blue.png'),getMessage("en", "pause-label"))
+            window.pauseButton = QtGui.QPushButton(QtGui.QIcon(self.resourcespath + 'control_pause_blue.png'),getMessage("en", "pause-guibuttonlabel"))
             window.pauseButton.pressed.connect(self.pause)
             window.pauseButton.setMaximumWidth(60)
             window.miscLayout.addWidget(window.pauseButton)
-            if (constants.SHOW_TOOLTIPS == True):
-                self.playButton.setToolTip(getMessage("en", "play-tooltip"))
-                self.pauseButton.setToolTip(getMessage("en", "pause-tooltip"))
+            self.playButton.setToolTip(getMessage("en", "play-tooltip"))
+            self.pauseButton.setToolTip(getMessage("en", "pause-tooltip"))
         
         window.miscGroup.setLayout(window.miscLayout)
         window.miscGroup.setFixedSize(window.miscGroup.sizeHint())