diff --git a/core/external b/core/external
index eb3e01925a5a6d323d41f9271636ad5c24072e25..d8cb4a89e64ceec83718fc478f76a5eb31d8fb3e 160000
--- a/core/external
+++ b/core/external
@@ -1 +1 @@
-Subproject commit eb3e01925a5a6d323d41f9271636ad5c24072e25
+Subproject commit d8cb4a89e64ceec83718fc478f76a5eb31d8fb3e
diff --git a/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java b/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
index 7ebc4f838ee0a53305403f94d768c02659a2ab09..4695a3c93755e73d2fb2b509d7a12e5d9af8f5de 100644
--- a/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
+++ b/core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
@@ -338,7 +338,6 @@ public class GameMenuPage extends MenuPage {
         buttonDifficultyEasy.addListener(new ClickListener() {
             @Override
             public void clicked(InputEvent event, float x, float y) {
-                super.clicked(event, x, y);
                 dragSwitchListener.switchToStep(GameDifficulty.EASY.getDifficultyNumber() - 1);
             }
         });
@@ -346,7 +345,6 @@ public class GameMenuPage extends MenuPage {
         buttonDifficultyMedium.addListener(new ClickListener() {
             @Override
             public void clicked(InputEvent event, float x, float y) {
-                super.clicked(event, x, y);
                 dragSwitchListener.switchToStep(GameDifficulty.MEDIUM.getDifficultyNumber() - 1);
             }
         });
@@ -354,7 +352,6 @@ public class GameMenuPage extends MenuPage {
         buttonDifficultyHard.addListener(new ClickListener() {
             @Override
             public void clicked(InputEvent event, float x, float y) {
-                super.clicked(event, x, y);
                 dragSwitchListener.switchToStep(GameDifficulty.HARD.getDifficultyNumber() - 1);
             }
         });
@@ -384,24 +381,11 @@ public class GameMenuPage extends MenuPage {
                     diffStack.getChildren().get(i).setVisible(i == step);
                     if(i == step) {
                         if(lastDragDifficultyStep != step) {
-                            GameDifficulty difficulty;
-
-                            switch (step) {
-                                case 0:
-                                    difficulty = GameDifficulty.EASY;
-                                    break;
-                                case 1:
-                                    difficulty = GameDifficulty.MEDIUM;
-                                    break;
-                                case 2:
-                                    difficulty = GameDifficulty.HARD;
-                                    break;
-                                default:
-                                    difficulty = GameDifficulty.DEFAULT_DIFFICULTY;
-                            }
+                            GameDifficulty difficulty = GameDifficulty.getGameDifficultyForDifficultyNumber(step + 1);
+                            GameDifficulty previous = GameDifficulty.getGameDifficultyForDifficultyNumber(lastDragDifficultyStep + 1);
 
                             if (stepSoundsEnabled) {
-                                playStepSound(gameDifficulty, difficulty);
+                                playStepSound(previous, difficulty);
                             }
 
                             lastDragDifficultyStep = step;
@@ -591,4 +575,4 @@ public class GameMenuPage extends MenuPage {
 			}
 		});
 	}
-}
+}
\ No newline at end of file
diff --git a/core/src/cz/nic/tablexia/util/ui/Switch.java b/core/src/cz/nic/tablexia/util/ui/Switch.java
index ab60cc84e1a7b012b87e8e9dc91eb5efcc2a4f60..45f035f764fe82a14da2e63107458461ca10526a 100644
--- a/core/src/cz/nic/tablexia/util/ui/Switch.java
+++ b/core/src/cz/nic/tablexia/util/ui/Switch.java
@@ -120,7 +120,6 @@ public class Switch extends Group {
                 switchSelectedListener.stepSelected(getStep(false));
             }
             event.stop();
-            playButtonSound();
         }
 
         //Sound effect is played when touching up switch, not on click