diff --git a/app/build.gradle b/app/build.gradle
index 8586b655..eadc01cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -115,10 +115,11 @@ dependencies {
     implementation "eu.szkolny:agendacalendarview:1799f8ef47"
     implementation "eu.szkolny:cafebar:5bf0c618de"
     implementation "eu.szkolny.fslogin:lib:2.0.0"
-    implementation "eu.szkolny:material-about-library:fe4a5cd6f1"
+    implementation "eu.szkolny:material-about-library:1d5ebaf47c"
     implementation "eu.szkolny:mhttp:af4b62e6e9"
     implementation "eu.szkolny:nachos:0e5dfcaceb"
     implementation "eu.szkolny.selective-dao:annotation:27f8f3f194"
+    implementation "eu.szkolny:ssl-provider:1.0.0"
     implementation "pl.szczodrzynski:navlib:0.7.2"
     implementation "pl.szczodrzynski:numberslidingpicker:2921225f76"
     implementation "pl.szczodrzynski:recyclertablayout:700f980584"
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
index 0bc6f2e0..e64b33cb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/App.kt
@@ -26,6 +26,8 @@ import com.google.firebase.messaging.FirebaseMessaging
 import com.google.gson.Gson
 import com.hypertrack.hyperlog.HyperLog
 import com.mikepenz.iconics.Iconics
+import eu.szkolny.sslprovider.SSLProvider
+import eu.szkolny.sslprovider.enableSupportedTls
 import im.wangchao.mhttp.MHttp
 import kotlinx.coroutines.*
 import me.leolin.shortcutbadger.ShortcutBadger
@@ -44,6 +46,7 @@ import pl.szczodrzynski.edziennik.ui.modules.base.CrashActivity
 import pl.szczodrzynski.edziennik.utils.*
 import pl.szczodrzynski.edziennik.utils.Utils.d
 import pl.szczodrzynski.edziennik.utils.managers.*
+import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import kotlin.coroutines.CoroutineContext
 
@@ -51,8 +54,8 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
     companion object {
         @Volatile
         lateinit var db: AppDb
-        val config: Config by lazy { Config(db) }
-        var profile: Profile by mutableLazy { Profile(0, 0, 0, "") }
+        lateinit var config: Config
+        lateinit var profile: Profile
         val profileId
             get() = profile.id
 
@@ -94,19 +97,22 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
          |  __  |  | |     | |  |  ___/
          | |  | |  | |     | |  | |
          |_|  |_|  |_|     |_|  |*/
-    val http: OkHttpClient by lazy {
-        val builder = OkHttpClient.Builder()
-                .cache(null)
-                .followRedirects(true)
-                .followSslRedirects(true)
-                .retryOnConnectionFailure(true)
-                .cookieJar(cookieJar)
-                .connectTimeout(15, TimeUnit.SECONDS)
-                .writeTimeout(10, TimeUnit.SECONDS)
-                .readTimeout(30, TimeUnit.SECONDS)
-        builder.installHttpsSupport(this)
+    lateinit var http: OkHttpClient
+    lateinit var httpLazy: OkHttpClient
 
-        if (devMode || BuildConfig.DEBUG) {
+    private fun buildHttp() {
+        val builder = OkHttpClient.Builder()
+            .cache(null)
+            .followRedirects(true)
+            .followSslRedirects(true)
+            .retryOnConnectionFailure(true)
+            .cookieJar(cookieJar)
+            .connectTimeout(15, TimeUnit.SECONDS)
+            .writeTimeout(10, TimeUnit.SECONDS)
+            .readTimeout(30, TimeUnit.SECONDS)
+            .enableSupportedTls(enableCleartext = true)
+
+        if (devMode) {
             HyperLog.initialize(this)
             HyperLog.setLogLevel(Log.VERBOSE)
             HyperLog.setLogFormat(DebugLogFormat(this))
@@ -115,13 +121,14 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
             builder.addInterceptor(chuckerInterceptor)
         }
 
-        builder.build()
-    }
-    val httpLazy: OkHttpClient by lazy {
-        http.newBuilder()
-                .followRedirects(false)
-                .followSslRedirects(false)
-                .build()
+        http = builder.build()
+
+        httpLazy = http.newBuilder()
+            .followRedirects(false)
+            .followSslRedirects(false)
+            .build()
+
+        MHttp.instance().customOkHttpClient(http)
     }
     val cookieJar by lazy { DumbCookieJar(this) }
 
@@ -158,32 +165,46 @@ class App : MultiDexApplication(), Configuration.Provider, CoroutineScope {
                 .errorActivity(CrashActivity::class.java)
                 .apply()
         Iconics.init(applicationContext)
+
+        // initialize companion object values
         App.db = AppDb(this)
-        Themes.themeInt = config.ui.theme
-        devMode = config.debugMode
-        MHttp.instance().customOkHttpClient(http)
+        App.config = Config(App.db)
+        App.profile = Profile(0, 0, 0, "")
+        debugMode = BuildConfig.DEBUG
+        devMode = config.debugMode || debugMode
 
         if (!profileLoadById(config.lastProfileId)) {
             db.profileDao().firstId?.let { profileLoadById(it) }
         }
 
+        buildHttp()
+
+        Themes.themeInt = config.ui.theme
         config.ui.language?.let {
             setLanguage(it)
         }
 
-        debugMode = BuildConfig.DEBUG
-        if (BuildConfig.DEBUG)
-            devMode = true
-
         Signing.getCert(this)
 
         launch {
             withContext(Dispatchers.Default) {
                 config.migrate(this@App)
 
+                SSLProvider.install(
+                    applicationContext,
+                    downloadIfNeeded = true,
+                    supportTls13 = false,
+                    onFinish = {
+                        buildHttp()
+                    },
+                    onError = {
+                        Timber.e("Failed to install SSLProvider: $it")
+                        it.printStackTrace()
+                    }
+                )
+
                 if (config.devModePassword != null)
                     checkDevModePassword()
-                devMode = debugMode || config.debugMode
 
                 if (config.sync.enabled)
                     SyncWorker.scheduleNext(this@App, false)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
index c17f4b3a..af15b543 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/Extensions.kt
@@ -36,7 +36,6 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import androidx.viewpager.widget.ViewPager
-import com.google.android.gms.security.ProviderInstaller
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.gson.*
@@ -46,10 +45,7 @@ import im.wangchao.mhttp.Response
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import okhttp3.ConnectionSpec
-import okhttp3.OkHttpClient
 import okhttp3.RequestBody
-import okhttp3.TlsVersion
 import okio.Buffer
 import pl.szczodrzynski.edziennik.data.api.*
 import pl.szczodrzynski.edziennik.data.api.models.ApiError
@@ -59,7 +55,6 @@ import pl.szczodrzynski.edziennik.data.db.entity.Notification
 import pl.szczodrzynski.edziennik.data.db.entity.Profile
 import pl.szczodrzynski.edziennik.data.db.entity.Teacher
 import pl.szczodrzynski.edziennik.data.db.entity.Team
-import pl.szczodrzynski.edziennik.network.TLSSocketFactory
 import pl.szczodrzynski.edziennik.utils.models.Time
 import java.io.InterruptedIOException
 import java.io.PrintWriter
@@ -69,17 +64,13 @@ import java.net.ConnectException
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 import java.nio.charset.Charset
-import java.security.KeyStore
 import java.security.MessageDigest
 import java.text.SimpleDateFormat
 import java.util.*
 import java.util.zip.CRC32
 import javax.crypto.Mac
 import javax.crypto.spec.SecretKeySpec
-import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLException
-import javax.net.ssl.TrustManagerFactory
-import javax.net.ssl.X509TrustManager
 import kotlin.Pair
 
 
@@ -1090,40 +1081,6 @@ fun Cursor?.getString(columnName: String) = this?.getStringOrNull(getColumnIndex
 fun Cursor?.getInt(columnName: String) = this?.getIntOrNull(getColumnIndex(columnName))
 fun Cursor?.getLong(columnName: String) = this?.getLongOrNull(getColumnIndex(columnName))
 
-fun OkHttpClient.Builder.installHttpsSupport(context: Context) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
-        try {
-            try {
-                ProviderInstaller.installIfNeeded(context)
-            } catch (e: Exception) {
-                Log.e("OkHttpTLSCompat", "Play Services not found or outdated")
-
-                val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-                trustManagerFactory.init(null as KeyStore?)
-
-                val x509TrustManager = trustManagerFactory.trustManagers.singleOrNull { it is X509TrustManager } as X509TrustManager?
-                        ?: return
-
-                val sc = SSLContext.getInstance("TLSv1.2")
-                sc.init(null, null, null)
-                sslSocketFactory(TLSSocketFactory(sc.socketFactory), x509TrustManager)
-                val cs: ConnectionSpec = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
-                        .tlsVersions(TlsVersion.TLS_1_0)
-                        .tlsVersions(TlsVersion.TLS_1_1)
-                        .tlsVersions(TlsVersion.TLS_1_2)
-                        .build()
-                val specs: MutableList<ConnectionSpec> = ArrayList()
-                specs.add(cs)
-                specs.add(ConnectionSpec.COMPATIBLE_TLS)
-                specs.add(ConnectionSpec.CLEARTEXT)
-                connectionSpecs(specs)
-            }
-        } catch (exc: Exception) {
-            Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", exc)
-        }
-    }
-}
-
 fun CharSequence.containsAll(list: List<CharSequence>, ignoreCase: Boolean = false): Boolean {
     for (i in list) {
         if (!contains(i, ignoreCase))
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
index 262c4b39..951a2cd7 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
@@ -313,6 +313,9 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
             }
             else -> b.nightlyText.isVisible = false
         }
+        if (b.nightlyText.isVisible) {
+            b.nightlyText.background.setTintColor(0xa0ff0000.toInt())
+        }
 
         navLoading = true
 
diff --git a/app/src/main/res/drawable/bg_rounded_edittext_pressed.xml b/app/src/main/res/drawable/bg_rounded_edittext_pressed.xml
index 845307b9..b007ed77 100644
--- a/app/src/main/res/drawable/bg_rounded_edittext_pressed.xml
+++ b/app/src/main/res/drawable/bg_rounded_edittext_pressed.xml
@@ -5,5 +5,5 @@
 
     <corners android:radius="4dp" />
     <stroke android:color="@color/dividerColor" android:width="1dp" />
-    <solid android:color="#DCDCDC" />
-</shape>
\ No newline at end of file
+    <solid android:color="@color/dividerColor" />
+</shape>
diff --git a/app/src/main/res/drawable/timetable_lesson_bg_light.xml b/app/src/main/res/drawable/timetable_lesson_bg_light.xml
index 7a17b6cd..39d48096 100644
--- a/app/src/main/res/drawable/timetable_lesson_bg_light.xml
+++ b/app/src/main/res/drawable/timetable_lesson_bg_light.xml
@@ -4,4 +4,5 @@
 
     <corners android:radius="4dp" />
     <stroke android:width="1dp" android:color="#1e000000" />
-</shape>
\ No newline at end of file
+    <solid android:color="#00000000" />
+</shape>
diff --git a/app/src/main/res/layout/activity_crash.xml b/app/src/main/res/layout/activity_crash.xml
index 459e4751..283865e5 100644
--- a/app/src/main/res/layout/activity_crash.xml
+++ b/app/src/main/res/layout/activity_crash.xml
@@ -20,8 +20,7 @@
             android:gravity="center"
             android:orientation="vertical"
             android:paddingBottom="@dimen/customactivityoncrash_activity_vertical_margin"
-            android:paddingLeft="@dimen/customactivityoncrash_activity_horizontal_margin"
-            android:paddingRight="@dimen/customactivityoncrash_activity_horizontal_margin"
+            android:paddingHorizontal="@dimen/customactivityoncrash_activity_horizontal_margin"
             android:paddingTop="@dimen/customactivityoncrash_activity_vertical_margin">
 
             <ImageView
@@ -120,4 +119,4 @@
 
         </LinearLayout>
     </ScrollView>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_gtfo.xml b/app/src/main/res/layout/activity_gtfo.xml
index f0ff621c..668549e6 100644
--- a/app/src/main/res/layout/activity_gtfo.xml
+++ b/app/src/main/res/layout/activity_gtfo.xml
@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
+        android:layout_margin="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/gtfo"
         android:contentDescription="TODO" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_szkolny.xml b/app/src/main/res/layout/activity_szkolny.xml
index bdb2a6e7..2b35b431 100644
--- a/app/src/main/res/layout/activity_szkolny.xml
+++ b/app/src/main/res/layout/activity_szkolny.xml
@@ -40,13 +40,13 @@
             android:layout_marginHorizontal="48dp"
             android:layout_marginVertical="8dp"
             android:background="@drawable/bg_rounded_4dp"
-            android:backgroundTint="#a0ff0000"
             android:fontFamily="sans-serif-light"
             android:gravity="center"
             android:padding="4dp"
             android:textAllCaps="true"
             android:textSize="12sp"
             android:textStyle="bold"
+            tools:backgroundTint="#a0ff0000"
             tools:text="Nightly\n20200503" />
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/attendance_config_dialog.xml b/app/src/main/res/layout/attendance_config_dialog.xml
index 5d7db447..a75da4ac 100644
--- a/app/src/main/res/layout/attendance_config_dialog.xml
+++ b/app/src/main/res/layout/attendance_config_dialog.xml
@@ -13,8 +13,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingStart="24dp"
-            android:paddingEnd="24dp">
+            android:paddingHorizontal="24dp">
 
             <TextView
                 style="@style/TextAppearance.AppCompat.Small"
@@ -34,7 +33,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingBottom="4dp"
+                android:paddingBottom="8dp"
                 android:text="@string/attendance_config_use_symbols_hint"
                 android:textAppearance="@style/NavView.TextView.Helper"
                 android:textSize="12sp"
diff --git a/app/src/main/res/layout/attendance_details_dialog.xml b/app/src/main/res/layout/attendance_details_dialog.xml
index 59ec37c3..34a2dc0d 100644
--- a/app/src/main/res/layout/attendance_details_dialog.xml
+++ b/app/src/main/res/layout/attendance_details_dialog.xml
@@ -27,9 +27,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="24dp"
-            android:paddingTop="24dp"
-            android:paddingRight="24dp">
+            android:paddingHorizontal="24dp"
+            android:paddingTop="24dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/card_home.xml b/app/src/main/res/layout/card_home.xml
index 60e58ec3..f013726b 100644
--- a/app/src/main/res/layout/card_home.xml
+++ b/app/src/main/res/layout/card_home.xml
@@ -6,9 +6,7 @@
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="16dp"
-    android:layout_marginTop="8dp"
-    android:layout_marginRight="16dp"
-    android:layout_marginBottom="8dp"
+    android:layout_marginHorizontal="16dp"
+    android:layout_marginVertical="8dp"
     android:clickable="true"
     android:focusable="true" />
diff --git a/app/src/main/res/layout/card_home_timetable.xml b/app/src/main/res/layout/card_home_timetable.xml
index 842e5b51..88141c86 100644
--- a/app/src/main/res/layout/card_home_timetable.xml
+++ b/app/src/main/res/layout/card_home_timetable.xml
@@ -205,8 +205,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
+                android:layout_marginVertical="4dp"
                 android:background="@color/dividerColor" />
 
             <LinearLayout
@@ -239,8 +238,7 @@
                         style="?android:attr/progressBarStyleHorizontal"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="4dp"
-                        android:layout_marginRight="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:visibility="gone"
                         tools:max="2700"
                         tools:progress="780"
@@ -259,8 +257,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
+                android:layout_marginVertical="4dp"
                 android:background="@color/dividerColor" />
 
             <TextView
diff --git a/app/src/main/res/layout/card_update.xml b/app/src/main/res/layout/card_update.xml
index 5218e51c..3f937409 100644
--- a/app/src/main/res/layout/card_update.xml
+++ b/app/src/main/res/layout/card_update.xml
@@ -53,10 +53,7 @@
                         android:id="@+id/cardUpdateText"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
+                        android:layout_marginHorizontal="8dp"
                         android:layout_marginBottom="8dp"
                         android:text="@string/card_update_text_format"
                         android:textAppearance="@style/TextAppearance.AppCompat.Small"
@@ -86,4 +83,4 @@
             </LinearLayout>
         </com.google.android.material.card.MaterialCardView>
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/dialog_changelog.xml b/app/src/main/res/layout/dialog_changelog.xml
index d1902ec5..4cdb8039 100644
--- a/app/src/main/res/layout/dialog_changelog.xml
+++ b/app/src/main/res/layout/dialog_changelog.xml
@@ -1,8 +1,7 @@
 <FrameLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
+    android:paddingHorizontal="16dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <WebView
@@ -11,4 +10,4 @@
         android:layout_height="wrap_content"
         android:scrollbars="none" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/dialog_config_grades.xml b/app/src/main/res/layout/dialog_config_grades.xml
index 8b7c0f07..78ce28bb 100644
--- a/app/src/main/res/layout/dialog_config_grades.xml
+++ b/app/src/main/res/layout/dialog_config_grades.xml
@@ -14,14 +14,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingStart="24dp"
-            android:paddingEnd="24dp">
+            android:paddingHorizontal="24dp">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="10dp"
+                android:layout_marginVertical="16dp"
                 style="@style/TextAppearance.AppCompat.Small"
                 android:text="@string/grades_config_title"/>
 
@@ -141,8 +139,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="4dp"
+                android:layout_marginVertical="4dp"
                 style="@style/TextAppearance.AppCompat.Small"
                 android:text="@string/menu_grades_sort_mode"/>
 
diff --git a/app/src/main/res/layout/dialog_day.xml b/app/src/main/res/layout/dialog_day.xml
index 484f2b2c..59fd7f8c 100644
--- a/app/src/main/res/layout/dialog_day.xml
+++ b/app/src/main/res/layout/dialog_day.xml
@@ -16,16 +16,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="16dp"
-            android:paddingTop="24dp"
-            android:paddingRight="16dp">
+            android:paddingHorizontal="16dp"
+            android:paddingTop="24dp">
 
             <TextView
                 android:id="@+id/dayDate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginBottom="8dp"
                 android:textAppearance="@style/NavView.TextView.Title"
                 android:textIsSelectable="true"
@@ -35,8 +33,7 @@
                 android:id="@+id/lessonsInfo"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginBottom="8dp"
                 android:textAppearance="@style/NavView.TextView.Helper"
                 android:textIsSelectable="true"
@@ -55,10 +52,8 @@
                     layout="@layout/row_lesson_change_item"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="5dp"
+                    android:layout_marginHorizontal="8dp"
+                    android:layout_marginVertical="5dp"
                     android:visibility="gone"
                     tools:visibility="visible" />
             </LinearLayout>
@@ -74,10 +69,8 @@
                     layout="@layout/row_teacher_absence_item"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="5dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
+                    android:layout_marginHorizontal="8dp"
+                    android:layout_marginVertical="5dp"
                     android:visibility="gone"
                     tools:visibility="visible" />
             </LinearLayout>
@@ -86,10 +79,8 @@
                 android:id="@+id/eventsNoData"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:paddingTop="16dp"
-                android:paddingBottom="16dp"
+                android:layout_marginHorizontal="8dp"
+                android:paddingVertical="16dp"
                 android:orientation="vertical"
                 android:visibility="gone"
                 tools:visibility="visible">
diff --git a/app/src/main/res/layout/dialog_event_details.xml b/app/src/main/res/layout/dialog_event_details.xml
index dc883137..7a9d8004 100644
--- a/app/src/main/res/layout/dialog_event_details.xml
+++ b/app/src/main/res/layout/dialog_event_details.xml
@@ -27,9 +27,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="24dp"
-            android:paddingTop="24dp"
-            android:paddingRight="24dp">
+            android:paddingHorizontal="24dp"
+            android:paddingTop="24dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/dialog_event_list.xml b/app/src/main/res/layout/dialog_event_list.xml
index 7e1c08fe..114d9c1c 100644
--- a/app/src/main/res/layout/dialog_event_list.xml
+++ b/app/src/main/res/layout/dialog_event_list.xml
@@ -16,10 +16,8 @@
                 layout="@layout/row_lesson_change_item"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="5dp"
-                android:layout_marginLeft="24dp"
-                android:layout_marginRight="24dp"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginVertical="5dp"
                 android:visibility="gone"
                 tools:visibility="visible" />
 
@@ -28,10 +26,8 @@
                 layout="@layout/row_teacher_absence_item"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="5dp"
-                android:layout_marginLeft="24dp"
-                android:layout_marginRight="24dp"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginVertical="5dp"
                 android:visibility="gone"
                 tools:visibility="visible" />
 
@@ -39,8 +35,7 @@
                 android:id="@+id/eventListLessonDetails"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="24dp"
-                android:layout_marginRight="24dp"
+                android:layout_marginHorizontal="24dp"
                 android:orientation="vertical">
 
                 <TextView
@@ -87,10 +82,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:clipToPadding="false"
-                android:paddingLeft="16dp"
-                android:paddingTop="8dp"
-                android:paddingRight="16dp"
-                android:paddingBottom="8dp"
+                android:paddingHorizontal="16dp"
+                android:paddingVertical="8dp"
                 tools:listitem="@layout/row_dialog_event_list_item" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/dialog_event_manual.xml b/app/src/main/res/layout/dialog_event_manual.xml
index 0acaf493..1f7ebd5d 100644
--- a/app/src/main/res/layout/dialog_event_manual.xml
+++ b/app/src/main/res/layout/dialog_event_manual.xml
@@ -86,16 +86,14 @@
         android:id="@+id/registerEventManualShare"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         android:text="@string/dialog_event_manual_share_enabled" />
 
     <TextView
         android:id="@+id/registerEventManualShareText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         android:text="@string/dialog_event_manual_share_first_notice"
         android:visibility="gone"
         tools:visibility="visible" />
@@ -231,4 +229,4 @@
             android:text="@string/dialog_event_manual_no_subject" />
     </com.google.android.material.textfield.TextInputLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_event_manual_v2.xml b/app/src/main/res/layout/dialog_event_manual_v2.xml
index 0c091883..b8e12927 100644
--- a/app/src/main/res/layout/dialog_event_manual_v2.xml
+++ b/app/src/main/res/layout/dialog_event_manual_v2.xml
@@ -139,8 +139,7 @@
             android:id="@+id/showMore"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
+            android:paddingVertical="16dp"
             android:text="@string/dialog_event_manual_more_options"
             android:background="?selectableItemBackground"
 
diff --git a/app/src/main/res/layout/dialog_grade_details.xml b/app/src/main/res/layout/dialog_grade_details.xml
index 92781772..c97e9fd8 100644
--- a/app/src/main/res/layout/dialog_grade_details.xml
+++ b/app/src/main/res/layout/dialog_grade_details.xml
@@ -41,9 +41,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="24dp"
-            android:paddingTop="24dp"
-            android:paddingRight="24dp">
+            android:paddingHorizontal="24dp"
+            android:paddingTop="24dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -261,8 +260,7 @@
                 android:id="@+id/gradeHistoryNest"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="-8dp"
-                android:layout_marginRight="-8dp"
+                android:layout_marginHorizontal="-8dp"
                 android:visibility="@{historyVisible ? View.VISIBLE : View.GONE}">
 
                 <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/dialog_lesson_change_list.xml b/app/src/main/res/layout/dialog_lesson_change_list.xml
index 180eadb4..2925813f 100644
--- a/app/src/main/res/layout/dialog_lesson_change_list.xml
+++ b/app/src/main/res/layout/dialog_lesson_change_list.xml
@@ -6,10 +6,8 @@
         android:id="@+id/lessonChangeView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:paddingLeft="24dp"
-        android:paddingRight="24dp"
         android:clipToPadding="false"
+        android:paddingHorizontal="24dp"
+        android:paddingVertical="8dp"
         tools:listitem="@layout/timetable_lesson" />
 </layout>
diff --git a/app/src/main/res/layout/dialog_lesson_details.xml b/app/src/main/res/layout/dialog_lesson_details.xml
index 0a407420..dcc76e5e 100644
--- a/app/src/main/res/layout/dialog_lesson_details.xml
+++ b/app/src/main/res/layout/dialog_lesson_details.xml
@@ -31,9 +31,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="16dp"
-            android:paddingTop="24dp"
-            android:paddingRight="16dp">
+            android:paddingHorizontal="16dp"
+            android:paddingTop="24dp">
 
             <TextView
                 android:id="@+id/annotation"
@@ -41,8 +40,7 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/timetable_lesson_annotation"
                 android:fontFamily="sans-serif-condensed"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
+                android:paddingHorizontal="8dp"
                 android:text="@string/timetable_lesson_cancelled"
                 android:textColor="#000"
                 android:textSize="12sp"
@@ -54,8 +52,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
@@ -133,9 +130,8 @@
                 android:id="@+id/shiftedLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginRight="8dp"
                 android:baselineAligned="false"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
@@ -161,9 +157,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginRight="8dp"
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
@@ -233,8 +228,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:baselineAligned="false"
                 android:orientation="horizontal">
 
@@ -304,10 +298,8 @@
                 android:id="@+id/eventsNoData"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:paddingTop="16dp"
-                android:paddingBottom="16dp"
+                android:layout_marginHorizontal="8dp"
+                android:paddingVertical="16dp"
                 android:orientation="vertical"
                 android:visibility="gone"
                 tools:visibility="visible">
diff --git a/app/src/main/res/layout/dialog_register_unavailable.xml b/app/src/main/res/layout/dialog_register_unavailable.xml
index a47bf17c..0880179d 100644
--- a/app/src/main/res/layout/dialog_register_unavailable.xml
+++ b/app/src/main/res/layout/dialog_register_unavailable.xml
@@ -36,10 +36,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingLeft="24dp"
-                android:paddingTop="16dp"
-                android:paddingRight="24dp"
-                android:paddingBottom="16dp">
+                android:paddingHorizontal="24dp"
+                android:paddingVertical="16dp">
 
                 <TextView
                     android:id="@+id/title"
diff --git a/app/src/main/res/layout/dialog_teacher_absence_list.xml b/app/src/main/res/layout/dialog_teacher_absence_list.xml
index e29a6a4b..4ebfc924 100644
--- a/app/src/main/res/layout/dialog_teacher_absence_list.xml
+++ b/app/src/main/res/layout/dialog_teacher_absence_list.xml
@@ -6,10 +6,8 @@
         android:id="@+id/teacherAbsenceView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:paddingLeft="24dp"
-        android:paddingRight="24dp"
         android:clipToPadding="false"
+        android:paddingHorizontal="24dp"
+        android:paddingVertical="8dp"
         tools:listitem="@layout/row_dialog_teacher_absence_item" />
 </layout>
diff --git a/app/src/main/res/layout/dialog_template.xml b/app/src/main/res/layout/dialog_template.xml
index e9b1011f..2aa3790d 100644
--- a/app/src/main/res/layout/dialog_template.xml
+++ b/app/src/main/res/layout/dialog_template.xml
@@ -8,9 +8,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="16dp"
-        android:paddingTop="24dp"
-        android:paddingRight="16dp">
+        android:paddingHorizontal="16dp"
+        android:paddingTop="24dp">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -22,4 +21,4 @@
             android:layout_height="wrap_content"
             android:text="Click me"/>
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/event_list_item.xml b/app/src/main/res/layout/event_list_item.xml
index f8f42ef9..24445327 100644
--- a/app/src/main/res/layout/event_list_item.xml
+++ b/app/src/main/res/layout/event_list_item.xml
@@ -90,8 +90,7 @@
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 android:layout_gravity="top"
-                android:layout_marginLeft="4dp"
-                android:layout_marginRight="4dp"
+                android:layout_marginHorizontal="4dp"
                 android:visibility="gone"
                 app:iiv_color="@color/md_green_500"
                 app:iiv_icon="cmd-check"
diff --git a/app/src/main/res/layout/fragment_announcements.xml b/app/src/main/res/layout/fragment_announcements.xml
index e25911f8..cb7d38d0 100644
--- a/app/src/main/res/layout/fragment_announcements.xml
+++ b/app/src/main/res/layout/fragment_announcements.xml
@@ -21,12 +21,7 @@
             android:id="@+id/announcementsNoData"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_margin="8dp"
             android:text="@string/school_notices_no_data"
             android:textSize="18sp"
             android:textStyle="italic"
@@ -37,4 +32,4 @@
             app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index c0ddb3d4..5d89279f 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -59,8 +59,7 @@
                         android:id="@+id/presentCount"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
+                        android:layout_marginHorizontal="5dp"
                         android:textStyle="bold"
                         tools:text="0" />
                 </LinearLayout>
@@ -79,8 +78,7 @@
                         android:id="@+id/absentCount"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
+                        android:layout_marginHorizontal="5dp"
                         android:textStyle="bold"
                         tools:text="0" />
                 </LinearLayout>
@@ -99,8 +97,7 @@
                         android:id="@+id/absentUnexcusedCount"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
+                        android:layout_marginHorizontal="5dp"
                         android:textStyle="bold"
                         tools:text="0" />
                 </LinearLayout>
@@ -119,8 +116,7 @@
                         android:id="@+id/belatedCount"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
+                        android:layout_marginHorizontal="5dp"
                         android:textStyle="bold"
                         tools:text="0" />
                 </LinearLayout>
@@ -139,8 +135,7 @@
                         android:id="@+id/releasedCount"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
+                        android:layout_marginHorizontal="5dp"
                         android:textStyle="bold"
                         tools:text="8" />
 
@@ -152,8 +147,7 @@
                 android:id="@+id/attendancePercentage"
                 android:layout_width="160dp"
                 android:layout_height="160dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_weight="1"
                 app:direction="clockwise"
                 app:drawDot="false"
diff --git a/app/src/main/res/layout/fragment_behaviour.xml b/app/src/main/res/layout/fragment_behaviour.xml
index 23d2a99f..79b8554e 100644
--- a/app/src/main/res/layout/fragment_behaviour.xml
+++ b/app/src/main/res/layout/fragment_behaviour.xml
@@ -17,8 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp">
+            android:layout_marginHorizontal="8dp">
 
             <TextView
                 android:id="@+id/noticesSummaryTitle"
@@ -43,8 +42,7 @@
                     android:id="@+id/noticesPraisesCount"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginHorizontal="5dp"
                     android:textStyle="bold"
                     tools:text="0" />
             </LinearLayout>
@@ -63,8 +61,7 @@
                     android:id="@+id/noticesWarningsCount"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginHorizontal="5dp"
                     android:textStyle="bold"
                     tools:text="0" />
             </LinearLayout>
@@ -83,8 +80,7 @@
                     android:id="@+id/noticesOtherCount"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginHorizontal="5dp"
                     android:textStyle="bold"
                     tools:text="0" />
             </LinearLayout>
@@ -132,4 +128,4 @@
         </FrameLayout>
     </LinearLayout>
     </pl.szczodrzynski.edziennik.utils.SwipeRefreshLayoutNoIndicator>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_debug.xml b/app/src/main/res/layout/fragment_debug.xml
index 2fecffa5..bf27e110 100644
--- a/app/src/main/res/layout/fragment_debug.xml
+++ b/app/src/main/res/layout/fragment_debug.xml
@@ -11,11 +11,8 @@
         android:id="@+id/runLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
+        android:layout_marginHorizontal="8dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -33,10 +30,7 @@
         android:id="@+id/textView3"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         android:text="@string/debug_notice"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -48,10 +42,7 @@
         android:id="@+id/debugRegister"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         style="@style/Widget.MaterialComponents.Button"
         android:text="Run"
         app:layout_constraintEnd_toStartOf="@+id/guideline2"
@@ -69,10 +60,7 @@
         android:id="@+id/debugAppconfig"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         style="@style/Widget.MaterialComponents.Button"
         android:text="AppConfig"
         app:layout_constraintEnd_toStartOf="@+id/guideline3"
@@ -90,10 +78,7 @@
         android:id="@+id/debugAppprofile"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         style="@style/Widget.MaterialComponents.Button"
         android:text="AppProfile"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_feedback.xml b/app/src/main/res/layout/fragment_feedback.xml
index 68e75a12..79d1466d 100644
--- a/app/src/main/res/layout/fragment_feedback.xml
+++ b/app/src/main/res/layout/fragment_feedback.xml
@@ -18,9 +18,7 @@
                 android:id="@+id/targetDeviceDropDown"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint=""
-                android:paddingEnd="6.0dip"
-                android:paddingRight="6.0dip" />
+                android:hint="" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <LinearLayout
@@ -32,11 +30,8 @@
                 android:id="@+id/faqText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
                 android:autoLink="all"
                 android:background="?selectableItemBackground"
                 android:text="@string/feedback_faq"
@@ -48,9 +43,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
-                android:layout_marginLeft="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginRight="8dp"
                 android:text="@string/feedback_faq_button"
                 android:visibility="gone" />
 
@@ -66,11 +60,8 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
                 android:text="@string/feedback_title"
                 android:textSize="20sp" />
 
@@ -78,11 +69,8 @@
                 style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
                 android:hint="@string/feedback_ask_a_question"
                 app:errorEnabled="true"
                 app:hintAnimationEnabled="true"
@@ -115,16 +103,14 @@
             android:id="@+id/chatLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginVertical="8dp"
             android:orientation="vertical"
             android:visibility="visible">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:text="@string/feedback_history"
                 android:textSize="20sp" />
 
@@ -132,9 +118,8 @@
                 android:id="@+id/chat_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp" />
+                android:layout_marginVertical="8dp" />
         </LinearLayout>
 
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_grades_editor.xml b/app/src/main/res/layout/fragment_grades_editor.xml
index 805aee24..242b8a02 100644
--- a/app/src/main/res/layout/fragment_grades_editor.xml
+++ b/app/src/main/res/layout/fragment_grades_editor.xml
@@ -10,9 +10,8 @@
             android:id="@+id/subjectName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
+            android:layout_marginHorizontal="8dp"
             android:layout_marginTop="8dp"
-            android:layout_marginRight="8dp"
             android:textSize="24sp"
             android:textAppearance="@style/NavView.TextView.Title"
             tools:text="geografia" />
@@ -21,9 +20,8 @@
             android:id="@+id/semesterName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
+            android:layout_marginHorizontal="8dp"
             android:layout_marginTop="8dp"
-            android:layout_marginRight="8dp"
             android:textAppearance="@style/NavView.TextView.Subtitle"
             tools:text="Semestr 1" />
 
@@ -36,8 +34,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:text="@string/grades_editor_semester_average_before" />
 
             <TextView
@@ -47,8 +44,7 @@
                 android:layout_marginEnd="5dp"
                 android:layout_marginRight="5dp"
                 android:background="@drawable/bg_rounded_4dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
+                android:paddingHorizontal="5dp"
                 android:textColor="@color/black"
                 android:textStyle="bold"
                 tools:text="0.63" />
@@ -63,8 +59,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:text="@string/grades_editor_semester_average_after" />
 
             <TextView
@@ -74,8 +69,7 @@
                 android:layout_marginEnd="5dp"
                 android:layout_marginRight="5dp"
                 android:background="@drawable/bg_rounded_4dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
+                android:paddingHorizontal="5dp"
                 android:textColor="@color/black"
                 android:textStyle="bold"
                 tools:text="2.75" />
@@ -96,8 +90,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:text="@string/grades_editor_semester_year_average_before" />
 
                 <TextView
@@ -107,8 +100,7 @@
                     android:layout_marginEnd="5dp"
                     android:layout_marginRight="5dp"
                     android:background="@drawable/bg_rounded_4dp"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
+                    android:paddingHorizontal="5dp"
                     android:textColor="@color/black"
                     android:textStyle="bold"
                     tools:text="0.63" />
@@ -123,8 +115,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:text="@string/grades_editor_semester_year_average_after" />
 
                 <TextView
@@ -134,8 +125,7 @@
                     android:layout_marginEnd="5dp"
                     android:layout_marginRight="5dp"
                     android:background="@drawable/bg_rounded_4dp"
-                    android:paddingLeft="5dp"
-                    android:paddingRight="5dp"
+                    android:paddingHorizontal="5dp"
                     android:textColor="@color/black"
                     android:textStyle="bold"
                     tools:text="2.75" />
@@ -146,9 +136,8 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
+            android:layout_marginHorizontal="8dp"
             android:layout_marginTop="8dp"
-            android:layout_marginRight="8dp"
             android:text="@string/grades_editor_modify_help"
             android:textStyle="italic" />
 
@@ -156,9 +145,8 @@
             android:id="@+id/addGrade"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
+            android:layout_marginHorizontal="8dp"
             android:layout_marginTop="8dp"
-            android:layout_marginRight="8dp"
             android:minHeight="0dp"
             android:text="@string/grades_editor_add_grade" />
 
@@ -166,9 +154,8 @@
             android:id="@+id/restoreGrades"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
+            android:layout_marginHorizontal="8dp"
             android:layout_marginTop="8dp"
-            android:layout_marginRight="8dp"
             android:minHeight="0dp"
             android:text="@string/grades_editor_restore" />
 
@@ -179,4 +166,4 @@
             android:layout_height="match_parent" />
 
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_loading.xml b/app/src/main/res/layout/fragment_loading.xml
index 1c740c19..b6e4ae34 100644
--- a/app/src/main/res/layout/fragment_loading.xml
+++ b/app/src/main/res/layout/fragment_loading.xml
@@ -22,11 +22,10 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="40dp"
+            android:layout_marginHorizontal="40dp"
             android:layout_marginTop="20dp"
-            android:layout_marginRight="40dp"
             android:gravity="center"
             android:text="@string/profile_empty_error_home_subtitle"
             android:textSize="22sp" />
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/fragment_timetable_v2.xml b/app/src/main/res/layout/fragment_timetable_v2.xml
index 953638cf..af7995d2 100644
--- a/app/src/main/res/layout/fragment_timetable_v2.xml
+++ b/app/src/main/res/layout/fragment_timetable_v2.xml
@@ -73,9 +73,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginHorizontal="32dp"
                     android:layout_marginTop="16dp"
-                    android:layout_marginEnd="32dp"
                     android:gravity="center"
                     android:text="@string/timetable_not_public_text"
                     android:textSize="16sp" />
@@ -83,9 +82,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
+                    android:layout_marginHorizontal="32dp"
                     android:layout_marginTop="16dp"
-                    android:layout_marginEnd="32dp"
                     android:gravity="center"
                     android:text="@string/timetable_not_public_hint"
                     android:textSize="14sp" />
diff --git a/app/src/main/res/layout/grades_item_grade.xml b/app/src/main/res/layout/grades_item_grade.xml
index 10cc06b2..1ff1f0b0 100644
--- a/app/src/main/res/layout/grades_item_grade.xml
+++ b/app/src/main/res/layout/grades_item_grade.xml
@@ -11,8 +11,7 @@
         android:layout_height="wrap_content"
         android:background="?selectableItemBackground"
         android:orientation="horizontal"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp">
+        android:paddingVertical="8dp">
 
         <pl.szczodrzynski.edziennik.ui.modules.grades.GradeView
             android:id="@+id/gradeName"
@@ -89,10 +88,7 @@
                     android:id="@+id/gradeCategory"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:ellipsize="end"
                     android:maxWidth="200dp"
                     android:maxLines="1"
diff --git a/app/src/main/res/layout/grades_item_stats.xml b/app/src/main/res/layout/grades_item_stats.xml
index 1d990737..765aed8b 100644
--- a/app/src/main/res/layout/grades_item_stats.xml
+++ b/app/src/main/res/layout/grades_item_stats.xml
@@ -41,8 +41,7 @@
             android:id="@+id/normalTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginHorizontal="8dp"
             android:text="@string/grades_stats_normal"
             android:textAppearance="@style/NavView.TextView.Subtitle" />
 
@@ -51,8 +50,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp">
+            android:paddingHorizontal="8dp">
 
             <LinearLayout
                 android:id="@+id/normalSemester1Layout"
@@ -183,9 +181,8 @@
             android:id="@+id/pointTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginHorizontal="8dp"
             android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
             android:text="@string/grades_stats_point"
             android:textAppearance="@style/NavView.TextView.Subtitle" />
 
@@ -194,8 +191,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp">
+            android:paddingHorizontal="8dp">
 
             <LinearLayout
                 android:id="@+id/pointSemester1Layout"
diff --git a/app/src/main/res/layout/login_summary_fragment.xml b/app/src/main/res/layout/login_summary_fragment.xml
index 174087e8..3f4ba4dd 100644
--- a/app/src/main/res/layout/login_summary_fragment.xml
+++ b/app/src/main/res/layout/login_summary_fragment.xml
@@ -64,8 +64,7 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="24dp"
             android:checked="true"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
+            android:paddingVertical="16dp"
             android:text="@string/login_allow_registration" />
 
         <LinearLayout
diff --git a/app/src/main/res/layout/material_drawer_header.xml b/app/src/main/res/layout/material_drawer_header.xml
index b286b60c..51fffb92 100644
--- a/app/src/main/res/layout/material_drawer_header.xml
+++ b/app/src/main/res/layout/material_drawer_header.xml
@@ -48,8 +48,7 @@
         android:gravity="center"
         android:lines="1"
         android:minWidth="20dp"
-        android:paddingLeft="1dp"
-        android:paddingRight="1dp"
+        android:paddingHorizontal="1dp"
         android:singleLine="true"
         android:textSize="@dimen/material_drawer_item_badge_text"
         app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_current"
@@ -82,8 +81,7 @@
         android:gravity="center"
         android:lines="1"
         android:minWidth="20dp"
-        android:paddingLeft="1dp"
-        android:paddingRight="1dp"
+        android:paddingHorizontal="1dp"
         android:singleLine="true"
         android:textSize="@dimen/material_drawer_item_badge_small_text"
         app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_small_first"
@@ -116,8 +114,7 @@
         android:gravity="center"
         android:lines="1"
         android:minWidth="20dp"
-        android:paddingLeft="1dp"
-        android:paddingRight="1dp"
+        android:paddingHorizontal="1dp"
         android:singleLine="true"
         android:textSize="@dimen/material_drawer_item_badge_small_text"
         app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_small_second"
@@ -150,8 +147,7 @@
         android:gravity="center"
         android:lines="1"
         android:minWidth="20dp"
-        android:paddingLeft="1dp"
-        android:paddingRight="1dp"
+        android:paddingHorizontal="1dp"
         android:singleLine="true"
         android:textSize="@dimen/material_drawer_item_badge_small_text"
         app:layout_constraintBottom_toBottomOf="@id/material_drawer_account_header_small_third"
diff --git a/app/src/main/res/layout/material_drawer_item_profile.xml b/app/src/main/res/layout/material_drawer_item_profile.xml
index e1ac9f8e..a71ce017 100644
--- a/app/src/main/res/layout/material_drawer_item_profile.xml
+++ b/app/src/main/res/layout/material_drawer_item_profile.xml
@@ -7,10 +7,7 @@
     android:clipChildren="false"
     android:clipToPadding="false"
     android:orientation="horizontal"
-    android:paddingStart="@dimen/material_drawer_vertical_padding"
-    android:paddingLeft="@dimen/material_drawer_vertical_padding"
-    android:paddingEnd="@dimen/material_drawer_vertical_padding"
-    android:paddingRight="@dimen/material_drawer_vertical_padding">
+    android:paddingHorizontal="@dimen/material_drawer_vertical_padding">
 
     <com.mikepenz.materialdrawer.view.BezelImageView
         android:id="@+id/material_drawer_profileIcon"
@@ -98,8 +95,7 @@
             android:gravity="center"
             android:lines="1"
             android:minWidth="20dp"
-            android:paddingLeft="1dp"
-            android:paddingRight="1dp"
+            android:paddingHorizontal="1dp"
             android:singleLine="true"
             android:textSize="@dimen/material_drawer_item_primary_text"
             tools:text="99" />
diff --git a/app/src/main/res/layout/md_simplelist_item.xml b/app/src/main/res/layout/md_simplelist_item.xml
index 6b16dc46..34a84221 100644
--- a/app/src/main/res/layout/md_simplelist_item.xml
+++ b/app/src/main/res/layout/md_simplelist_item.xml
@@ -10,10 +10,7 @@
     android:gravity="start|center_vertical"
     android:minHeight="@dimen/md_simpleitem_height"
     android:orientation="horizontal"
-    android:paddingEnd="@dimen/md_dialog_frame_margin"
-    android:paddingLeft="@dimen/md_dialog_frame_margin"
-    android:paddingRight="@dimen/md_dialog_frame_margin"
-    android:paddingStart="@dimen/md_dialog_frame_margin">
+    android:paddingHorizontal="@dimen/md_dialog_frame_margin">
 
     <androidx.cardview.widget.CardView
         android:layout_width="wrap_content"
@@ -45,4 +42,4 @@
         android:textSize="@dimen/md_simplelist_textsize"
         tools:text="Title" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/message_fragment.xml b/app/src/main/res/layout/message_fragment.xml
index bb252b11..b368e671 100644
--- a/app/src/main/res/layout/message_fragment.xml
+++ b/app/src/main/res/layout/message_fragment.xml
@@ -117,9 +117,8 @@
                         android:background="?selectableItemBackground"
                         android:ellipsize="end"
                         android:maxLines="2"
-                        android:paddingLeft="8dp"
+                        android:paddingHorizontal="8dp"
                         android:paddingTop="12dp"
-                        android:paddingRight="8dp"
                         android:textAppearance="@style/NavView.TextView.Subtitle"
                         tools:text="Allegro - wysyłamy duużo wiadomości!!! Masz nowe oferty! Możesz kupić nowego laptopa! Ale super! Ehh, to jest nadawca a nie temat więc nwm czemu to tutaj wpisałem" />
 
@@ -139,11 +138,9 @@
                     android:id="@+id/body"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
+                    android:layout_marginVertical="8dp"
                     android:minHeight="250dp"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
+                    android:paddingHorizontal="16dp"
                     android:textIsSelectable="true"
                     tools:text="To jest treść wiadomości.\n\nZazwyczaj ma wiele linijek.\n\nTak" />
 
@@ -155,9 +152,8 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dp"
+                    android:layout_marginHorizontal="16dp"
                     android:layout_marginTop="8dp"
-                    android:layout_marginRight="16dp"
                     android:text="Odbiorcy wiadomości:"
                     android:textAppearance="@style/NavView.TextView.Subtitle" />
 
@@ -165,17 +161,15 @@
                     android:id="@+id/recipients"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
+                    android:paddingHorizontal="16dp"
                     tools:text=" - Jan Kowalski, przeczytano: nie\n - Adam Dodatkowy, przeczytano: 20 marca, 17:35" />
 
                 <TextView
                     android:id="@+id/attachmentsTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dp"
+                    android:layout_marginHorizontal="16dp"
                     android:layout_marginTop="8dp"
-                    android:layout_marginRight="16dp"
                     android:text="Załączniki:"
                     android:textAppearance="@style/NavView.TextView.Subtitle" />
 
@@ -183,15 +177,13 @@
                     android:id="@+id/attachmentsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="8dp"
-                    android:layout_marginBottom="8dp"/>
+                    android:layout_marginHorizontal="8dp" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginBottom="8dp"
+                    android:layout_marginHorizontal="8dp"
+                    android:layout_marginVertical="8dp"
                     android:orientation="horizontal"
                     android:visibility="visible"
                     tools:visibility="visible">
@@ -200,16 +192,13 @@
                         android:id="@+id/replyButton"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginLeft="4dp"
-                        android:layout_marginRight="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:background="@drawable/bg_rounded_ripple"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:paddingLeft="4dp"
-                        android:paddingTop="8dp"
-                        android:paddingRight="4dp"
-                        android:paddingBottom="8dp">
+                        android:paddingHorizontal="4dp"
+                        android:paddingVertical="8dp">
 
                         <com.mikepenz.iconics.view.IconicsImageView
                             android:id="@+id/replyIcon"
@@ -233,16 +222,13 @@
                         android:id="@+id/forwardButton"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginLeft="4dp"
-                        android:layout_marginRight="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:background="@drawable/bg_rounded_ripple"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:paddingLeft="4dp"
-                        android:paddingTop="8dp"
-                        android:paddingRight="4dp"
-                        android:paddingBottom="8dp">
+                        android:paddingHorizontal="4dp"
+                        android:paddingVertical="8dp">
 
                         <com.mikepenz.iconics.view.IconicsImageView
                             android:id="@+id/forwardIcon"
@@ -267,16 +253,13 @@
                         android:id="@+id/deleteButton"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginLeft="4dp"
-                        android:layout_marginRight="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:background="@drawable/bg_rounded_ripple"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:paddingLeft="4dp"
-                        android:paddingTop="8dp"
-                        android:paddingRight="4dp"
-                        android:paddingBottom="8dp"
+                        android:paddingHorizontal="4dp"
+                        android:paddingVertical="8dp"
                         android:visibility="visible">
 
                         <com.mikepenz.iconics.view.IconicsImageView
@@ -300,16 +283,13 @@
                         android:id="@+id/downloadButton"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginLeft="4dp"
-                        android:layout_marginRight="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:background="@drawable/bg_rounded_ripple"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:paddingLeft="4dp"
-                        android:paddingTop="8dp"
-                        android:paddingRight="4dp"
-                        android:paddingBottom="8dp"
+                        android:paddingHorizontal="4dp"
+                        android:paddingVertical="8dp"
                         android:visibility="visible">
 
                         <com.mikepenz.iconics.view.IconicsImageView
diff --git a/app/src/main/res/layout/messages_compose_fragment.xml b/app/src/main/res/layout/messages_compose_fragment.xml
index fa056966..9363a92f 100644
--- a/app/src/main/res/layout/messages_compose_fragment.xml
+++ b/app/src/main/res/layout/messages_compose_fragment.xml
@@ -87,8 +87,7 @@
                 android:id="@+id/fontStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:layout_marginTop="4dp">
 
                 <com.google.android.material.button.MaterialButton
@@ -125,8 +124,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/Widget.MaterialComponents.Button.OutlinedButton"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:text="Breakpoints!"
                 android:visibility="gone"/>
 
diff --git a/app/src/main/res/layout/messages_details.xml b/app/src/main/res/layout/messages_details.xml
index 3be6310b..5aa8f319 100644
--- a/app/src/main/res/layout/messages_details.xml
+++ b/app/src/main/res/layout/messages_details.xml
@@ -59,12 +59,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_margin="8dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -132,9 +127,8 @@
                         android:background="?selectableItemBackground"
                         android:ellipsize="end"
                         android:maxLines="3"
-                        android:paddingLeft="8dp"
+                        android:paddingHorizontal="8dp"
                         android:paddingTop="12dp"
-                        android:paddingRight="8dp"
                         android:textAppearance="@style/NavView.TextView.Subtitle"
                         app:layout_constraintEnd_toStartOf="@+id/messageDate"
                         app:layout_constraintStart_toEndOf="@+id/messageProfileBackground"
@@ -159,12 +153,10 @@
                     android:id="@+id/messageBody"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
+                    android:layout_marginVertical="8dp"
                     android:autoLink="all"
                     android:minHeight="250dp"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
+                    android:paddingHorizontal="16dp"
                     android:textIsSelectable="true"
                     tools:text="To jest treść wiadomości.\n\nZazwyczaj ma wiele linijek.\n\nTak" />
 
@@ -176,9 +168,8 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dp"
+                    android:layout_marginHorizontal="16dp"
                     android:layout_marginTop="8dp"
-                    android:layout_marginRight="16dp"
                     android:text="Odbiorcy wiadomości:"
                     android:textAppearance="@style/NavView.TextView.Subtitle" />
 
@@ -186,17 +177,15 @@
                     android:id="@+id/messageRecipients"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
+                    android:paddingHorizontal="16dp"
                     tools:text=" - Jan Kowalski, przeczytano: nie\n - Adam Dodatkowy, przeczytano: 20 marca, 17:35" />
 
                 <TextView
                     android:id="@+id/messageAttachmentsTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="16dp"
+                    android:layout_marginHorizontal="16dp"
                     android:layout_marginTop="8dp"
-                    android:layout_marginRight="16dp"
                     android:text="Załączniki:"
                     android:textAppearance="@style/NavView.TextView.Subtitle" />
 
@@ -205,8 +194,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
+                    android:paddingHorizontal="16dp"
                     android:paddingBottom="8dp">
 
                     <FrameLayout
@@ -235,8 +223,7 @@
                             android:layout_width="18dp"
                             android:layout_height="18dp"
                             android:layout_gravity="center_vertical|end"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginRight="8dp" />
+                            android:layout_marginHorizontal="8dp" />
 
                     </FrameLayout>
 
@@ -264,8 +251,7 @@
                             android:layout_width="18dp"
                             android:layout_height="18dp"
                             android:layout_gravity="center_vertical|end"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginRight="8dp" />
+                            android:layout_marginHorizontal="8dp" />
 
                     </FrameLayout>
 
@@ -274,8 +260,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:layout_marginBottom="8dp"
                     android:orientation="horizontal"
                     android:visibility="gone"
@@ -285,16 +270,13 @@
                         android:id="@+id/messageReplyButton"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginLeft="4dp"
-                        android:layout_marginRight="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:background="@drawable/bg_rounded_ripple"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:paddingLeft="4dp"
-                        android:paddingTop="8dp"
-                        android:paddingRight="4dp"
-                        android:paddingBottom="8dp">
+                        android:paddingHorizontal="4dp"
+                        android:paddingVertical="8dp">
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -316,16 +298,13 @@
                         android:id="@+id/messageForwardButton"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginLeft="4dp"
-                        android:layout_marginRight="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:background="@drawable/bg_rounded_ripple"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:paddingLeft="4dp"
-                        android:paddingTop="8dp"
-                        android:paddingRight="4dp"
-                        android:paddingBottom="8dp">
+                        android:paddingHorizontal="4dp"
+                        android:paddingVertical="8dp">
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -348,16 +327,13 @@
                         android:id="@+id/messageRemoveButton"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginLeft="4dp"
-                        android:layout_marginRight="4dp"
+                        android:layout_marginHorizontal="4dp"
                         android:layout_weight="1"
                         android:background="@drawable/bg_rounded_ripple"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:paddingLeft="4dp"
-                        android:paddingTop="8dp"
-                        android:paddingRight="4dp"
-                        android:paddingBottom="8dp">
+                        android:paddingHorizontal="4dp"
+                        android:paddingVertical="8dp">
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -380,4 +356,4 @@
         </ScrollView>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/messages_item.xml b/app/src/main/res/layout/messages_item.xml
index 32616e01..d095a992 100644
--- a/app/src/main/res/layout/messages_item.xml
+++ b/app/src/main/res/layout/messages_item.xml
@@ -50,8 +50,7 @@
             android:layout_marginEnd="4dp"
             android:layout_marginRight="4dp"
             android:adjustViewBounds="true"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
+            android:paddingVertical="2dp"
             android:scaleType="fitCenter"
             app:iiv_icon="cmd-attachment"
             app:iiv_color="?android:textColorSecondary"
@@ -64,10 +63,7 @@
             android:id="@+id/messageSubject"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginHorizontal="8dp"
             android:singleLine="true"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
@@ -97,10 +93,7 @@
             android:id="@+id/messageBody"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginHorizontal="8dp"
             android:layout_marginBottom="12dp"
             android:singleLine="true"
             android:textAppearance="@style/NavView.TextView.Helper"
@@ -123,4 +116,4 @@
             tools:text="02:00" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/messages_list_item.xml b/app/src/main/res/layout/messages_list_item.xml
index 6bd8af55..d8c1b8d8 100644
--- a/app/src/main/res/layout/messages_list_item.xml
+++ b/app/src/main/res/layout/messages_list_item.xml
@@ -39,10 +39,7 @@
             android:id="@+id/messageSubject"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginHorizontal="8dp"
             android:singleLine="true"
             android:textStyle="normal"
             android:textAppearance="@style/NavView.TextView.Helper"
@@ -73,10 +70,7 @@
             android:id="@+id/messageBody"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
+            android:layout_marginHorizontal="8dp"
             android:layout_marginBottom="12dp"
             android:singleLine="true"
             android:textAppearance="@style/NavView.TextView.Helper"
@@ -105,8 +99,7 @@
             android:layout_marginEnd="4dp"
             android:layout_marginRight="4dp"
             android:adjustViewBounds="true"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
+            android:paddingVertical="2dp"
             android:scaleType="fitCenter"
             app:iiv_color="?android:textColorSecondary"
             app:iiv_icon="cmd-attachment"
diff --git a/app/src/main/res/layout/recaptcha_view.xml b/app/src/main/res/layout/recaptcha_view.xml
index dba7824b..42f430e2 100644
--- a/app/src/main/res/layout/recaptcha_view.xml
+++ b/app/src/main/res/layout/recaptcha_view.xml
@@ -8,9 +8,8 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
+        android:paddingHorizontal="16dp"
         android:paddingTop="24dp"
-        android:paddingRight="16dp"
         android:paddingBottom="8dp">
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
@@ -30,8 +29,7 @@
                     android:id="@+id/checkbox"
                     android:layout_width="28dp"
                     android:layout_height="28dp"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginRight="12dp"
+                    android:layout_marginHorizontal="12dp"
                     android:background="@drawable/recaptcha_checkbox_border"
                     android:foreground="?selectableItemBackgroundBorderless">
 
@@ -67,8 +65,7 @@
                         <ImageView
                             android:layout_width="32dp"
                             android:layout_height="32dp"
-                            android:layout_marginLeft="13dp"
-                            android:layout_marginRight="13dp"
+                            android:layout_marginHorizontal="13dp"
                             app:srcCompat="@drawable/recaptcha"/>
                         <TextView
                             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/row_attendance_item.xml b/app/src/main/res/layout/row_attendance_item.xml
index 5631ab87..af5ca544 100644
--- a/app/src/main/res/layout/row_attendance_item.xml
+++ b/app/src/main/res/layout/row_attendance_item.xml
@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp">
+    android:paddingVertical="8dp">
 
     <TextView
         android:id="@+id/attendanceType"
@@ -44,10 +43,7 @@
         android:id="@+id/attendanceSubject"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif-medium"
         android:singleLine="true"
@@ -60,10 +56,7 @@
         android:id="@+id/attendanceTeacher"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
+        android:layout_marginHorizontal="8dp"
         android:ellipsize="end"
         android:singleLine="true"
         android:textAppearance="@style/NavView.TextView.Helper"
@@ -77,10 +70,9 @@
         android:id="@+id/attendanceTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="0dp"
+        android:layout_marginVertical="0dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
-        android:layout_marginBottom="0dp"
         android:textAppearance="@style/NavView.TextView.Helper"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/row_dialog_event_list_item.xml b/app/src/main/res/layout/row_dialog_event_list_item.xml
index 1ac0f53b..111313d8 100644
--- a/app/src/main/res/layout/row_dialog_event_list_item.xml
+++ b/app/src/main/res/layout/row_dialog_event_list_item.xml
@@ -80,11 +80,8 @@
                     android:id="@+id/eventListItemTeacherName"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:layout_marginTop="4dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
                     android:ellipsize="end"
                     android:maxLines="2"
                     android:textAppearance="@style/NavView.TextView.Helper"
@@ -134,11 +131,8 @@
                     android:id="@+id/eventListItemSharedBy"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:layout_marginTop="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
                     android:ellipsize="end"
                     android:maxLines="1"
                     tools:text="{cmd-share-variant} przez Jan Kowalski"
diff --git a/app/src/main/res/layout/row_dialog_teacher_absence_item.xml b/app/src/main/res/layout/row_dialog_teacher_absence_item.xml
index 8d303464..0b8383d1 100644
--- a/app/src/main/res/layout/row_dialog_teacher_absence_item.xml
+++ b/app/src/main/res/layout/row_dialog_teacher_absence_item.xml
@@ -10,10 +10,8 @@
     <com.google.android.material.card.MaterialCardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="4dp"
+        android:layout_marginHorizontal="8dp"
+        android:layout_marginVertical="4dp"
         android:background="?selectableItemBackground"
         app:cardCornerRadius="5dp"
         app:cardElevation="4dp">
diff --git a/app/src/main/res/layout/row_grades_editor_item.xml b/app/src/main/res/layout/row_grades_editor_item.xml
index 0e78bbec..86f5615b 100644
--- a/app/src/main/res/layout/row_grades_editor_item.xml
+++ b/app/src/main/res/layout/row_grades_editor_item.xml
@@ -38,8 +38,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?android:windowBackground"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp">
+            android:paddingVertical="8dp">
 
             <TextView
                 android:id="@+id/gradesListName"
@@ -62,8 +61,7 @@
                 android:id="@+id/gradesListCategory"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:ellipsize="marquee"
                 android:focusableInTouchMode="false"
                 android:marqueeRepeatLimit="marquee_forever"
diff --git a/app/src/main/res/layout/row_homework_item.xml b/app/src/main/res/layout/row_homework_item.xml
index 629bac4a..89685e30 100644
--- a/app/src/main/res/layout/row_homework_item.xml
+++ b/app/src/main/res/layout/row_homework_item.xml
@@ -14,9 +14,8 @@
         app:cardElevation="4dp"
         app:cardCornerRadius="5dp"
         android:background="?selectableItemBackground"
-        android:paddingLeft="10dp"
+        android:paddingHorizontal="10dp"
         android:paddingTop="5dp"
-        android:paddingRight="10dp"
         android:paddingBottom="3dp">
 
         <LinearLayout
@@ -44,8 +43,7 @@
                     android:id="@+id/homeworkItemSharedBy"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:ellipsize="end"
                     android:gravity="end"
                     android:maxLines="1"
diff --git a/app/src/main/res/layout/row_login_profile_list_item.xml b/app/src/main/res/layout/row_login_profile_list_item.xml
index 550034a3..3c222843 100644
--- a/app/src/main/res/layout/row_login_profile_list_item.xml
+++ b/app/src/main/res/layout/row_login_profile_list_item.xml
@@ -15,8 +15,7 @@
             android:id="@+id/checkBox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp" />
+            android:layout_marginVertical="8dp" />
 
         <LinearLayout
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/row_notices_item.xml b/app/src/main/res/layout/row_notices_item.xml
index 9af3b7a7..83f8a5d9 100644
--- a/app/src/main/res/layout/row_notices_item.xml
+++ b/app/src/main/res/layout/row_notices_item.xml
@@ -14,9 +14,8 @@
         app:cardElevation="4dp"
         app:cardCornerRadius="5dp"
         android:background="?selectableItemBackground"
-        android:paddingLeft="10dp"
+        android:paddingHorizontal="10dp"
         android:paddingTop="5dp"
-        android:paddingRight="10dp"
         android:paddingBottom="3dp">
 
         <LinearLayout
@@ -34,8 +33,7 @@
                     android:id="@+id/noticesItemType"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
+                    android:layout_marginVertical="8dp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:srcCompat="@tools:sample/avatars" />
@@ -76,4 +74,4 @@
 
     </com.google.android.material.card.MaterialCardView>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_timetable_item.xml b/app/src/main/res/layout/row_timetable_item.xml
index cde2600f..0171ff67 100644
--- a/app/src/main/res/layout/row_timetable_item.xml
+++ b/app/src/main/res/layout/row_timetable_item.xml
@@ -10,10 +10,8 @@
         android:id="@+id/timetableItemCard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="4dp"
+        android:layout_marginHorizontal="8dp"
+        android:layout_marginVertical="4dp"
         android:background="?selectableItemBackground"
         app:cardCornerRadius="5dp"
         app:cardElevation="4dp">
@@ -89,10 +87,7 @@
                 android:id="@+id/timetableItemSubjectChange"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/timetableItemTeamName"
                 app:layout_constraintStart_toEndOf="@+id/timetableItemEndTime"
@@ -103,10 +98,7 @@
                 android:id="@+id/timetableItemSubjectName"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
+                android:layout_marginHorizontal="8dp"
                 android:ellipsize="end"
                 android:maxLines="2"
                 android:textSize="18sp"
@@ -149,8 +141,7 @@
             <com.mikepenz.iconics.view.IconicsTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
+                android:layout_marginVertical="8dp"
                 android:text="{cmd-clock}"
                 app:layout_constraintBottom_toTopOf="@+id/timetableItemEndTime"
                 app:layout_constraintEnd_toEndOf="@+id/timetableItemEndTime"
@@ -161,4 +152,4 @@
 
     </com.google.android.material.card.MaterialCardView>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_widget_notifications_big_item.xml b/app/src/main/res/layout/row_widget_notifications_big_item.xml
index d95daaa8..3b369ed6 100644
--- a/app/src/main/res/layout/row_widget_notifications_big_item.xml
+++ b/app/src/main/res/layout/row_widget_notifications_big_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widgetNotificationsRoot"
     android:layout_width="match_parent"
@@ -11,8 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="2dp"
+        android:layout_marginVertical="2dp"
         android:layout_weight="1"
         android:orientation="vertical"
         android:layout_marginStart="8dp">
@@ -48,4 +46,4 @@
         android:textSize="14sp"
         tools:text="10:00 - 10:45" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_widget_notifications_dark_big_item.xml b/app/src/main/res/layout/row_widget_notifications_dark_big_item.xml
index 3917cb91..fda1a2cb 100644
--- a/app/src/main/res/layout/row_widget_notifications_dark_big_item.xml
+++ b/app/src/main/res/layout/row_widget_notifications_dark_big_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widgetNotificationsRoot"
     android:layout_width="match_parent"
@@ -11,8 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="2dp"
+        android:layout_marginVertical="2dp"
         android:layout_weight="1"
         android:orientation="vertical"
         android:layout_marginStart="8dp">
@@ -48,4 +46,4 @@
         android:textSize="14sp"
         tools:text="10:00 - 10:45" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_widget_notifications_dark_item.xml b/app/src/main/res/layout/row_widget_notifications_dark_item.xml
index 3bb9a0c9..6426a4bb 100644
--- a/app/src/main/res/layout/row_widget_notifications_dark_item.xml
+++ b/app/src/main/res/layout/row_widget_notifications_dark_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widgetNotificationsRoot"
     android:layout_width="match_parent"
@@ -11,8 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="2dp"
+        android:layout_marginVertical="2dp"
         android:layout_weight="1"
         android:orientation="vertical"
         android:layout_marginStart="8dp">
@@ -48,4 +46,4 @@
         android:textSize="11sp"
         tools:text="10:00 - 10:45" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_widget_notifications_item.xml b/app/src/main/res/layout/row_widget_notifications_item.xml
index 3eb37e94..47d228b8 100644
--- a/app/src/main/res/layout/row_widget_notifications_item.xml
+++ b/app/src/main/res/layout/row_widget_notifications_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widgetNotificationsRoot"
     android:layout_width="match_parent"
@@ -11,8 +10,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginBottom="2dp"
+            android:layout_marginVertical="2dp"
             android:layout_weight="1"
             android:orientation="vertical"
             android:layout_marginStart="8dp">
@@ -48,4 +46,4 @@
             android:textSize="11sp"
             tools:text="10:00 - 10:45" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_widget_timetable_big_item.xml b/app/src/main/res/layout/row_widget_timetable_big_item.xml
index 4543536e..003600b4 100644
--- a/app/src/main/res/layout/row_widget_timetable_big_item.xml
+++ b/app/src/main/res/layout/row_widget_timetable_big_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widgetTimetableRoot"
     android:layout_width="match_parent"
@@ -46,10 +45,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginVertical="2dp"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
-            android:layout_marginBottom="2dp"
             android:orientation="vertical">
 
             <TextView
@@ -126,4 +124,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/row_widget_timetable_dark_big_item.xml b/app/src/main/res/layout/row_widget_timetable_dark_big_item.xml
index 794069a3..1e80afb6 100644
--- a/app/src/main/res/layout/row_widget_timetable_dark_big_item.xml
+++ b/app/src/main/res/layout/row_widget_timetable_dark_big_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widgetTimetableRoot"
     android:layout_width="match_parent"
@@ -46,10 +45,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginVertical="2dp"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
-            android:layout_marginBottom="2dp"
             android:orientation="vertical">
 
             <TextView
@@ -126,4 +124,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/row_widget_timetable_dark_item.xml b/app/src/main/res/layout/row_widget_timetable_dark_item.xml
index 813f7186..77149eeb 100644
--- a/app/src/main/res/layout/row_widget_timetable_dark_item.xml
+++ b/app/src/main/res/layout/row_widget_timetable_dark_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widgetTimetableRoot"
     android:layout_width="match_parent"
@@ -45,10 +44,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginVertical="2dp"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
-            android:layout_marginBottom="2dp"
             android:orientation="vertical">
 
             <TextView
@@ -122,4 +120,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/row_widget_timetable_item.xml b/app/src/main/res/layout/row_widget_timetable_item.xml
index 84942a94..c0383b1a 100644
--- a/app/src/main/res/layout/row_widget_timetable_item.xml
+++ b/app/src/main/res/layout/row_widget_timetable_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widgetTimetableRoot"
     android:layout_width="match_parent"
@@ -45,10 +44,9 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginVertical="2dp"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
-            android:layout_marginBottom="2dp"
             android:orientation="vertical">
 
             <TextView
@@ -122,4 +120,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/timetable_free_day.xml b/app/src/main/res/layout/timetable_free_day.xml
index bd434b6e..0cc275a2 100644
--- a/app/src/main/res/layout/timetable_free_day.xml
+++ b/app/src/main/res/layout/timetable_free_day.xml
@@ -32,8 +32,7 @@
         android:id="@+id/freeDayText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
+        android:layout_marginHorizontal="32dp"
         android:gravity="center"
         android:textSize="16sp"
         tools:text="Dzień wolny dla szkoły z puli dyrektorskiej z okazji obchodów Światowego Dnia Wtorku w mieście Poznań i na przedmieśiach" />
@@ -45,4 +44,4 @@
         android:layout_marginTop="16dp"
         android:text="@string/timetable_free_day_show" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/timetable_lesson.xml b/app/src/main/res/layout/timetable_lesson.xml
index 9992da27..3b51a197 100644
--- a/app/src/main/res/layout/timetable_lesson.xml
+++ b/app/src/main/res/layout/timetable_lesson.xml
@@ -35,8 +35,7 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/timetable_lesson_annotation"
                 android:fontFamily="sans-serif-condensed"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
+                android:paddingHorizontal="8dp"
                 android:text="@string/timetable_lesson_cancelled"
                 android:textColor="#000"
                 android:textSize="12sp"
@@ -49,8 +48,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
+                android:paddingHorizontal="8dp"
                 android:orientation="horizontal"
                 android:baselineAligned="false">
                 <!--tools:background="@drawable/timetable_subject_color_rounded"-->
@@ -59,8 +57,7 @@
                     android:id="@+id/subjectName"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginBottom="4dp"
+                    android:layout_marginVertical="4dp"
                     android:layout_weight="1"
                     android:ellipsize="end"
                     android:fontFamily="sans-serif-light"
@@ -77,10 +74,7 @@
                     android:layout_width="12dp"
                     android:layout_height="12dp"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
+                    android:layout_marginHorizontal="8dp"
                     android:visibility="@{unread ? View.VISIBLE : View.GONE}"
                     android:background="@drawable/unread_red_circle" />
 
@@ -109,8 +103,7 @@
                     android:fontFamily="sans-serif-condensed-light"
                     android:includeFontPadding="false"
                     android:layout_marginBottom="-4dp"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="4dp"
+                    android:paddingHorizontal="4dp"
                     android:text="@{Integer.toString(lessonNumber)}"
                     android:textSize="28sp"
                     android:visibility="@{lessonNumber != null ? View.VISIBLE : View.GONE}"
@@ -126,8 +119,7 @@
                 android:layout_weight="1"
                 android:gravity="bottom"
                 android:orientation="horizontal"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp">
+                android:paddingHorizontal="8dp">
 
                 <LinearLayout
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/timetable_no_timetable.xml b/app/src/main/res/layout/timetable_no_timetable.xml
index 8c80ee02..ce3bf187 100644
--- a/app/src/main/res/layout/timetable_no_timetable.xml
+++ b/app/src/main/res/layout/timetable_no_timetable.xml
@@ -25,9 +25,8 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
+            android:layout_marginHorizontal="32dp"
             android:layout_marginTop="16dp"
-            android:layout_marginEnd="32dp"
             android:gravity="center"
             android:text="@string/timetable_no_timetable_text"
             android:textSize="16sp" />
@@ -48,4 +47,4 @@
             tools:text="@string/timetable_no_timetable_week" />
 
     </LinearLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/app/src/main/res/layout/widget_lucky_number.xml b/app/src/main/res/layout/widget_lucky_number.xml
index a0da5179..0ab862eb 100644
--- a/app/src/main/res/layout/widget_lucky_number.xml
+++ b/app/src/main/res/layout/widget_lucky_number.xml
@@ -1,5 +1,4 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widgetLuckyNumberRoot"
     android:layout_width="match_parent"
@@ -33,10 +32,7 @@
                 android:id="@+id/widgetLuckyNumberProfileRight"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingStart="8dp"
-                android:paddingLeft="8dp"
-                android:paddingEnd="8dp"
-                android:paddingRight="8dp"
+                android:paddingHorizontal="8dp"
                 android:textColor="@color/primaryTextLight"
                 android:textSize="11sp"
                 tools:text="Władca Androida"
@@ -51,10 +47,7 @@
                     android:id="@+id/widgetLuckyNumberTextRight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="8dp"
-                    android:paddingLeft="8dp"
-                    android:paddingEnd="8dp"
-                    android:paddingRight="8dp"
+                    android:paddingHorizontal="8dp"
                     android:textColor="@color/primaryTextLight"
                     android:textSize="16sp"
                     tools:text="24" />
@@ -88,4 +81,4 @@
             tools:visibility="gone" />
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_lucky_number_big.xml b/app/src/main/res/layout/widget_lucky_number_big.xml
index ca97f832..d1d8517b 100644
--- a/app/src/main/res/layout/widget_lucky_number_big.xml
+++ b/app/src/main/res/layout/widget_lucky_number_big.xml
@@ -1,5 +1,4 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widgetLuckyNumberRoot"
     android:layout_width="match_parent"
@@ -30,10 +29,7 @@
                 android:id="@+id/widgetLuckyNumberProfileRight"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingStart="12dp"
-                android:paddingLeft="12dp"
-                android:paddingEnd="12dp"
-                android:paddingRight="12dp"
+                android:paddingHorizontal="12dp"
                 android:textColor="@color/primaryTextLight"
                 android:textSize="14sp"
                 tools:text="Władca Androida"
@@ -48,10 +44,7 @@
                     android:id="@+id/widgetLuckyNumberTextRight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="12dp"
-                    android:paddingLeft="12dp"
-                    android:paddingEnd="12dp"
-                    android:paddingRight="12dp"
+                    android:paddingHorizontal="12dp"
                     android:textColor="@color/primaryTextLight"
                     android:textSize="24sp"
                     tools:text="24" />
@@ -86,4 +79,4 @@
             tools:visibility="gone" />
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_lucky_number_dark.xml b/app/src/main/res/layout/widget_lucky_number_dark.xml
index 90ca469d..93f97e2d 100644
--- a/app/src/main/res/layout/widget_lucky_number_dark.xml
+++ b/app/src/main/res/layout/widget_lucky_number_dark.xml
@@ -1,5 +1,4 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widgetLuckyNumberRoot"
     android:layout_width="match_parent"
@@ -30,10 +29,7 @@
                 android:id="@+id/widgetLuckyNumberProfileRight"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingStart="8dp"
-                android:paddingLeft="8dp"
-                android:paddingEnd="8dp"
-                android:paddingRight="8dp"
+                android:paddingHorizontal="8dp"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="11sp"
                 tools:text="Władca Androida"
@@ -48,10 +44,7 @@
                     android:id="@+id/widgetLuckyNumberTextRight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="8dp"
-                    android:paddingLeft="8dp"
-                    android:paddingEnd="8dp"
-                    android:paddingRight="8dp"
+                    android:paddingHorizontal="8dp"
                     android:textColor="@color/primaryTextDark"
                     android:textSize="16sp"
                     tools:text="24" />
@@ -85,4 +78,4 @@
             tools:visibility="gone" />
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_lucky_number_dark_big.xml b/app/src/main/res/layout/widget_lucky_number_dark_big.xml
index 58684cbe..950c7064 100644
--- a/app/src/main/res/layout/widget_lucky_number_dark_big.xml
+++ b/app/src/main/res/layout/widget_lucky_number_dark_big.xml
@@ -1,5 +1,4 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/widgetLuckyNumberRoot"
     android:layout_width="match_parent"
@@ -30,10 +29,7 @@
                 android:id="@+id/widgetLuckyNumberProfileRight"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingStart="12dp"
-                android:paddingLeft="12dp"
-                android:paddingEnd="12dp"
-                android:paddingRight="12dp"
+                android:paddingHorizontal="12dp"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="14sp"
                 tools:text="Władca Androida"
@@ -48,10 +44,7 @@
                     android:id="@+id/widgetLuckyNumberTextRight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="12dp"
-                    android:paddingLeft="12dp"
-                    android:paddingEnd="12dp"
-                    android:paddingRight="12dp"
+                    android:paddingHorizontal="12dp"
                     android:textColor="@color/primaryTextDark"
                     android:textSize="24sp"
                     tools:text="24" />
@@ -86,4 +79,4 @@
             tools:visibility="gone" />
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_notifications.xml b/app/src/main/res/layout/widget_notifications.xml
index 5b652da0..20b0f490 100644
--- a/app/src/main/res/layout/widget_notifications.xml
+++ b/app/src/main/res/layout/widget_notifications.xml
@@ -25,8 +25,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:paddingLeft="15.0dip"
-                android:paddingRight="15.0dip"
+                android:paddingHorizontal="15dp"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="18.0sp"
                 android:ellipsize="end"
@@ -67,4 +66,4 @@
 
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_notifications_big.xml b/app/src/main/res/layout/widget_notifications_big.xml
index f5695da2..e97b8e48 100644
--- a/app/src/main/res/layout/widget_notifications_big.xml
+++ b/app/src/main/res/layout/widget_notifications_big.xml
@@ -26,8 +26,7 @@
                 android:ellipsize="end"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:paddingLeft="15.0dip"
-                android:paddingRight="15.0dip"
+                android:paddingHorizontal="15dp"
                 android:text="@string/widget_notifications_title"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="24sp" />
@@ -68,4 +67,4 @@
 
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_notifications_dark.xml b/app/src/main/res/layout/widget_notifications_dark.xml
index 19a639ff..cf960ece 100644
--- a/app/src/main/res/layout/widget_notifications_dark.xml
+++ b/app/src/main/res/layout/widget_notifications_dark.xml
@@ -25,8 +25,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:paddingLeft="15.0dip"
-                android:paddingRight="15.0dip"
+                android:paddingHorizontal="15dp"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="18.0sp"
                 android:ellipsize="end"
@@ -67,4 +66,4 @@
 
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_notifications_dark_big.xml b/app/src/main/res/layout/widget_notifications_dark_big.xml
index 47af8347..64aaabcf 100644
--- a/app/src/main/res/layout/widget_notifications_dark_big.xml
+++ b/app/src/main/res/layout/widget_notifications_dark_big.xml
@@ -26,8 +26,7 @@
                 android:ellipsize="end"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:paddingLeft="15.0dip"
-                android:paddingRight="15.0dip"
+                android:paddingHorizontal="15dp"
                 android:text="@string/widget_notifications_title"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="24sp" />
@@ -68,4 +67,4 @@
 
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml
index 792a4f0d..4f990ef8 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -26,8 +26,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:paddingLeft="15.0dip"
-                android:paddingRight="15.0dip"
+                android:paddingHorizontal="15dp"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="18.0sp"
                 android:ellipsize="end"
@@ -39,8 +38,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:paddingLeft="15.0dip"
-                android:paddingRight="15.0dip"
+                android:paddingHorizontal="15dp"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="10.0sp"
                 tools:text="Test test etst tetete" />
@@ -115,4 +113,4 @@
 
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_timetable_big.xml b/app/src/main/res/layout/widget_timetable_big.xml
index 1b82f9b1..264316a3 100644
--- a/app/src/main/res/layout/widget_timetable_big.xml
+++ b/app/src/main/res/layout/widget_timetable_big.xml
@@ -27,8 +27,7 @@
                 android:ellipsize="end"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:paddingLeft="15.0dip"
-                android:paddingRight="15.0dip"
+                android:paddingHorizontal="15dp"
                 android:text="@string/widget_timetable_title"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="24sp" />
@@ -39,8 +38,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:paddingLeft="15.0dip"
-                android:paddingRight="15.0dip"
+                android:paddingHorizontal="15dp"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="16sp"
                 tools:text="Test test etst tetete" />
@@ -116,4 +114,4 @@
 
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_timetable_dark.xml b/app/src/main/res/layout/widget_timetable_dark.xml
index 87034cd5..72301f70 100644
--- a/app/src/main/res/layout/widget_timetable_dark.xml
+++ b/app/src/main/res/layout/widget_timetable_dark.xml
@@ -26,8 +26,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:paddingLeft="15.0dip"
-                android:paddingRight="15.0dip"
+                android:paddingHorizontal="15dp"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="18.0sp"
                 android:ellipsize="end"
@@ -39,8 +38,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:paddingLeft="15.0dip"
-                android:paddingRight="15.0dip"
+                android:paddingHorizontal="15dp"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="10.0sp"
                 tools:text="Test test etst tetete" />
diff --git a/app/src/main/res/layout/widget_timetable_dark_big.xml b/app/src/main/res/layout/widget_timetable_dark_big.xml
index cbc28535..cba3e565 100644
--- a/app/src/main/res/layout/widget_timetable_dark_big.xml
+++ b/app/src/main/res/layout/widget_timetable_dark_big.xml
@@ -27,8 +27,7 @@
                 android:ellipsize="end"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:paddingLeft="15.0dip"
-                android:paddingRight="15.0dip"
+                android:paddingHorizontal="15dp"
                 android:text="@string/widget_timetable_title"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="24sp" />
@@ -39,8 +38,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:paddingLeft="15.0dip"
-                android:paddingRight="15.0dip"
+                android:paddingHorizontal="15dp"
                 android:textColor="@color/primaryTextDark"
                 android:textSize="16sp"
                 tools:text="Test test etst tetete" />
@@ -116,4 +114,4 @@
 
     </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>