diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 39054f65..ea48ce57 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -14,8 +14,14 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-feature android:name="android.hardware.camera" android:required="false" />
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
+
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera.autofocus"
+        android:required="false" />
+
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 
     <supports-screens
@@ -30,59 +36,26 @@
         android:debuggable="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:preserveLegacyExternalStorage="true"
         android:theme="@style/AppTheme"
-        tools:replace="icon, label"
-        android:preserveLegacyExternalStorage="true">
+        tools:replace="icon, label">
         <activity
             android:name="menion.android.whereyougo.gui.activity.MainActivity"
-            android:label="WhereYouGo"
-            android:exported="true">
+            android:exported="true"
+            android:label="WhereYouGo">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data
-                    android:host="wherigo.com"
-                    android:pathPrefix="/cartridge/download.aspx"
-                    android:scheme="http" />
-                <data
-                    android:host="www.wherigo.com"
-                    android:pathPrefix="/cartridge/download.aspx"
-                    android:scheme="http" />
-                <data
-                    android:host="wherigo.com"
-                    android:pathPrefix="/cartridge/details.aspx"
-                    android:scheme="http" />
-                <data
-                    android:host="www.wherigo.com"
-                    android:pathPrefix="/cartridge/details.aspx"
-                    android:scheme="http" />
 
-                <data
-                    android:host="wherigo.com"
-                    android:pathPrefix="/cartridge/download.aspx"
-                    android:scheme="https" />
-                <data
-                    android:host="www.wherigo.com"
-                    android:pathPrefix="/cartridge/download.aspx"
-                    android:scheme="https" />
-                <data
-                    android:host="wherigo.com"
-                    android:pathPrefix="/cartridge/details.aspx"
-                    android:scheme="https" />
-                <data
-                    android:host="www.wherigo.com"
-                    android:pathPrefix="/cartridge/details.aspx"
-                    android:scheme="https" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
+
+                <data android:scheme="content" />
+                <data android:scheme="file" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
             </intent-filter>
         </activity>
         <activity
@@ -90,28 +63,20 @@
             android:exported="true"
             android:launchMode="singleTask"
             android:theme="@style/Mapsforge" />
-        <activity
-            android:name="menion.android.whereyougo.maps.mapsforge.preferences.EditPreferences" />
-        <activity
-            android:name="menion.android.whereyougo.maps.mapsforge.filepicker.FilePicker" />
-        <activity
-            android:name="ar.com.daidalos.afiledialog.FileChooserActivity" />
+        <activity android:name="menion.android.whereyougo.maps.mapsforge.preferences.EditPreferences" />
+        <activity android:name="menion.android.whereyougo.maps.mapsforge.filepicker.FilePicker" />
+        <activity android:name="ar.com.daidalos.afiledialog.FileChooserActivity" />
         <activity
             android:name="menion.android.whereyougo.maps.mapsforge.InfoView"
             android:theme="@android:style/Theme.NoTitleBar" />
-        <activity
-            android:name="menion.android.whereyougo.gui.activity.CartridgeDetailsActivity" />
+        <activity android:name="menion.android.whereyougo.gui.activity.CartridgeDetailsActivity" />
         <activity
             android:name="menion.android.whereyougo.gui.activity.wherigo.MainMenuActivity"
             android:launchMode="singleTask" />
-        <activity
-            android:name="menion.android.whereyougo.gui.activity.wherigo.DetailsActivity" />
-        <activity
-            android:name="menion.android.whereyougo.gui.activity.wherigo.InputScreenActivity" />
-        <activity
-            android:name="menion.android.whereyougo.gui.activity.wherigo.ListActionsActivity" />
-        <activity
-            android:name="menion.android.whereyougo.gui.activity.wherigo.ListTargetsActivity" />
+        <activity android:name="menion.android.whereyougo.gui.activity.wherigo.DetailsActivity" />
+        <activity android:name="menion.android.whereyougo.gui.activity.wherigo.InputScreenActivity" />
+        <activity android:name="menion.android.whereyougo.gui.activity.wherigo.ListActionsActivity" />
+        <activity android:name="menion.android.whereyougo.gui.activity.wherigo.ListTargetsActivity" />
         <activity
             android:name="menion.android.whereyougo.gui.activity.wherigo.ListTasksActivity"
             android:theme="@android:style/Theme.Dialog" />
