diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a35b2fabe9..e65406b50f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -56,7 +56,6 @@
         <activity
             android:name=".plugins.general.overview.dialogs.ErrorHelperActivity"
             android:theme="@style/Theme.AppCompat.Translucent" />
-        <activity android:name=".activities.AgreementActivity" />
         <activity android:name=".plugins.pump.danaR.activities.DanaRHistoryActivity" />
         <activity android:name=".plugins.pump.danaR.activities.DanaRUserOptionsActivity" />
         <activity android:name=".activities.TDDStatsActivity" />
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index 490e09cb62..f30c0178ad 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -7,6 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.MainApp
@@ -216,8 +217,7 @@ class ActionsFragment : Fragment() {
                 val action = this.pumpCustomActions[b.text.toString()]
                 ConfigBuilderPlugin.getPlugin().activePump!!.executeCustomAction(action!!.customActionType)
             }
-
-            val top = resources.getDrawable(customAction.iconResourceId)
+            val top = activity?.let { ContextCompat.getDrawable(it, customAction.iconResourceId) }
             btn.setCompoundDrawablesWithIntrinsicBounds(null, top, null, null)
 
             action_buttons_layout?.addView(btn)