diff --git a/.gitignore b/.gitignore
index a53ff66..eac6115 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 *.apk
 *.ser
 *.ser
+.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
index 24ec19f..b3258ca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         applicationId "adrienmalin.pingpoints"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 6
+        versionCode 7
         versionName "2.1"
         vectorDrawables.useSupportLibrary true
     }
diff --git a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
index 6ecdf45..1e55562 100644
--- a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
@@ -8,11 +8,9 @@ import android.speech.tts.UtteranceProgressListener
 import android.support.design.widget.Snackbar
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.app.AppCompatDelegate
-import android.text.method.LinkMovementMethod
 import android.view.View
 import android.widget.Button
 import android.widget.ImageView
-import android.widget.TextView
 import java.util.regex.Pattern
 
 
@@ -89,12 +87,6 @@ class MatchActivity : AppCompatActivity() {
             findViewById(R.id.imgService0),
             findViewById(R.id.imgService1)
         )
-
-        // Set HTML text for icons credits
-        findViewById<TextView>(R.id.iconsCredit).apply {
-            setText(fromHtml(getString(R.string.iconCredits)))
-            movementMethod = LinkMovementMethod.getInstance()
-        }
     }
 
     fun updateUI() {
diff --git a/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt b/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
index d78c305..fd9a590 100644
--- a/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
@@ -7,6 +7,7 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.app.AppCompatDelegate
+import android.text.method.LinkMovementMethod
 import android.view.View
 import android.widget.ArrayAdapter
 import android.widget.GridView
@@ -67,6 +68,12 @@ class VictoryActivity : AppCompatActivity() {
                 previousMatches.split("\t|\n".toRegex())?.toMutableList()
             )
         }
+
+        // Set HTML text for icons credits
+        findViewById<TextView>(R.id.iconsCredit).apply {
+            setText(fromHtml(getString(R.string.iconCredits)))
+            movementMethod = LinkMovementMethod.getInstance()
+        }
     }
 
     fun saveScore() {
diff --git a/app/src/main/res/layout-land/activity_match.xml b/app/src/main/res/layout-land/activity_match.xml
index bc61c48..9e8352f 100644
--- a/app/src/main/res/layout-land/activity_match.xml
+++ b/app/src/main/res/layout-land/activity_match.xml
@@ -29,6 +29,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
                     android:layout_weight="1"
                     android:gravity="left"
                     android:textAppearance="@style/TextAppearance.AppCompat.Large"
@@ -123,27 +124,6 @@
                 android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" android:layout_weight="0">
-            <TextView
-                    android:id="@+id/pingPointsCredit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/PingPointsCredits"
-                    app:layout_constraintTop_toBottomOf="@+id/enableSttSwitch"
-                    app:layout_constraintStart_toStartOf="parent"
-                    android:layout_marginStart="8dp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    android:layout_marginEnd="8dp"
-                    android:layout_weight="1" android:layout_margin="8dp" android:gravity="left"/>
-            <TextView
-                    android:id="@+id/iconsCredit"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/iconCredits"
-                    app:layout_constraintTop_toBottomOf="@+id/PingPointsCredit"
-                    app:layout_constraintStart_toStartOf="parent"
-                    android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
-                    android:layout_marginEnd="8dp"
-                    android:layout_weight="1" android:layout_margin="8dp" android:gravity="right"/>
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_match.xml b/app/src/main/res/layout/activity_match.xml
index f479883..3a83387 100644
--- a/app/src/main/res/layout/activity_match.xml
+++ b/app/src/main/res/layout/activity_match.xml
@@ -110,28 +110,6 @@
                     tools:layout_editor_absoluteY="120dp"/>
 
         </LinearLayout>
-        <TextView
-                android:id="@+id/pingPointsCredit"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/PingPointsCredits"
-                app:layout_constraintTop_toBottomOf="@+id/enableSttSwitch"
-                app:layout_constraintStart_toStartOf="parent"
-                android:layout_marginStart="8dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginEnd="8dp" android:layout_marginTop="8dp"
-                android:layout_weight="0" android:layout_marginLeft="8dp" android:layout_marginRight="8dp"
-        />
-        <TextView
-                android:id="@+id/iconsCredit"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/iconCredits"
-                app:layout_constraintStart_toStartOf="parent"
-                android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginEnd="8dp"
-                android:layout_weight="0" android:layout_marginLeft="8dp" android:layout_marginRight="8dp"
-                android:layout_marginBottom="8dp" android:maxLines="1"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_victory.xml b/app/src/main/res/layout/activity_victory.xml
index ee70d73..0e1bd7c 100644
--- a/app/src/main/res/layout/activity_victory.xml
+++ b/app/src/main/res/layout/activity_victory.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <android.support.design.widget.CoordinatorLayout
-        xmlns:tools="http://schemas.android.com/tools" android:id="@+id/coordinatorLayout"
-        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -72,33 +72,61 @@
                 android:layout_marginRight="8dp" android:layout_marginTop="32dp"/>
         <GridView
                 android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginTop="8dp"
-                app:layout_constraintTop_toBottomOf="@id/previousMatchesTextView"
                 android:numColumns="3" android:id="@+id/previousMatchesGrid" android:clickable="false"
                 android:gravity="center"
                 app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp" app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginRight="16dp" android:layout_marginBottom="8dp"
-                app:layout_constraintBottom_toTopOf="@+id/button3"/>
+                android:layout_marginRight="16dp"
+                android:layout_height="0dp"
+                app:layout_constraintTop_toBottomOf="@+id/previousMatchesTextView" android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp" app:layout_constraintBottom_toTopOf="@+id/pingPointsCredit"/>
         <Button
                 android:text="@string/new_match"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/button3" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp" android:layout_marginBottom="8dp"
-                app:layout_constraintBottom_toBottomOf="parent" android:drawableStart="@drawable/ic_new_match"
+                android:id="@+id/buttonNewMatch" app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
+                android:drawableStart="@drawable/ic_new_match"
                 android:drawableLeft="@drawable/ic_new_match"
-                android:onClick="newMatch"/>
+                android:onClick="newMatch"
+                android:layout_marginBottom="8dp"
+                app:layout_constraintBottom_toBottomOf="parent"/>
         <Button
                 android:text="@string/share"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/button4" android:layout_marginBottom="8dp"
-                app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent"
+                android:id="@+id/buttonShare"
+                app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
-                android:drawableStart="@drawable/ic_share" android:onClick="share"/>
+                android:drawableStart="@drawable/ic_share"
+                android:drawableLeft="@drawable/ic_share" android:onClick="share"
+                android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent"/>
+        <TextView
+                android:id="@+id/pingPointsCredit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/PingPointsCredits"
+                app:layout_constraintStart_toStartOf="parent"
+                android:layout_marginStart="8dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="0" android:layout_marginLeft="8dp" android:layout_marginRight="8dp"
+                app:layout_constraintBottom_toTopOf="@+id/iconsCredit"
+        />
+        <TextView
+                android:id="@+id/iconsCredit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/iconCredits"
+                app:layout_constraintStart_toStartOf="parent"
+                android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginEnd="8dp"
+                android:layout_weight="0" android:layout_marginLeft="8dp" android:layout_marginRight="8dp"
+                android:maxLines="1"
+                app:layout_constraintHorizontal_bias="1.0"
+                android:layout_marginBottom="8dp" app:layout_constraintBottom_toTopOf="@+id/buttonShare"/>
 
     </android.support.constraint.ConstraintLayout>