@@ -124,17 +89,29 @@
         <activity
             android:name="menion.android.whereyougo.gui.activity.wherigo.PushDialogActivity"
             android:configChanges="orientation|screenSize|keyboardHidden" />
-        <activity
-            android:name="menion.android.whereyougo.gui.activity.GuidingActivity" />
-        <activity
-            android:name="menion.android.whereyougo.gui.activity.SatelliteActivity" />
+        <activity android:name="menion.android.whereyougo.gui.activity.GuidingActivity" />
+        <activity android:name="menion.android.whereyougo.gui.activity.SatelliteActivity" />
         <activity
             android:name="menion.android.whereyougo.gui.activity.XmlSettingsActivity"
             android:theme="@style/ThemeSettings" />
         <activity
-            android:name="menion.android.whereyougo.network.activity.DownloadCartridgeActivity" />
-        <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity" />
+            android:name="menion.android.whereyougo.network.activity.DownloadCartridgeActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:host="wherigo.com" />
+                <data android:host="www.wherigo.com" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:pathPrefix="/cartridge/download.aspx" />
+                <data android:pathPrefix="/cartridge/details.aspx" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.journeyapps.barcodescanner.CaptureActivity" />
 
         <service android:name="menion.android.whereyougo.audio.AudioPlayService" />
         <service
diff --git a/src/main/java/menion/android/whereyougo/gui/activity/MainActivity.java b/src/main/java/menion/android/whereyougo/gui/activity/MainActivity.java
index 93ded779..7c0db973 100644
--- a/src/main/java/menion/android/whereyougo/gui/activity/MainActivity.java
+++ b/src/main/java/menion/android/whereyougo/gui/activity/MainActivity.java
@@ -30,7 +30,6 @@
 import menion.android.whereyougo.gui.utils.UtilsGUI;
 import menion.android.whereyougo.maps.utils.MapDataProvider;
 import menion.android.whereyougo.maps.utils.MapHelper;
-import menion.android.whereyougo.network.activity.DownloadCartridgeActivity;
 import menion.android.whereyougo.openwig.WLocationService;
 import menion.android.whereyougo.openwig.WSaveFile;
 import menion.android.whereyougo.openwig.WSeekableFile;
@@ -39,6 +38,7 @@
 import menion.android.whereyougo.preferences.PreferenceValues;
 import menion.android.whereyougo.preferences.Preferences;
 import menion.android.whereyougo.utils.A;
+import menion.android.whereyougo.utils.ContentUtils;
 import menion.android.whereyougo.utils.FileSystem;
 import menion.android.whereyougo.utils.Logger;
 import menion.android.whereyougo.utils.ManagerNotify;
@@ -50,6 +50,7 @@
 import static menion.android.whereyougo.permission.PermissionHandler.needAskForPermission;
 
 import android.Manifest;
+import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlertDialog;
 import android.app.NotificationManager;
@@ -60,6 +61,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Debug;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -74,7 +76,9 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.StringReader;
+import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Objects;
 import java.util.Vector;
 
 import cz.matejcik.openwig.Engine;
@@ -104,6 +108,9 @@ public class MainActivity extends CustomActivity {
     public static final int CLOSE_DESTROY_APP_DIALOG_ADDITIONAL_TEXT = 2;
     public static final int CLOSE_HIDE_APP = 3;
 
+    // Activity result request codes
+    private final int PICK_FILE_TO_IMPORT = 1;
+
     public static CartridgeFile cartridgeFile;
     public static String selectedFile;
 
@@ -211,6 +218,29 @@ public static void refreshCartridges() {
         }
     }
 
