diff --git a/app/src/main/java/com/dragons/aurora/activities/AboutActivity.java b/app/src/main/java/com/dragons/aurora/activities/AboutActivity.java
index e3f3318f4..27f02df81 100644
--- a/app/src/main/java/com/dragons/aurora/activities/AboutActivity.java
+++ b/app/src/main/java/com/dragons/aurora/activities/AboutActivity.java
@@ -27,19 +27,26 @@ import android.view.View;
 import com.dragons.aurora.R;
 import com.dragons.aurora.fragment.AboutFragment;
 
+import androidx.appcompat.widget.Toolbar;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
 public class AboutActivity extends BaseActivity {
 
+    @BindView(R.id.toolbar)
+    Toolbar mToolbar;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_helper_alt);
-        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-        getWindow().setStatusBarColor(getResources().getColor(R.color.semi_transparent));
+        setContentView(R.layout.activity_helper);
+        ButterKnife.bind(this);
         getSupportFragmentManager()
                 .beginTransaction()
                 .replace(R.id.container, new AboutFragment())
                 .commit();
+        mToolbar.setTitle(getString(R.string.action_about));
+        mToolbar.setNavigationOnClickListener(v -> onBackPressed());
     }
 
     @Override
diff --git a/app/src/main/java/com/dragons/aurora/fragment/AboutFragment.java b/app/src/main/java/com/dragons/aurora/fragment/AboutFragment.java
index fcb6e1239..9be6678b3 100644
--- a/app/src/main/java/com/dragons/aurora/fragment/AboutFragment.java
+++ b/app/src/main/java/com/dragons/aurora/fragment/AboutFragment.java
@@ -44,17 +44,13 @@ public class AboutFragment extends BaseFragment {
             R.drawable.ic_telegram,
             R.drawable.ic_fdroid
     };
-    private View view;
 
+    private View view;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         view = inflater.inflate(R.layout.fragment_about, container, false);
-
-        ((TextView) view.findViewById(R.id.aurora_title)).setText(R.string.action_about);
-        ((ImageView) view.findViewById(R.id.toolbar_back)).setOnClickListener(click -> getActivity().onBackPressed());
-
         drawVersion();
         drawLinks();
         return view;
diff --git a/app/src/main/res/layout/activity_helper.xml b/app/src/main/res/layout/activity_helper.xml
index df9b53366..e4a2b9b67 100644
--- a/app/src/main/res/layout/activity_helper.xml
+++ b/app/src/main/res/layout/activity_helper.xml
@@ -41,7 +41,6 @@
         android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/top_artwork"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 0f14e7d9e..e598a229f 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -18,159 +18,79 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
   -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:weightSum="3">
-
-    <FrameLayout
-        android:id="@+id/top_artwork"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <com.github.florent37.shapeofview.shapes.DiagonalView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:shape_diagonal_angle="5"
-            app:shape_diagonal_direction="left"
-            app:shape_diagonal_position="bottom">
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/header_grad2" />
-        </com.github.florent37.shapeofview.shapes.DiagonalView>
-
-
-        <com.github.florent37.shapeofview.shapes.DiagonalView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:alpha=".8"
-            app:shape_diagonal_angle="10"
-            app:shape_diagonal_direction="right"
-            app:shape_diagonal_position="bottom">
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/header_grad1" />
-        </com.github.florent37.shapeofview.shapes.DiagonalView>
-
-        <RelativeLayout
-            android:id="@+id/topView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ImageView
-                android:id="@+id/toolbar_back"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="28dp"
-                android:background="?android:selectableItemBackgroundBorderless"
-                android:padding="10dp"
-                android:src="@drawable/ic_arrow_left" />
-
-            <TextView
-                android:id="@+id/aurora_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:fontFamily="@font/google_sans_bold"
-                android:padding="5dp"
-                android:textAlignment="center"
-                android:textColor="@color/white"
-                android:textSize="22sp" />
-        </RelativeLayout>
-
-    </FrameLayout>
+    android:layout_height="match_parent">
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="2"
-        android:fadeScrollbars="true"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:layout_height="match_parent"
+        android:scrollbars="none">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
-            android:background="?android:attr/colorBackground"
             android:orientation="vertical"
             android:padding="5dp">
 
