diff --git a/.gitignore b/.gitignore
index 37f05b7f5..6a32941f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,8 +38,4 @@ obj/
 captures
 app/normal/release/
 /models/
-
-app/font/
-app/src/debug/ 
-/app/nofont/
-/crowdin.properties
+/app/release/
diff --git a/app/src/debug/res/font/bold.ttf b/app/src/debug/res/font/bold.ttf
new file mode 100644
index 000000000..96619df92
Binary files /dev/null and b/app/src/debug/res/font/bold.ttf differ
diff --git a/app/src/debug/res/font/medium.ttf b/app/src/debug/res/font/medium.ttf
new file mode 100644
index 000000000..fd818d6f5
Binary files /dev/null and b/app/src/debug/res/font/medium.ttf differ
diff --git a/app/src/debug/res/font/regular.ttf b/app/src/debug/res/font/regular.ttf
new file mode 100644
index 000000000..e2c69c3fb
Binary files /dev/null and b/app/src/debug/res/font/regular.ttf differ
diff --git a/app/src/debug/res/font/sans.xml b/app/src/debug/res/font/sans.xml
new file mode 100644
index 000000000..f824169f6
--- /dev/null
+++ b/app/src/debug/res/font/sans.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <font
+        android:font="@font/regular"
+        android:fontWeight="400" />
+    <font
+        android:font="@font/medium"
+        android:fontWeight="600" />
+    <font
+        android:font="@font/bold"
+        android:fontWeight="700" />
+</font-family>
\ No newline at end of file
diff --git a/app/src/debug/res/values/styles.xml b/app/src/debug/res/values/styles.xml
new file mode 100644
index 000000000..8409642cd
--- /dev/null
+++ b/app/src/debug/res/values/styles.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TextViewNormal" parent="">
+        <item name="android:textSize">14sp</item>
+        <item name="fontFamily">@font/sans</item>
+    </style>
+
+    <style name="TextViewHeadline4" parent="TextAppearance.MaterialComponents.Headline4">
+        <item name="fontFamily">@font/sans</item>
+    </style>
+
+    <style name="TextViewHeadline5" parent="TextAppearance.MaterialComponents.Headline5">
+        <item name="fontFamily">@font/sans</item>
+    </style>
+
+    <style name="TextViewCaption" parent="TextAppearance.MaterialComponents.Caption">
+        <item name="fontFamily">@font/sans</item>
+    </style>
+
+    <style name="TextViewHeadline6" parent="TextAppearance.MaterialComponents.Headline6">
+        <item name="fontFamily">@font/sans</item>
+    </style>
+
+    <style name="TextViewHeadline3" parent="TextAppearance.MaterialComponents.Headline3">
+        <item name="fontFamily">@font/sans</item>
+    </style>
+
+    <style name="TextViewHeadline2" parent="TextAppearance.MaterialComponents.Headline2">
+        <item name="fontFamily">@font/sans</item>
+    </style>
+
+    <style name="TextViewSubtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
+        <item name="fontFamily">@font/sans</item>
+    </style>
+
+    <style name="TextViewSubtitle2" parent="TextAppearance.MaterialComponents.Subtitle2">
+        <item name="fontFamily">@font/sans</item>
+    </style>
+
+    <style name="TextViewBody1" parent="TextAppearance.MaterialComponents.Body1">
+        <item name="fontFamily">@font/sans</item>
+    </style>
+
+    <style name="TextViewButton" parent="TextAppearance.MaterialComponents.Button">
+        <item name="fontFamily">@font/sans</item>
+    </style>
+
+    <style name="TextViewBody2" parent="TextAppearance.MaterialComponents.Body2">
+        <item name="fontFamily">@font/sans</item>
+    </style>
+
+    <style name="TextViewOverline" parent="TextAppearance.MaterialComponents.Overline">
+        <item name="fontFamily">@font/sans</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 5d61e740d..6f2b92c27 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -47,11 +47,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
-        android:layout_marginBottom="72dp"
+        android:layout_marginBottom="16dp"
         android:layout_marginEnd="16dp"
         android:id="@+id/addPlaylist"
         android:src="@drawable/ic_playlist_add"
-        app:useCompatPadding="true" />
+        app:useCompatPadding="true"
+        app:layout_anchor="@id/fragment_container"
+        app:layout_anchorGravity="end|bottom"
+        android:contentDescription="@string/add_playlist_title" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container"