diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml
index b2851b2..a844103 100755
--- a/qml/cover/CoverPage.qml
+++ b/qml/cover/CoverPage.qml
@@ -8,6 +8,7 @@ CoverBackground {
         return Math.ceil(Math.random() *2);
     } 
 
+    /*
     function buttonAnswer() {
         var answers = ["It is certain.", "It is decidedly so.", "Without a doubt.", "Yes — definitely.", "You may rely on it.",
                 "As I see it, yes.", "Most likely.", "Outlook good.", "Signs point to yes.", "Yes.",
@@ -16,6 +17,7 @@ CoverBackground {
 
         return answers [Math.ceil(Math.random() * 20)];
     }
+    */
 
 
     Label {
diff --git a/qml/emojis/emoji-0.png b/qml/emojis/emoji-0.png
index 2929c3e..bf01e60 100644
Binary files a/qml/emojis/emoji-0.png and b/qml/emojis/emoji-0.png differ
diff --git a/qml/emojis/emoji-1.png b/qml/emojis/emoji-1.png
index 00e4ee0..b33d9ee 100644
Binary files a/qml/emojis/emoji-1.png and b/qml/emojis/emoji-1.png differ
diff --git a/qml/emojis/emoji-2.png b/qml/emojis/emoji-2.png
index 0dca97e..9a1110c 100644
Binary files a/qml/emojis/emoji-2.png and b/qml/emojis/emoji-2.png differ
diff --git a/qml/emojis/emoji-3.png b/qml/emojis/emoji-3.png
index 740213a..768e324 100644
Binary files a/qml/emojis/emoji-3.png and b/qml/emojis/emoji-3.png differ
diff --git a/qml/emojis/emoji-4.png b/qml/emojis/emoji-4.png
index 48e9636..0113996 100644
Binary files a/qml/emojis/emoji-4.png and b/qml/emojis/emoji-4.png differ
diff --git a/qml/emojis/emoji-5.png b/qml/emojis/emoji-5.png
index e03212f..cb5b25b 100644
Binary files a/qml/emojis/emoji-5.png and b/qml/emojis/emoji-5.png differ
diff --git a/qml/emojis/emoji-6.png b/qml/emojis/emoji-6.png
index 24437d1..c4d8be3 100644
Binary files a/qml/emojis/emoji-6.png and b/qml/emojis/emoji-6.png differ
diff --git a/qml/emojis/emoji-7.png b/qml/emojis/emoji-7.png
index e20ca47..7fe5432 100644
Binary files a/qml/emojis/emoji-7.png and b/qml/emojis/emoji-7.png differ
diff --git a/qml/pages/FirstPage.qml b/qml/pages/FirstPage.qml
index 8f7e9a6..46b3eac 100755
--- a/qml/pages/FirstPage.qml
+++ b/qml/pages/FirstPage.qml
@@ -9,20 +9,54 @@ Page {
 
     property real number: 0
     function answer() {
-        var answers = ["It is certain.", "It is decidedly so.", "Without a doubt.", "Yes — definitely.", "You may rely on it.",
-                "As I see it, yes.", "Most likely.", "Outlook good.", "Signs point to yes.", "Yes.",
-                "Reply hazy, try again.", "Ask again later.", "Better not tell you now.", "Cannot predict now.", "Concentrate and ask again.",
-                "Don’t count on it.", "My reply is no.", "My sources say no.", "Outlook not so good.", "Very doubtful."];
+        var answers = [
+                    qsTr("It is certain."),
+                    qsTr("It is decidedly so."),
+                    qsTr("Without a doubt."),
+                    qsTr("Yes — definitely."),
+                    qsTr("You may rely on it."),
+                    qsTr("As I see it, yes."),
+                    qsTr("Most likely."),
+                    qsTr("Outlook good."),
+                    qsTr("Signs point to yes."),
+                    qsTr("Yes."),
+                    qsTr("Reply hazy, try again."),
+                    qsTr("Ask again later."),
+                    qsTr("Better not tell you now."),
+                    qsTr("Cannot predict now."),
+                    qsTr("Concentrate and ask again."),
+                    qsTr("Don’t count on it."),
+                    qsTr("My reply is no."),
+                    qsTr("My sources say no."),
+                    qsTr("Outlook not so good."),
+                    qsTr("Very doubtful.")];
 
         number = Math.ceil(shakeSensor.random * 1000) % 20;
         return answers [number];
     }
 
     function buttonAnswer() {
-        var answers = ["It is certain.", "It is decidedly so.", "Without a doubt.", "Yes — definitely.", "You may rely on it.",
-                "As I see it, yes.", "Most likely.", "Outlook good.", "Signs point to yes.", "Yes.",
-                "Reply hazy, try again.", "Ask again later.", "Better not tell you now.", "Cannot predict now.", "Concentrate and ask again.",
-                "Don’t count on it.", "My reply is no.", "My sources say no.", "Outlook not so good.", "Very doubtful."];
+        var answers = [
+                    qsTr("It is certain."),
+                    qsTr("It is decidedly so."),
+                    qsTr("Without a doubt."),
+                    qsTr("Yes — definitely."),
+                    qsTr("You may rely on it."),
+                    qsTr("As I see it, yes."),
+                    qsTr("Most likely."),
+                    qsTr("Outlook good."),
+                    qsTr("Signs point to yes."),
+                    qsTr("Yes."),
+                    qsTr("Reply hazy, try again."),
+                    qsTr("Ask again later."),
+                    qsTr("Better not tell you now."),
+                    qsTr("Cannot predict now."),
+                    qsTr("Concentrate and ask again."),
+                    qsTr("Don’t count on it."),
+                    qsTr("My reply is no."),
+                    qsTr("My sources say no."),
+                    qsTr("Outlook not so good."),
+                    qsTr("Very doubtful.")];
 
         number =  Math.ceil(Math.random() * 20);
         return answers [number];
@@ -41,6 +75,8 @@ Page {
             else
                 if (number >= 15 && number <= 19)
                     return getRandomInt(6, 7);
+                else //quick fix (find a bug)
+                    return 0;
     }
 
     // To enable PullDownMenu, place our content in a SilicaFlickable