diff --git a/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt b/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt
index 720c936c..0d05866f 100644
--- a/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt
+++ b/app/src/main/java/com/rtbishop/lookingsat/ui/MainActivity.kt
@@ -10,8 +10,6 @@ import android.os.CountDownTimer
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.view.animation.AnimationUtils
-import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -46,8 +44,6 @@ class MainActivity : AppCompatActivity() {
     private lateinit var drawerLat: TextView
     private lateinit var drawerLon: TextView
     private lateinit var drawerHeight: TextView
-    private lateinit var drawerSubTitle: TextView
-    private lateinit var drawerGetLocation: ImageView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -73,8 +69,6 @@ class MainActivity : AppCompatActivity() {
         drawerLat = header.findViewById(R.id.drawer_lat_value)
         drawerLon = header.findViewById(R.id.drawer_lon_value)
         drawerHeight = header.findViewById(R.id.drawer_height_value)
-        drawerSubTitle = header.findViewById(R.id.drawer_link)
-        drawerGetLocation = header.findViewById(R.id.drawer_get_location)
 
         val navController = findNavController(R.id.nav_host)
         appBarConfig = AppBarConfiguration(setOf(R.id.nav_sky, R.id.nav_single_sat), drawerLayout)
@@ -100,15 +94,6 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun setupDrawer() {
-        drawerSubTitle.setOnClickListener { goToGithub() }
-
-        drawerGetLocation.startAnimation(AnimationUtils.loadAnimation(this, R.anim.pulse))
-        drawerGetLocation.setOnClickListener {
-            it.isEnabled = false
-            updateLocation()
-            it.postDelayed({ it.isEnabled = true }, 3600)
-        }
-
         viewModel.gsp.observe(this, androidx.lifecycle.Observer { gsp ->
             drawerLat.text = String.format("%.4f", gsp.latitude)
             drawerLon.text = String.format("%.4f", gsp.longitude)
diff --git a/app/src/main/res/anim/pulse.xml b/app/src/main/res/anim/pulse.xml
deleted file mode 100644
index 9ff3476b..00000000
--- a/app/src/main/res/anim/pulse.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <scale
-        android:duration="1800"
-        android:fromXScale="1"
-        android:fromYScale="1"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:repeatCount="infinite"
-        android:repeatMode="reverse"
-        android:toXScale="0.6"
-        android:toYScale="0.6" />
-
-    <rotate
-        android:duration="3600"
-        android:fromDegrees="0"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:repeatCount="infinite"
-        android:startOffset="0"
-        android:toDegrees="720" />
-
-    <alpha
-        android:duration="1800"
-        android:fromAlpha="1"
-        android:interpolator="@android:anim/accelerate_interpolator"
-        android:repeatCount="infinite"
-        android:repeatMode="reverse"
-        android:toAlpha="0.6" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
new file mode 100644
index 00000000..6aff33d0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_credits.xml b/app/src/main/res/drawable/ic_credits.xml
new file mode 100644
index 00000000..f99519bf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_credits.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-1.91l-0.01,-0.01L23,10z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_exit.xml b/app/src/main/res/drawable/ic_exit.xml
new file mode 100644
index 00000000..f607211c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_exit.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml
new file mode 100644
index 00000000..ae3fdb61
--- /dev/null
+++ b/app/src/main/res/drawable/ic_github.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,0.297c-6.63,0 -12,5.373 -12,12 0,5.303 3.438,9.8 8.205,11.385 0.6,0.113 0.82,-0.258 0.82,-0.577 0,-0.285 -0.01,-1.04 -0.015,-2.04 -3.338,0.724 -4.042,-1.61 -4.042,-1.61C4.422,18.07 3.633,17.7 3.633,17.7c-1.087,-0.744 0.084,-0.729 0.084,-0.729 1.205,0.084 1.838,1.236 1.838,1.236 1.07,1.835 2.809,1.305 3.495,0.998 0.108,-0.776 0.417,-1.305 0.76,-1.605 -2.665,-0.3 -5.466,-1.332 -5.466,-5.93 0,-1.31 0.465,-2.38 1.235,-3.22 -0.135,-0.303 -0.54,-1.523 0.105,-3.176 0,0 1.005,-0.322 3.3,1.23 0.96,-0.267 1.98,-0.399 3,-0.405 1.02,0.006 2.04,0.138 3,0.405 2.28,-1.552 3.285,-1.23 3.285,-1.23 0.645,1.653 0.24,2.873 0.12,3.176 0.765,0.84 1.23,1.91 1.23,3.22 0,4.61 -2.805,5.625 -5.475,5.92 0.42,0.36 0.81,1.096 0.81,2.22 0,1.606 -0.015,2.896 -0.015,3.286 0,0.315 0.21,0.69 0.825,0.57C20.565,22.092 24,17.592 24,12.297c0,-6.627 -5.373,-12 -12,-12" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index e37eedb0..00000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="270"
-        android:endColor="#181818"
-        android:startColor="@color/surfaceDark"
-        android:type="linear" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
index 3630c908..cb01fbe2 100644
--- a/app/src/main/res/drawable/ic_location.xml
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="32dp"
+    android:height="32dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFE082"
+        android:fillColor="#FF000000"
         android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml
new file mode 100644
index 00000000..7f7a5a05
--- /dev/null
+++ b/app/src/main/res/drawable/ic_map.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
index 6ff7a0cc..3a766bc2 100644
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
+        android:fillColor="#C0C0C0"
+        android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_sat_asc_left.xml b/app/src/main/res/drawable/ic_sat_asc_left.xml
index d64687cd..1e48f81a 100644
--- a/app/src/main/res/drawable/ic_sat_asc_left.xml
+++ b/app/src/main/res/drawable/ic_sat_asc_left.xml
@@ -5,31 +5,31 @@
     android:viewportHeight="128">
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="m105.138,13.879a2.864,2.864 90,0 1,1.701 0.85l19.334,19.331a2.864,2.864 90,0 1,-0 4.027l-26.584,26.625a2.864,2.864 90,0 1,-1.835 0.805l-7.922,0.626 5.773,5.772a2.864,2.864 90,0 1,-0 4.027l-19.602,19.644a2.864,2.864 90,0 1,-4.073 0l-5.773,-5.772 -0.627,7.92a2.864,2.864 90,0 1,-0.805 1.835l-26.629,26.58a2.864,2.864 90,0 1,-4.073 0l-19.289,-19.286a2.864,2.864 90,0 1,-0 -4.072l26.584,-26.625a2.864,2.864 90,0 1,1.835 -0.805l7.922,-0.626 -5.773,-5.772a2.864,2.864 90,0 1,-0 -4.072l19.603,-19.599a2.864,2.864 90,0 1,4.073 0l5.773,5.772 0.626,-7.92a2.864,2.864 90,0 1,0.806 -1.835l26.629,-26.58a2.864,2.864 90,0 1,2.059 -0.85,2.864 2.864,90 0,1 0.269,0zM104.825,20.77 L80.97,44.62 80.165,55.315 85.58,60.729 96.276,59.879 120.13,36.074zM55.326,80.15 L44.629,81 20.775,104.806 36.081,120.109 59.891,96.259 60.741,85.564z"
         android:strokeColor="#00000000" />
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="m62.653,12.194a2.864,2.864 90,1 1,-0 5.727c-11.457,0 -22.876,4.351 -31.634,13.107 -8.741,8.74 -13.095,20.174 -13.095,31.614a2.864,2.864 90,1 1,-5.728 0c-0,-12.897 4.935,-25.829 14.773,-35.664 9.85,-9.848 22.772,-14.785 35.684,-14.785z"
         android:strokeColor="#00000000" />
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="m62.653,1a2.864,2.864 90,1 1,-0 5.727c-14.325,0 -28.612,5.441 -39.547,16.375 -10.935,10.933 -16.378,25.233 -16.378,39.541a2.864,2.864 90,1 1,-5.728 0c-0,-15.763 6.025,-31.562 18.055,-43.59 12.029,-12.028 27.818,-18.052 43.597,-18.052z"
         android:strokeColor="#00000000" />
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="m62.653,23.302a2.864,2.864 90,1 1,-0 5.727c-8.62,0 -17.201,3.263 -23.778,9.839 -6.577,6.576 -9.855,15.174 -9.855,23.774a2.864,2.864 90,1 1,-5.728 0c-0,-10.061 3.861,-20.153 11.533,-27.824 7.672,-7.671 17.756,-11.517 27.829,-11.517z"
         android:strokeColor="#00000000" />
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="m62.653,34.525a2.864,2.864 90,1 1,-0 5.727c-5.737,0 -11.453,2.174 -15.836,6.557 -4.384,4.383 -6.558,10.098 -6.558,15.834a2.864,2.864 90,1 1,-5.728 0c-0,-7.192 2.757,-14.406 8.236,-19.883 5.479,-5.478 12.693,-8.234 19.887,-8.234z"
         android:strokeColor="#00000000" />
diff --git a/app/src/main/res/drawable/ic_sat_asc_right.xml b/app/src/main/res/drawable/ic_sat_asc_right.xml
index a7cb41be..ac48dddd 100644
--- a/app/src/main/res/drawable/ic_sat_asc_right.xml
+++ b/app/src/main/res/drawable/ic_sat_asc_right.xml
@@ -5,31 +5,31 @@
     android:viewportHeight="128">
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="m22.862,13.879a2.864,2.864 90,0 0,-1.701 0.85l-19.334,19.331a2.864,2.864 90,0 0,0 4.027l26.584,26.625a2.864,2.864 90,0 0,1.835 0.805l7.922,0.626 -5.773,5.772a2.864,2.864 90,0 0,0 4.027l19.602,19.644a2.864,2.864 90,0 0,4.073 0l5.773,-5.772 0.627,7.92a2.864,2.864 90,0 0,0.805 1.835l26.629,26.58a2.864,2.864 90,0 0,4.073 0l19.289,-19.286a2.864,2.864 90,0 0,0 -4.072l-26.584,-26.625a2.864,2.864 90,0 0,-1.835 -0.805l-7.922,-0.626 5.773,-5.772a2.864,2.864 90,0 0,0 -4.072l-19.603,-19.599a2.864,2.864 90,0 0,-4.073 0l-5.773,5.772 -0.626,-7.92a2.864,2.864 90,0 0,-0.806 -1.835l-26.629,-26.58a2.864,2.864 90,0 0,-2.059 -0.85,2.864 2.864,90 0,0 -0.269,0zM23.175,20.77 L47.03,44.62 47.835,55.315 42.42,60.729 31.724,59.879 7.87,36.074zM72.674,80.15 L83.371,81 107.225,104.806 91.919,120.109 68.109,96.259 67.259,85.564z"
         android:strokeColor="#00000000" />
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="m65.347,12.194a2.864,2.864 90,1 0,0 5.727c11.457,0 22.876,4.351 31.634,13.107 8.741,8.74 13.095,20.174 13.095,31.614a2.864,2.864 90,1 0,5.728 0c0,-12.897 -4.935,-25.829 -14.773,-35.664 -9.85,-9.848 -22.772,-14.785 -35.684,-14.785z"
         android:strokeColor="#00000000" />
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="m65.347,1a2.864,2.864 90,1 0,0 5.727c14.325,0 28.612,5.441 39.547,16.375 10.935,10.933 16.378,25.233 16.378,39.541a2.864,2.864 90,1 0,5.728 0c0,-15.763 -6.025,-31.562 -18.055,-43.59 -12.029,-12.028 -27.818,-18.052 -43.597,-18.052z"
         android:strokeColor="#00000000" />
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="m65.347,23.302a2.864,2.864 90,1 0,0 5.727c8.62,0 17.201,3.263 23.778,9.839 6.577,6.576 9.855,15.174 9.855,23.774a2.864,2.864 90,1 0,5.728 0c0,-10.061 -3.861,-20.153 -11.533,-27.824 -7.672,-7.671 -17.756,-11.517 -27.829,-11.517z"
         android:strokeColor="#00000000" />
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FF000000"
         android:fillType="evenOdd"
         android:pathData="m65.347,34.525a2.864,2.864 90,1 0,0 5.727c5.737,0 11.453,2.174 15.836,6.557 4.384,4.383 6.558,10.098 6.558,15.834a2.864,2.864 90,1 0,5.728 0c0,-7.192 -2.757,-14.406 -8.236,-19.883 -5.479,-5.478 -12.693,-8.234 -19.887,-8.234z"
         android:strokeColor="#00000000" />
diff --git a/app/src/main/res/drawable/ic_sat_desc_left.xml b/app/src/main/res/drawable/ic_sat_desc_left.xml
index 8f8b0b5d..d8ab3691 100644
--- a/app/src/main/res/drawable/ic_sat_desc_left.xml
+++ b/app/src/main/res/drawable/ic_sat_desc_left.xml
@@ -11,25 +11,25 @@
         android:strokeColor="#00000000" />
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FFE082"
         android:fillType="evenOdd"
         android:pathData="m62.653,115.806a2.864,2.864 90,1 0,-0 -5.727c-11.457,-0 -22.876,-4.351 -31.634,-13.107 -8.741,-8.74 -13.095,-20.174 -13.095,-31.614a2.864,2.864 90,1 0,-5.728 -0c-0,12.897 4.935,25.829 14.773,35.664 9.85,9.848 22.772,14.785 35.684,14.785z"
         android:strokeColor="#00000000" />
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FFE082"
         android:fillType="evenOdd"
         android:pathData="m62.653,127a2.864,2.864 90,1 0,-0 -5.727c-14.325,-0 -28.612,-5.441 -39.547,-16.375 -10.935,-10.933 -16.378,-25.233 -16.378,-39.541a2.864,2.864 90,1 0,-5.728 -0c-0,15.763 6.025,31.562 18.055,43.59 12.029,12.028 27.818,18.052 43.597,18.052z"
         android:strokeColor="#00000000" />
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FFE082"
         android:fillType="evenOdd"
         android:pathData="m62.653,104.698a2.864,2.864 90,1 0,-0 -5.727c-8.62,-0 -17.201,-3.263 -23.778,-9.839 -6.577,-6.576 -9.855,-15.174 -9.855,-23.774a2.864,2.864 90,1 0,-5.728 -0c-0,10.061 3.861,20.153 11.533,27.824 7.672,7.671 17.756,11.517 27.829,11.517z"
         android:strokeColor="#00000000" />
     <path
         android:fillAlpha="1"
-        android:fillColor="#C0C0C0"
+        android:fillColor="#FFE082"
         android:fillType="evenOdd"
         android:pathData="m62.653,93.475a2.864,2.864 90,1 0,-0 -5.727c-5.737,-0 -11.453,-2.174 -15.836,-6.557 -4.384,-4.383 -6.558,-10.098 -6.558,-15.834a2.864,2.864 90,1 0,-5.728 -0c-0,7.192 2.757,14.406 8.236,19.883 5.479,5.478 12.693,8.234 19.887,8.234z"
         android:strokeColor="#00000000" />
diff --git a/app/src/main/res/drawable/ic_sky.xml b/app/src/main/res/drawable/ic_sky.xml
new file mode 100644
index 00000000..d852cf8a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sky.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,17h18v-2L3,15v2zM3,20h18v-1L3,19v1zM3,13h18v-3L3,10v3zM3,4v4h18L21,4L3,4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_tle.xml b/app/src/main/res/drawable/ic_tle.xml
new file mode 100644
index 00000000..5da64991
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_trans.xml b/app/src/main/res/drawable/ic_trans.xml
new file mode 100644
index 00000000..2a221294
--- /dev/null
+++ b/app/src/main/res/drawable/ic_trans.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="34dp"
+    android:height="34dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,11c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13c0,-3.31 -2.69,-6 -6,-6s-6,2.69 -6,6c0,2.22 1.21,4.15 3,5.19l1,-1.74c-1.19,-0.7 -2,-1.97 -2,-3.45 0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,1.48 -0.81,2.75 -2,3.45l1,1.74c1.79,-1.04 3,-2.97 3,-5.19zM12,3C6.48,3 2,7.48 2,13c0,3.7 2.01,6.92 4.99,8.65l1,-1.73C5.61,18.53 4,15.96 4,13c0,-4.42 3.58,-8 8,-8s8,3.58 8,8c0,2.96 -1.61,5.53 -4,6.92l1,1.73c2.99,-1.73 5,-4.95 5,-8.65 0,-5.52 -4.48,-10 -10,-10z" />
+</vector>
diff --git a/app/src/main/res/drawable/drawer_gradient.xml b/app/src/main/res/drawable/launcher_background.xml
similarity index 100%
rename from app/src/main/res/drawable/drawer_gradient.xml
rename to app/src/main/res/drawable/launcher_background.xml
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/launcher_foreground.xml
similarity index 94%
rename from app/src/main/res/drawable/ic_launcher_foreground.xml
rename to app/src/main/res/drawable/launcher_foreground.xml
index ae3b91dd..4c44754d 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/launcher_foreground.xml
@@ -7,10 +7,10 @@
         android:translateX="70.26573"
         android:translateY="70.26573">
         <path
-            android:fillColor="#C0C0C0"
+            android:fillColor="#FFE082"
             android:pathData="m96.642,31.504c7.911,7.997 17.143,13.584 25.365,15.581l1.754,-3.997C123.78,43.048 123.786,43.005 123.802,42.965 125.834,38.995 127,34.495 127,29.715 127,13.881 114.379,1 98.867,1c-5.125,0 -9.92,1.429 -14.064,3.884l-3.398,1.598c0.08,0.306 0.133,0.599 0.221,0.91 2.32,8.104 7.652,16.667 15.016,24.112z" />
         <path
-            android:fillColor="#C0C0C0"
+            android:fillColor="#FFE082"
             android:pathData="M93.876,34.3C86.053,26.391 80.369,17.225 77.87,8.49 77.84,8.385 77.818,8.285 77.788,8.181L2.629,43.513c-1.404,0.66 -2.019,2.358 -1.372,3.791 0.472,1.046 1.485,1.663 2.545,1.663 0.392,0 0.79,-0.084 1.169,-0.263L74.045,16.235c-1.873,3.578 -2.997,7.611 -3.228,11.885L35.566,51.732c-1.294,0.866 -1.653,2.638 -0.805,3.957 0.538,0.836 1.431,1.29 2.344,1.29 0.526,0 1.06,-0.151 1.533,-0.469L71.189,34.707c1.4,8.11 6.135,15.044 12.715,19.285l-54.945,68.337c-0.981,1.22 -0.808,3.021 0.388,4.023 0.521,0.437 1.149,0.649 1.775,0.649 0.809,0 1.611,-0.357 2.166,-1.045L89.056,56.595c3.06,1.168 6.357,1.838 9.811,1.838 4.932,0 9.566,-1.312 13.601,-3.597L84.602,118.323c-0.633,1.44 0,3.131 1.41,3.777 0.372,0.17 0.76,0.25 1.144,0.25 1.07,0 2.092,-0.629 2.556,-1.691L120.402,50.739C111.642,48.416 102.042,42.555 93.876,34.3Z" />
     </group>
 </vector>
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 63dc4b58..dc67d8e4 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -22,12 +22,9 @@
 
                 <TextView
                     android:id="@+id/time_to_aos"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    style="@style/ToolbarText"
                     android:layout_marginEnd="16dp"
-                    android:gravity="center"
                     android:text="@string/next_aos_pattern"
-                    android:textSize="30sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index b9608ce2..aefccfa9 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -3,15 +3,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/drawer_header_height"
-    android:background="@drawable/drawer_gradient"
+    android:background="@drawable/launcher_background"
     android:gravity="bottom"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
 
     <ImageView
         android:id="@+id/drawer_sat_img"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
+        android:layout_width="108dp"
+        android:layout_height="108dp"
+        android:layout_marginTop="24dp"
         android:layout_marginEnd="8dp"
         android:contentDescription="@string/app_name"
         app:layout_constraintEnd_toEndOf="parent"
@@ -22,14 +22,14 @@
         android:id="@+id/drawer_title"
         style="@style/DrawerHeader.Title"
         android:text="@string/title"
-        app:layout_constraintStart_toStartOf="@+id/drawer_lat"
+        app:layout_constraintStart_toStartOf="@+id/drawer_subtitle"
         app:layout_constraintTop_toTopOf="@+id/drawer_sat_img" />
 
     <TextView
         android:id="@+id/drawer_subtitle"
         style="@style/DrawerHeader.Title"
         android:text="@string/subtitle"
-        app:layout_constraintStart_toStartOf="@+id/drawer_title"
+        app:layout_constraintStart_toStartOf="@+id/drawer_lat"
         app:layout_constraintTop_toBottomOf="@+id/drawer_title" />
 
     <TextView
@@ -65,10 +65,11 @@
     <TextView
         android:id="@+id/drawer_height"
         style="@style/DrawerHeader.Item"
-        android:layout_marginBottom="8dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginBottom="4dp"
         android:text="@string/height"
-        app:layout_constraintBottom_toTopOf="@+id/drawer_link"
-        app:layout_constraintStart_toStartOf="@+id/drawer_link" />
+        app:layout_constraintBottom_toTopOf="@+id/drawer_btn_loc"
+        app:layout_constraintStart_toStartOf="@+id/drawer_btn_loc" />
 
     <TextView
         android:id="@+id/drawer_height_value"
@@ -78,26 +79,62 @@
         app:layout_constraintBaseline_toBaselineOf="@+id/drawer_height"
         app:layout_constraintStart_toEndOf="@+id/drawer_height" />
 
-    <ImageView
-        android:id="@+id/drawer_get_location"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:contentDescription="@string/drawer_locator"
-        app:layout_constraintBottom_toTopOf="@+id/drawer_lat"
-        app:layout_constraintEnd_toStartOf="@+id/drawer_sat_img"
-        app:layout_constraintStart_toEndOf="@+id/drawer_subtitle"
-        app:layout_constraintTop_toTopOf="@+id/drawer_subtitle"
-        app:srcCompat="@drawable/ic_location" />
-
-    <TextView
-        android:id="@+id/drawer_link"
-        style="@style/DrawerHeader"
-        android:layout_marginStart="8dp"
-        android:layout_marginBottom="8dp"
-        android:text="@string/drawer_header_link"
+    <ImageButton
+        android:id="@+id/drawer_btn_loc"
+        style="@style/DrawerHeader.Button"
+        android:layout_marginStart="4dp"
+        android:layout_marginBottom="4dp"
+        android:contentDescription="@string/placeholder"
+        android:src="@drawable/ic_location"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/drawer_btn_tle"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <ImageButton
+        android:id="@+id/drawer_btn_tle"
+        style="@style/DrawerHeader.Button"
+        android:contentDescription="@string/placeholder"
+        android:src="@drawable/ic_tle"
+        app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_trans"
+        app:layout_constraintEnd_toStartOf="@+id/drawer_btn_trans"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/drawer_btn_loc"
+        app:layout_constraintTop_toTopOf="@+id/drawer_btn_trans" />
+
+    <ImageButton
+        android:id="@+id/drawer_btn_trans"
+        style="@style/DrawerHeader.Button"
+        android:contentDescription="@string/placeholder"
+        android:src="@drawable/ic_trans"
+        app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_exit"
+        app:layout_constraintEnd_toStartOf="@+id/drawer_btn_github"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/drawer_btn_tle"
+        app:layout_constraintTop_toTopOf="@+id/drawer_btn_exit" />
+
+    <ImageButton
+        android:id="@+id/drawer_btn_github"
+        style="@style/DrawerHeader.Button"
+        android:contentDescription="@string/placeholder"
+        android:src="@drawable/ic_github"
+        app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_loc"
+        app:layout_constraintEnd_toStartOf="@+id/drawer_btn_exit"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/drawer_btn_trans"
+        app:layout_constraintTop_toTopOf="@+id/drawer_btn_loc" />
+
+    <ImageButton
+        android:id="@+id/drawer_btn_exit"
+        style="@style/DrawerHeader.Button"
+        android:layout_marginEnd="4dp"
+        android:contentDescription="@string/placeholder"
+        android:src="@drawable/ic_exit"
+        app:layout_constraintBottom_toBottomOf="@+id/drawer_btn_github"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/drawer_btn_github"
+        app:layout_constraintTop_toTopOf="@+id/drawer_btn_github" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
index 0b7e08b7..60fa090e 100644
--- a/app/src/main/res/menu/drawer_menu.xml
+++ b/app/src/main/res/menu/drawer_menu.xml
@@ -6,12 +6,15 @@
     <group android:checkableBehavior="single">
         <item
             android:id="@+id/nav_sky"
+            android:icon="@drawable/ic_sky"
             android:title="@string/menu_sky" />
         <item
             android:id="@+id/nav_single_sat"
+            android:icon="@drawable/ic_sat_asc_right"
             android:title="@string/menu_single_sat" />
         <item
             android:id="@+id/nav_map"
+            android:icon="@drawable/ic_map"
             android:title="@string/menu_map" />
     </group>
 
@@ -19,9 +22,11 @@
         <menu>
             <item
                 android:id="@+id/nav_credits"
+                android:icon="@drawable/ic_credits"
                 android:title="@string/menu_credits" />
             <item
                 android:id="@+id/nav_about"
+                android:icon="@drawable/ic_about"
                 android:title="@string/menu_about" />
         </menu>
     </item>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cfe..112bd7f2 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@drawable/launcher_background" />
+    <foreground android:drawable="@drawable/launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 637d4c8c..5bdc6d2f 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,4 +1,4 @@
 <resources>
-    <dimen name="drawer_header_height">300dp</dimen>
+    <dimen name="drawer_header_height">288dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ed749233..0572fdae 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -25,15 +25,33 @@
     </style>
 
     <style name="DrawerHeader.Title">
-        <item name="android:textSize">36sp</item>
+        <item name="android:textSize">40sp</item>
+        <item name="android:textStyle">bold</item>
     </style>
 
     <style name="DrawerHeader.Value">
-        <item name="android:textSize">27sp</item>
+        <item name="android:textSize">26sp</item>
+        <item name="android:textStyle">bold</item>
     </style>
 
     <style name="DrawerHeader.Item">
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">21sp</item>
+        <item name="android:fontFamily">serif</item>
+    </style>
+
+    <style name="DrawerHeader.Button">
+        <item name="android:layout_width">48dp</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:backgroundTint">@color/brandLight</item>
+    </style>
+
+    <style name="ToolbarText">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">30sp</item>
+        <item name="android:textColor">@color/brandLight</item>
     </style>
 
 </resources>
diff --git a/gradle.properties b/gradle.properties
index 23339e0d..988bc560 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -19,3 +19,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+kapt.incremental.apt=true
\ No newline at end of file