diff --git a/src/main/kotlin/com/looker/droidify/screen/EditRepositoryFragment.kt b/src/main/kotlin/com/looker/droidify/screen/EditRepositoryFragment.kt
index 5991fd73..83ba0e93 100644
--- a/src/main/kotlin/com/looker/droidify/screen/EditRepositoryFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/EditRepositoryFragment.kt
@@ -18,7 +18,7 @@ import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.FrameLayout
 import android.widget.TextView
-import android.widget.Toolbar
+import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.DialogFragment
 import com.looker.droidify.R
 import com.looker.droidify.database.Database
diff --git a/src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt b/src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt
index 87f27953..d6697e53 100644
--- a/src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/ProductFragment.kt
@@ -13,7 +13,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.Toolbar
+import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.DialogFragment
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
diff --git a/src/main/kotlin/com/looker/droidify/screen/RepositoriesFragment.kt b/src/main/kotlin/com/looker/droidify/screen/RepositoriesFragment.kt
index a88c0d9c..fc6c38f3 100644
--- a/src/main/kotlin/com/looker/droidify/screen/RepositoriesFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/RepositoriesFragment.kt
@@ -7,7 +7,7 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.Toolbar
+import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.looker.droidify.R
diff --git a/src/main/kotlin/com/looker/droidify/screen/RepositoryFragment.kt b/src/main/kotlin/com/looker/droidify/screen/RepositoryFragment.kt
index 3a223bc7..abcc2b8f 100644
--- a/src/main/kotlin/com/looker/droidify/screen/RepositoryFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/RepositoryFragment.kt
@@ -9,7 +9,11 @@ import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import android.widget.ScrollView
+import android.widget.TextView
+import androidx.appcompat.widget.Toolbar
 import com.looker.droidify.R
 import com.looker.droidify.database.Database
 import com.looker.droidify.service.Connection
diff --git a/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt b/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
index 2392e440..67e94abe 100644
--- a/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt
@@ -6,7 +6,7 @@ import android.os.Parcel
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.FrameLayout
-import android.widget.Toolbar
+import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import com.looker.droidify.R
diff --git a/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt b/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
index 01d04131..93a9101c 100644
--- a/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
@@ -12,6 +12,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.*
+import androidx.appcompat.widget.Toolbar
 import androidx.core.net.toUri
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
diff --git a/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt b/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt
index c8868213..90219d5f 100644
--- a/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt
@@ -13,6 +13,8 @@ import android.view.*
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import android.widget.*
+import androidx.appcompat.widget.SearchView
+import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
diff --git a/src/main/kotlin/com/looker/droidify/widget/FocusSearchView.kt b/src/main/kotlin/com/looker/droidify/widget/FocusSearchView.kt
index 16f8c8ce..16feac76 100644
--- a/src/main/kotlin/com/looker/droidify/widget/FocusSearchView.kt
+++ b/src/main/kotlin/com/looker/droidify/widget/FocusSearchView.kt
@@ -3,7 +3,7 @@ package com.looker.droidify.widget
 import android.content.Context
 import android.util.AttributeSet
 import android.view.KeyEvent
-import android.widget.SearchView
+import androidx.appcompat.widget.SearchView
 
 class FocusSearchView : SearchView {
     constructor(context: Context) : super(context)
diff --git a/src/main/kotlin/com/looker/droidify/widget/Toolbar.kt b/src/main/kotlin/com/looker/droidify/widget/Toolbar.kt
index 71321d39..5cbfa1a6 100644
--- a/src/main/kotlin/com/looker/droidify/widget/Toolbar.kt
+++ b/src/main/kotlin/com/looker/droidify/widget/Toolbar.kt
@@ -2,7 +2,7 @@ package com.looker.droidify.widget
 
 import android.content.Context
 import android.util.AttributeSet
-import android.widget.Toolbar
+import androidx.appcompat.widget.Toolbar
 
 class Toolbar : Toolbar {
     constructor(context: Context) : super(context)
@@ -13,11 +13,6 @@ class Toolbar : Toolbar {
         defStyleAttr
     )
 
-    constructor(
-        context: Context, attrs: AttributeSet?, defStyleAttr: Int,
-        defStyleRes: Int
-    ) : super(context, attrs, defStyleAttr, defStyleRes)
-
     private var initalized = false
     private var layoutDirectionChanged: Int? = null