+    private void openCartridge(Uri uri) {
+        String originalFilename = ContentUtils.getFileName(getContentResolver(), uri);
+        File openedFile = new File(FileSystem.ROOT + "/" + originalFilename);
+
+        if (openedFile.exists()) {
+            ManagerNotify.toastShortMessage(this, getString(R.string.file_already_imported));
+        } else {
+            try (
+                InputStream stream = getContentResolver().openInputStream(uri);
+                OutputStream outStream = Files.newOutputStream(openedFile.toPath())
+            ) {
+                byte[] buffer = new byte[8 * 1024];
+                int bytesRead;
+                while ((bytesRead = stream.read(buffer)) != -1) {
+                    outStream.write(buffer, 0, bytesRead);
+                }
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        openCartridge(openedFile);
+    }
+
     public static void openCartridge(final CartridgeFile cartridgeFile) {
         final CustomActivity activity = A.getMain();
         if (activity == null) {
@@ -484,17 +514,6 @@ protected int getCloseValue() {
         return CLOSE_DESTROY_APP_NO_DIALOG;
     }
 
-    private boolean isAnyCartridgeAvailable() {
-        if (cartridgeFiles == null || cartridgeFiles.size() == 0) {
-            UtilsGUI.showDialogInfo(
-                    MainActivity.this,
-                    getString(R.string.no_wherigo_cartridge_available, FileSystem.ROOT));
-            return false;
-        } else {
-            return true;
-        }
-    }
-
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         String[] koPermissions = checkKoPermissions(this, permissions);
@@ -530,42 +549,26 @@ public void onCreate(Bundle savedInstanceState) {
             }
 
             eventFirstInit();
-            setScreenBasic(this);
-            eventCreateLayout();
-        } else {
-            // Logger.w(TAG, "onCreate() - only register");
-            setScreenBasic(this);
-            eventCreateLayout();
         }
+        setScreenBasic(this);
+        eventCreateLayout();
 
         if (needAskForPermission()) {
             checkPermissions(this);
         }
 
-        if (Intent.ACTION_VIEW.equals(getIntent().getAction())) {
-            Intent intent = new Intent(getIntent());
-            intent.setClass(this, DownloadCartridgeActivity.class);
-            startActivity(intent);
-            finish();
-        } else if (Intent.ACTION_SEND.equals(getIntent().getAction())) {
-            try {
-                Uri uri = Uri.parse(getIntent().getStringExtra(Intent.EXTRA_TEXT));
-                if (uri.getQueryParameter("CGUID") == null)
-                    throw new Exception("Invalid URL");
-                Intent intent = new Intent(this, DownloadCartridgeActivity.class);
-                intent.setData(uri);
-                startActivity(intent);
-            } catch (Exception e) {
-                ManagerNotify.toastShortMessage(this, getString(R.string.invalid_url));
-            }
-            finish();
-        } else {
-            String cguid = getIntent() == null ? null : getIntent().getStringExtra("cguid");
-            if (cguid != null) {
-                File file = FileSystem.findFile(cguid);
-                if (file != null) {
-                    openCartridge(file);
+        Intent callingIntent = getIntent();
+        if (Intent.ACTION_VIEW.equals(callingIntent.getAction())) {
+            Uri fileUri = callingIntent.getData();
+            if (fileUri != null) {
+                String originalFilename = ContentUtils.getFileName(getContentResolver(), fileUri);
+                if (!originalFilename.endsWith(".gwc")) {
+                    ManagerNotify.toastShortMessage(this, getString(R.string.invalid_file_selected));
+                } else {
+                    openCartridge(fileUri);
                 }
+            } else {
+                finish();
             }
         }
     }
@@ -582,6 +585,36 @@ public boolean onCreateOptionsMenu(Menu menu) {
         return true;
     }
 
+    public void openFilePicker() {
+        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("*/*");
+
+        startActivityForResult(intent, PICK_FILE_TO_IMPORT);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+        Log.d("Main", "Called here");
+        if (requestCode == PICK_FILE_TO_IMPORT && resultCode == Activity.RESULT_OK) {
+            Log.d("Main", "Result ok");
+            if (intent != null) {
+                Uri uri = intent.getData();
+                if (uri != null) {
+                    String fileName = ContentUtils.getFileName(getContentResolver(), uri);
+                    Log.d("Main", fileName);
+                    if (!fileName.endsWith(".gwc")) {
+                        ManagerNotify.toastShortMessage(this, getString(R.string.invalid_file_selected));
+                    } else {
+                        openCartridge(uri);
+//                    dismiss();
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
@@ -642,13 +675,9 @@ private void openCartridge(File file) {
             CartridgeFile cart = null;
             try {
                 cart = CartridgeFile.read(new WSeekableFile(file), new WSaveFile(file));
-                if (cart != null) {
-                    cart.filename = file.getAbsolutePath();
-                } else {
-                    return;
-                }
+                cart.filename = file.getAbsolutePath();
             } catch (Exception e) {
-                Logger.w(TAG, "openCartridge(), file:" + file + ", e:" + e.toString());
+                Logger.w(TAG, "openCartridge(), file:" + file + ", e:" + e);
                 ManagerNotify.toastShortMessage(getString(R.string.invalid_cartridge, file.getName()));
                 // file.delete();
             }
@@ -673,11 +702,6 @@ private void clearPackageFromMemory() {
     }
 
     private void clickStart() {
-        // check cartridges
-        if (!isAnyCartridgeAvailable()) {
-            return;
-        }
-
         ChooseCartridgeDialog dialog = new ChooseCartridgeDialog();
         dialog.setParams(cartridgeFiles);
         getSupportFragmentManager()
diff --git a/src/main/java/menion/android/whereyougo/gui/dialog/ChooseCartridgeDialog.java b/src/main/java/menion/android/whereyougo/gui/dialog/ChooseCartridgeDialog.java
index 14e97ce9..206f8f01 100644
--- a/src/main/java/menion/android/whereyougo/gui/dialog/ChooseCartridgeDialog.java
+++ b/src/main/java/menion/android/whereyougo/gui/dialog/ChooseCartridgeDialog.java
@@ -16,9 +16,13 @@
 import android.app.Dialog;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Color;
 import android.os.Bundle;
+import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.TextView;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -81,13 +85,24 @@ public Dialog createDialog(Bundle savedInstanceState) {
                 itemLongClicked(position);
                 return true;
             });
+
+            TextView textView = new TextView(getActivity());
+            textView.setTextColor(Color.GRAY);
+            textView.setText(R.string.no_wherigo_cartridge_available);
+            textView.setPadding(15, 15, 15, 15);
+            listView.setEmptyView(textView);
+
+            LinearLayout layout = new LinearLayout(getContext());
+            layout.addView(listView);
+            layout.addView(textView);
             adapter = (BaseAdapter) listView.getAdapter();
             // construct dialog
             return new AlertDialog.Builder(getActivity())
                     .setTitle(R.string.choose_cartridge)
                     .setIcon(R.drawable.ic_title_logo)
-                    .setView(listView)
+                    .setView(layout)
                     .setNeutralButton(R.string.close, null)
+                    .setPositiveButton(getString(R.string.select_file), (dialogInterface, i) -> ((MainActivity)getActivity()).openFilePicker())
                     .create();
         } catch (Exception e) {
             Logger.e(TAG, "createDialog()", e);
diff --git a/src/main/java/menion/android/whereyougo/utils/ContentUtils.java b/src/main/java/menion/android/whereyougo/utils/ContentUtils.java
new file mode 100644
index 00000000..32fb59d7
--- /dev/null
+++ b/src/main/java/menion/android/whereyougo/utils/ContentUtils.java
@@ -0,0 +1,30 @@
+package menion.android.whereyougo.utils;
+
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.OpenableColumns;
+
+public abstract class ContentUtils {
+    public static String getFileName(ContentResolver contentResolver, Uri uri) {
+        String result = null;
+        if ("content".equalsIgnoreCase(uri.getScheme())) {
+            try (Cursor cursor = contentResolver.query(uri, null, null, null, null)) {
+                if (cursor != null && cursor.moveToFirst()) {
+                    int colIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+                    if (colIndex >= 0) {
+                        result = cursor.getString(colIndex);
+                    }
+                }
+            }
+        }
+        if (result == null) {
+            result = uri.getPath();
+            int cut = result.lastIndexOf('/');
+            if (cut != -1) {
+                result = result.substring(cut + 1);
+            }
+        }
+        return result;
+    }
+}
diff --git a/src/main/java/menion/android/whereyougo/utils/NotificationService.java b/src/main/java/menion/android/whereyougo/utils/NotificationService.java
index 41994c1d..e1bb4747 100644
--- a/src/main/java/menion/android/whereyougo/utils/NotificationService.java
+++ b/src/main/java/menion/android/whereyougo/utils/NotificationService.java
@@ -1,5 +1,6 @@
 package menion.android.whereyougo.utils;
 
+import menion.android.whereyougo.MainApplication;
 import menion.android.whereyougo.R;
 
 import android.app.Notification;
@@ -73,7 +74,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     private void startNotificationService(boolean background) {
         Logger.v(TAG, "Start notification service.");
 
-        Context context = A.getMain().getApplicationContext();
+        Context context = MainApplication.getContext();
         Intent intent = new Intent(context, menion.android.whereyougo.gui.activity.MainActivity.class);
         intent.addCategory(Intent.CATEGORY_LAUNCHER);
         intent.setAction(Intent.ACTION_MAIN);
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index a1649212..6c19aaf6 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -33,6 +33,7 @@
     <string name="failed">Failed</string>
     <string name="feet">Feet</string>
     <string name="filesystem_cannot_create_root">Cannot create Root directory, SDCard probably missing.\n\nInsert it into device and run again!</string>
+    <string name="file_already_imported">Starting previously imported cartridge</string>
     <string name="finished">Finished</string>
     <string name="folder_default">Default</string>
     <string name="folder_select">Select…</string>
@@ -46,6 +47,8 @@
     <string name="gps_on">Location on</string>
     <string name="info">Information</string>
     <string name="input">Input</string>
+    <string name="select_file">Select file</string>
+    <string name="invalid_file_selected">Please select a gwc file</string>
     <string name="invalid_cartridge">Invalid cartridge\n\n %s</string>
     <string name="invalid_url">Invalid URL</string>
     <string name="invalid_value">Invalid value</string>
@@ -66,7 +69,7 @@
     <string name="no_location_providers_available">No Location providers available!</string>
     <string name="no_satellites">No satellites</string>
     <string name="no_target">No target!</string>
-    <string name="no_wherigo_cartridge_available">No Wherigo cartridge (*.gwc) is available.\nDownload or copy them into directory \"%1$s\". You can also set a path to custom directory in \"Settings - Main - Wherigo folder\". Make sure you granted the application permission to write to external storage and you have write permission in selected directory. Some newer devices don\'t allow writing to SD card.If you\'re not sure, set \"Wherigo folder\" automatically.</string>
+    <string name="no_wherigo_cartridge_available">No Wherigo cartridge (*.gwc) is available.\nClick the select file button to import a cartridge.\nYou can also download a cartridge directly by navigating to the download page on the WhereIGo website and choosing to open it in this app.</string>
     <string name="ok">OK</string>
     <string name="pending">Pending</string>
     <string name="pitch">Pitch</string>