-            <androidx.cardview.widget.CardView
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:cardBackgroundColor="?android:attr/panelBackground"
-                app:cardCornerRadius="5dp"
-                app:cardElevation="2dp"
-                app:cardUseCompatPadding="true"
-                app:contentPadding="5dp">
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-                <RelativeLayout
+                <ImageView
+                    android:id="@+id/launcher_icon"
+                    android:layout_width="@dimen/icon_size_big"
+                    android:layout_height="@dimen/icon_size_big"
+                    android:layout_centerHorizontal="true"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="5dp"
+                    android:layout_marginTop="5dp"
+                    android:src="@mipmap/ic_launcher" />
+
+                <TextView
+                    android:id="@+id/app_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/launcher_icon"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/app_name"
+                    android:textAppearance="@style/TextAppearance.Aurora.Title" />
+
+                <TextView
+                    android:id="@+id/app_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/app_name"
+                    android:layout_centerHorizontal="true"
+                    android:fontFamily="@font/google_sans"
+                    android:gravity="center"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/about_app"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical">
+                    android:layout_below="@+id/app_version"
+                    android:fontFamily="@font/google_sans"
+                    android:gravity="center"
+                    android:padding="10dp"
+                    android:text="@string/about_app"
+                    android:textSize="14sp" />
 
-                    <ImageView
-                        android:id="@+id/launcher_icon"
-                        android:layout_width="@dimen/icon_size_big"
-                        android:layout_height="@dimen/icon_size_big"
-                        android:layout_centerHorizontal="true"
-                        android:layout_gravity="center"
-                        android:layout_marginStart="5dp"
-                        android:layout_marginTop="5dp"
-                        android:src="@mipmap/ic_launcher" />
-
-                    <TextView
-                        android:id="@+id/app_name"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/launcher_icon"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="8dp"
-                        android:fontFamily="@font/google_sans_bold"
-                        android:gravity="center"
-                        android:text="@string/app_name"
-                        android:textSize="18sp" />
-
-                    <TextView
-                        android:id="@+id/app_version"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/app_name"
-                        android:layout_centerHorizontal="true"
-                        android:fontFamily="@font/google_sans"
-                        android:gravity="center"
-                        android:textSize="14sp" />
-
-                    <TextView
-                        android:id="@+id/about_app"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_below="@+id/app_version"
-                        android:fontFamily="@font/google_sans"
-                        android:gravity="center"
-                        android:padding="10dp"
-                        android:text="@string/about_app"
-                        android:textSize="14sp" />
-                </RelativeLayout>
-            </androidx.cardview.widget.CardView>
+            </RelativeLayout>
 
             <LinearLayout
                 android:id="@+id/linkContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:weightSum="4" />
+                android:orientation="vertical" />
 
         </LinearLayout>
 
     </ScrollView>
 
-</LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/item_link.xml b/app/src/main/res/layout/item_link.xml
index 16789a9ee..50aeabd1f 100644
--- a/app/src/main/res/layout/item_link.xml
+++ b/app/src/main/res/layout/item_link.xml
@@ -19,60 +19,52 @@
   ~ along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/link_card"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="1dp"
+    app:cardUseCompatPadding="true">
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/link_card"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        app:cardBackgroundColor="?android:attr/panelBackground"
-        app:cardCornerRadius="5dp"
-        app:cardElevation="2dp"
-        app:cardUseCompatPadding="true">
+        android:layout_gravity="center"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:padding="8dp">
 
-        <RelativeLayout
+        <ImageView
+            android:id="@+id/card_icon"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_margin="5dp"
+            android:padding="5dp" />
+
+        <TextView
+            android:id="@+id/card_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:padding="8dp"
-            android:weightSum="6">
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="5dp"
+            android:layout_toEndOf="@+id/card_icon"
+            android:fontFamily="@font/google_sans_bold"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="16sp" />
 
-            <ImageView
-                android:id="@+id/card_icon"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_margin="5dp"
-                android:padding="5dp" />
+        <TextView
+            android:id="@+id/card_summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/card_title"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_toEndOf="@+id/card_icon"
+            android:maxLines="2" />
 
-            <TextView
-                android:id="@+id/card_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginEnd="5dp"
-                android:layout_toEndOf="@+id/card_icon"
-                android:fontFamily="@font/google_sans_bold"
-                android:singleLine="true"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textSize="16sp" />
+    </RelativeLayout>
 
-            <TextView
-                android:id="@+id/card_summary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/card_title"
-                android:layout_margin="5dp"
-                android:layout_toEndOf="@+id/card_icon"
-                android:maxLines="2" />
-
-        </RelativeLayout>
-
-    </androidx.cardview.widget.CardView>
-
-</RelativeLayout>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>