diff --git a/app/build.gradle b/app/build.gradle
index c1e8b581..ea86127b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,6 +20,7 @@ android {
         versionCode 59
         versionName "0.18.0"
         multiDexEnabled true
+        resValue "string", "app_name", "Wulkanowy"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [
@@ -56,6 +57,7 @@ android {
             signingConfig signingConfigs.release
         }
         debug {
+            resValue "string", "app_name", "Wulkanowy DEV " + defaultConfig.versionCode
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
             testCoverageEnabled = project.hasProperty('coverage')
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
deleted file mode 100644
index c90641dd..00000000
--- a/app/src/debug/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Wulkanowy DEV</string>
-</resources>
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index cd8b6036..39b00d30 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -153,8 +153,8 @@
             android:background="?selectableItemBackgroundBorderless"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            tools:text="@tools:sample/date/ddmmyy" />
 
         <ImageButton
             android:id="@+id/attendanceNextButton"
diff --git a/app/src/main/res/layout/fragment_exam.xml b/app/src/main/res/layout/fragment_exam.xml
index 1e1b0c99..ed4094a5 100644
--- a/app/src/main/res/layout/fragment_exam.xml
+++ b/app/src/main/res/layout/fragment_exam.xml
@@ -138,8 +138,8 @@
             android:layout_height="match_parent"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            tools:text="@tools:sample/date/ddmmyy" />
 
         <ImageButton
             android:id="@+id/examNextButton"
diff --git a/app/src/main/res/layout/fragment_homework.xml b/app/src/main/res/layout/fragment_homework.xml
index 0fcde9c0..26381da6 100644
--- a/app/src/main/res/layout/fragment_homework.xml
+++ b/app/src/main/res/layout/fragment_homework.xml
@@ -138,8 +138,8 @@
             android:layout_height="match_parent"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            tools:text="@tools:sample/date/ddmmyy" />
 
         <ImageButton
             android:id="@+id/homeworkNextButton"
diff --git a/app/src/main/res/layout/fragment_timetable.xml b/app/src/main/res/layout/fragment_timetable.xml
index 98ccabbf..533af2fa 100644
--- a/app/src/main/res/layout/fragment_timetable.xml
+++ b/app/src/main/res/layout/fragment_timetable.xml
@@ -139,8 +139,8 @@
             android:background="?selectableItemBackgroundBorderless"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            tools:text="@tools:sample/date/ddmmyy" />
 
         <ImageButton
             android:id="@+id/timetableNextButton"
diff --git a/app/src/main/res/layout/fragment_timetable_completed.xml b/app/src/main/res/layout/fragment_timetable_completed.xml
index 11067044..4934327c 100644
--- a/app/src/main/res/layout/fragment_timetable_completed.xml
+++ b/app/src/main/res/layout/fragment_timetable_completed.xml
@@ -115,8 +115,8 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:layout_gravity="bottom"
-        android:orientation="horizontal"
         android:gravity="center"
+        android:orientation="horizontal"
         tools:ignore="UnusedAttribute">
 
         <ImageButton
@@ -125,24 +125,24 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/all_prev"
             android:paddingLeft="12dp"
             android:paddingTop="8dp"
             android:paddingRight="12dp"
             android:paddingBottom="8dp"
             android:scaleType="fitStart"
             android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_left"
-            android:contentDescription="@string/all_prev"/>
+            app:srcCompat="@drawable/ic_chevron_left" />
 
         <TextView
             android:id="@+id/completedLessonsNavDate"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:fontFamily="sans-serif"
             android:background="?selectableItemBackgroundBorderless"
+            android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            tools:text="@tools:sample/date/ddmmyy" />
 
         <ImageButton
             android:id="@+id/completedLessonsNextButton"
@@ -150,13 +150,13 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/all_next"
             android:paddingLeft="12dp"
             android:paddingTop="8dp"
             android:paddingRight="12dp"
             android:paddingBottom="8dp"
             android:scaleType="fitEnd"
             android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_right"
-            android:contentDescription="@string/all_next" />
+            app:srcCompat="@drawable/ic_chevron_right" />
     </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f92186c4..084e3a86 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Wulkanowy</string>
     <!--Activity/Fragment title-->
     <string name="login_title">Anmelden</string>
     <string name="main_title">Wulkanowy</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 6bf0c324..4bcfbb77 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Wulkanowy</string>
     <!--Activity/Fragment title-->
     <string name="login_title">Logowanie</string>
     <string name="main_title">Wulkanowy</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 965b75ab..41771a3c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Wulkanowy</string>
     <!--Activity/Fragment title-->
     <string name="login_title">Авторизация</string>
     <string name="main_title">Wulkanowy</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 8a991812..652249c6 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Wulkanowy</string>
     <!--Activity/Fragment title-->
     <string name="login_title">Авторизація</string>
     <string name="main_title">Wulkanowy</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6e08fded..2f13e031 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <string name="app_name">Wulkanowy</string>
-
-
     <!--Activity/Fragment title-->
     <string name="login_title">Login</string>
     <string name="main_title">Wulkanowy</string>