diff --git a/README.md b/README.md
index 1fc9070..6e8cfb9 100644
--- a/README.md
+++ b/README.md
@@ -23,3 +23,4 @@ You get the Telegram API ID and hash as soon as you've registered your own appli
 ## Credits
 This project uses
 - The Telegram Database Library (TDLib) - available on [GitHub.com](https://github.com/tdlib/td). Thanks for making it available under the conditions of the Boost Software License 1.0! Details about the license of TDLib in [its license file](https://github.com/tdlib/td/blob/master/LICENSE_1_0.txt).
+- Emoji parsing and artwork by [Twitter Emoji (Twemoji)](http://twitter.github.io/twemoji/), copyright 2018 Twitter, Inc and other contributors, Code licensed under the [MIT License](http://opensource.org/licenses/MIT), Graphics licensed under [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/)
diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
index d8c21b7..bfb42ca 100644
--- a/qml/pages/AboutPage.qml
+++ b/qml/pages/AboutPage.qml
@@ -222,6 +222,28 @@ Page {
                 onLinkActivated: Qt.openUrlExternally("https://github.com/tdlib/td")
             }
 
+            Label {
+                x: Theme.horizontalPageMargin
+                width: parent.width  - ( 2 * Theme.horizontalPageMargin )
+                text: qsTr("This project uses twemoji. Copyright 2018 Twitter, Inc. and other contributors. Thanks for making it available under the conditions of the MIT License (coding) and CC-BY 4.0 (graphics)!")
+                font.pixelSize: Theme.fontSizeExtraSmall
+                wrapMode: Text.Wrap
+                anchors {
+                    horizontalCenter: parent.horizontalCenter
+                }
+            }
+
+            Text {
+                text: "<a href=\"https://github.com/twitter/twemoji\">" + qsTr("Open twemoji on GitHub") + "</a>"
+                anchors {
+                    horizontalCenter: parent.horizontalCenter
+                }
+                font.pixelSize: Theme.fontSizeSmall
+                linkColor: Theme.highlightColor
+
+                onLinkActivated: Qt.openUrlExternally("https://github.com/twitter/twemoji")
+            }
+
             Label {
                 id: separatorLabel
                 x: Theme.horizontalPageMargin
diff --git a/translations/harbour-fernschreiber-de.ts b/translations/harbour-fernschreiber-de.ts
index e2e65da..a24ae9c 100644
--- a/translations/harbour-fernschreiber-de.ts
+++ b/translations/harbour-fernschreiber-de.ts
@@ -67,6 +67,14 @@
         <source>Phone number: +%1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This project uses twemoji. Copyright 2018 Twitter, Inc. and other contributors. Thanks for making it available under the conditions of the MIT License (coding) and CC-BY 4.0 (graphics)!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open twemoji on GitHub</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InitializationPage</name>
@@ -122,19 +130,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Waiting for network</source>
+        <source>Waiting for network...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connecting to network</source>
+        <source>Connecting to network...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connecting to proxy</source>
+        <source>Connecting to proxy...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Updating content</source>
+        <source>Updating content...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/harbour-fernschreiber.ts b/translations/harbour-fernschreiber.ts
index e2e65da..a24ae9c 100644
--- a/translations/harbour-fernschreiber.ts
+++ b/translations/harbour-fernschreiber.ts
@@ -67,6 +67,14 @@
         <source>Phone number: +%1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This project uses twemoji. Copyright 2018 Twitter, Inc. and other contributors. Thanks for making it available under the conditions of the MIT License (coding) and CC-BY 4.0 (graphics)!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open twemoji on GitHub</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InitializationPage</name>
@@ -122,19 +130,19 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Waiting for network</source>
+        <source>Waiting for network...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connecting to network</source>
+        <source>Connecting to network...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connecting to proxy</source>
+        <source>Connecting to proxy...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Updating content</source>
+        <source>Updating content...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>