diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
index 5faf0c1d0..a6cf2d65d 100644
--- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
+++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -1,5 +1,6 @@
 package fr.free.nrw.commons;
 
+import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
@@ -18,15 +19,12 @@ import java.io.File;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import dagger.android.AndroidInjector;
-import dagger.android.DaggerApplication;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.category.CategoryDao;
 import fr.free.nrw.commons.contributions.ContributionDao;
 import fr.free.nrw.commons.data.DBOpenHelper;
+import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.di.CommonsApplicationComponent;
-import fr.free.nrw.commons.di.CommonsApplicationModule;
-import fr.free.nrw.commons.di.DaggerCommonsApplicationComponent;
 import fr.free.nrw.commons.modifications.ModifierSequenceDao;
 import fr.free.nrw.commons.utils.FileUtils;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -42,10 +40,11 @@ import timber.log.Timber;
         resDialogCommentPrompt = R.string.crash_dialog_comment_prompt,
         resDialogOkToast = R.string.crash_dialog_ok_toast
 )
-public class CommonsApplication extends DaggerApplication {
+public class CommonsApplication extends Application {
 
     @Inject SessionManager sessionManager;
     @Inject DBOpenHelper dbOpenHelper;
+
     @Inject @Named("default_preferences") SharedPreferences defaultPrefs;
     @Inject @Named("application_preferences") SharedPreferences applicationPrefs;
     @Inject @Named("prefs") SharedPreferences otherPrefs;
@@ -61,6 +60,7 @@ public class CommonsApplication extends DaggerApplication {
     private CommonsApplicationComponent component;
     private RefWatcher refWatcher;
 
+
     /**
      * Used to declare and initialize various components and dependencies
      */
@@ -68,6 +68,11 @@ public class CommonsApplication extends DaggerApplication {
     public void onCreate() {
         super.onCreate();
 
+        ApplicationlessInjection
+                .getInstance(this)
+                .getCommonsApplicationComponent()
+                .inject(this);
+
         Fresco.initialize(this);
         if (setupLeakCanary() == RefWatcher.DISABLED) {
             return;
@@ -85,6 +90,7 @@ public class CommonsApplication extends DaggerApplication {
         System.setProperty("in.yuvi.http.fluent.PROGRESS_TRIGGER_THRESHOLD", "3.0");
     }
 
+
     /**
      * Helps in setting up LeakCanary library
      * @return instance of LeakCanary
@@ -107,28 +113,6 @@ public class CommonsApplication extends DaggerApplication {
         return application.refWatcher;
     }
 
-    /**
-    * Helps in injecting dependency library Dagger
-    * @return Dagger injector
-    */
-    @Override
-    protected AndroidInjector<? extends DaggerApplication> applicationInjector() {
-        return injector();
-    }
-
-    /**
-     * used to create injector of application component
-     * @return Application component of Dagger
-     */
-    public CommonsApplicationComponent injector() {
-        if (component == null) {
-            component = DaggerCommonsApplicationComponent.builder()
-                    .appModule(new CommonsApplicationModule(this))
-                    .build();
-        }
-        return component;
-    }
-
     /**
      * clears data of current application
      * @param context Application context
diff --git a/app/src/main/java/fr/free/nrw/commons/HandlerService.java b/app/src/main/java/fr/free/nrw/commons/HandlerService.java
index 69a1ea4b9..e5e1b3b1b 100644
--- a/app/src/main/java/fr/free/nrw/commons/HandlerService.java
+++ b/app/src/main/java/fr/free/nrw/commons/HandlerService.java
@@ -8,9 +8,9 @@ import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
 
-import dagger.android.DaggerService;
+import fr.free.nrw.commons.di.CommonsDaggerService;
 
-public abstract class HandlerService<T> extends DaggerService {
+public abstract class HandlerService<T> extends CommonsDaggerService {
     private volatile Looper threadLooper;
     private volatile ServiceHandler threadHandler;
     private String serviceName;
diff --git a/app/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java b/app/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java
index 03fee8852..35d197782 100644
--- a/app/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java
+++ b/app/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java
@@ -14,6 +14,7 @@ import com.facebook.drawee.view.SimpleDraweeView;
 
 import javax.inject.Inject;
 
+import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import timber.log.Timber;
 
@@ -71,7 +72,11 @@ public class MediaWikiImageView extends SimpleDraweeView {
      * Initializes MediaWikiImageView.
      */
     private void init() {
-        ((CommonsApplication) getContext().getApplicationContext()).injector().inject(this);
+        ApplicationlessInjection
+                .getInstance(getContext()
+                        .getApplicationContext())
+                .getCommonsApplicationComponent()
+                .inject(this);
         setHierarchy(GenericDraweeHierarchyBuilder
                 .newInstance(getResources())
                 .setPlaceholderImage(VectorDrawableCompat.create(getResources(),
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
index d17120106..780f4310b 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
@@ -33,6 +33,7 @@ import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.WelcomeActivity;
 import fr.free.nrw.commons.contributions.ContributionsActivity;
+import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
 import timber.log.Timber;
@@ -66,8 +67,12 @@ public class LoginActivity extends AccountAuthenticatorActivity {
         setTheme(Utils.isDarkTheme(this) ? R.style.DarkAppTheme : R.style.LightAppTheme);
         getDelegate().installViewFactory();
         getDelegate().onCreate(savedInstanceState);
-        AndroidInjection.inject(this);
+
         super.onCreate(savedInstanceState);
+        ApplicationlessInjection
+                .getInstance(this.getApplicationContext())
+                .getCommonsApplicationComponent()
+                .inject(this);
 
         setContentView(R.layout.activity_login);
 
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java
index b0f3e6063..6bc6de076 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java
@@ -5,12 +5,12 @@ import android.os.IBinder;
 
 import javax.inject.Inject;
 
-import dagger.android.DaggerService;
+import fr.free.nrw.commons.di.CommonsDaggerService;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 
 import static android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT;
 
-public class WikiAccountAuthenticatorService extends DaggerService {
+public class WikiAccountAuthenticatorService extends CommonsDaggerService {
 
     @Inject MediaWikiApi mwApi;
     private WikiAccountAuthenticator wikiAccountAuthenticator = null;
diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
index 4787d0e4f..76a70c0b3 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.category;
 
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
@@ -33,8 +34,8 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import dagger.android.support.DaggerFragment;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.upload.MwVolleyApi;
 import fr.free.nrw.commons.utils.StringSortingUtils;
@@ -49,7 +50,7 @@ import static android.view.KeyEvent.KEYCODE_BACK;
 /**
  * Displays the category suggestion and selection screen. Category search is initiated here.
  */
-public class CategorizationFragment extends DaggerFragment {
+public class CategorizationFragment extends CommonsDaggerSupportFragment {
 
     public static final int SEARCH_CATS_LIMIT = 25;
 
@@ -134,11 +135,6 @@ public class CategorizationFragment extends DaggerFragment {
         }
     }
 
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-    }
-
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java
index dcc1bc6f2..16cf49742 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java
@@ -1,6 +1,5 @@
 package fr.free.nrw.commons.category;
 
-import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.UriMatcher;
 import android.database.Cursor;
@@ -12,8 +11,8 @@ import android.text.TextUtils;
 
 import javax.inject.Inject;
 
-import dagger.android.AndroidInjection;
 import fr.free.nrw.commons.data.DBOpenHelper;
+import fr.free.nrw.commons.di.CommonsDaggerContentProvider;
 import timber.log.Timber;
 
 import static android.content.UriMatcher.NO_MATCH;
@@ -21,7 +20,7 @@ import static fr.free.nrw.commons.category.CategoryDao.Table.ALL_FIELDS;
 import static fr.free.nrw.commons.category.CategoryDao.Table.COLUMN_ID;
 import static fr.free.nrw.commons.category.CategoryDao.Table.TABLE_NAME;
 
-public class CategoryContentProvider extends ContentProvider {
+public class CategoryContentProvider extends CommonsDaggerContentProvider {
 
     public static final String AUTHORITY = "fr.free.nrw.commons.categories.contentprovider";
     // For URI matcher
@@ -44,12 +43,6 @@ public class CategoryContentProvider extends ContentProvider {
 
     @Inject DBOpenHelper dbOpenHelper;
 
-    @Override
-    public boolean onCreate() {
-        AndroidInjection.inject(this);
-        return false;
-    }
-
     @SuppressWarnings("ConstantConditions")
     @Override
     public Cursor query(@NonNull Uri uri, String[] projection, String selection,
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java
index 4d82bdfb1..7dc750732 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java
@@ -1,6 +1,5 @@
 package fr.free.nrw.commons.contributions;
 
-import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.UriMatcher;
 import android.database.Cursor;
@@ -12,15 +11,15 @@ import android.text.TextUtils;
 
 import javax.inject.Inject;
 
-import dagger.android.AndroidInjection;
 import fr.free.nrw.commons.data.DBOpenHelper;
+import fr.free.nrw.commons.di.CommonsDaggerContentProvider;
 import timber.log.Timber;
 
 import static android.content.UriMatcher.NO_MATCH;
 import static fr.free.nrw.commons.contributions.ContributionDao.Table.ALL_FIELDS;
 import static fr.free.nrw.commons.contributions.ContributionDao.Table.TABLE_NAME;
 
-public class ContributionsContentProvider extends ContentProvider {
+public class ContributionsContentProvider extends CommonsDaggerContentProvider {
 
     private static final int CONTRIBUTIONS = 1;
     private static final int CONTRIBUTIONS_ID = 2;
@@ -41,12 +40,6 @@ public class ContributionsContentProvider extends ContentProvider {
 
     @Inject DBOpenHelper dbOpenHelper;
 
-    @Override
-    public boolean onCreate() {
-        AndroidInjection.inject(this);
-        return true;
-    }
-
     @SuppressWarnings("ConstantConditions")
     @Override
     public Cursor query(@NonNull Uri uri, String[] projection, String selection,
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
index 590d4e6ad..3a391b293 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -25,8 +25,8 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import dagger.android.support.DaggerFragment;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.nearby.NearbyActivity;
 import timber.log.Timber;
 
@@ -36,7 +36,7 @@ import static android.app.Activity.RESULT_OK;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 import static android.view.View.GONE;
 
-public class ContributionsListFragment extends DaggerFragment {
+public class ContributionsListFragment extends CommonsDaggerSupportFragment {
 
     @BindView(R.id.contributionsList)
     GridView contributionsList;
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java
index f8245032b..5be634a2e 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java
@@ -25,6 +25,7 @@ import javax.inject.Named;
 
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.mwapi.LogEventResult;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import timber.log.Timber;
@@ -81,7 +82,11 @@ public class ContributionsSyncAdapter extends AbstractThreadedSyncAdapter {
     @Override
     public void onPerformSync(Account account, Bundle bundle, String authority,
                               ContentProviderClient contentProviderClient, SyncResult syncResult) {
-        ((CommonsApplication) getContext().getApplicationContext()).injector().inject(this);
+        ApplicationlessInjection
+                .getInstance(getContext()
+                        .getApplicationContext())
+                .getCommonsApplicationComponent()
+                .inject(this);
         // This code is fraught with possibilities of race conditions, but lalalalala I can't hear you!
         String user = account.name;
         String lastModified = prefs.getString("lastSyncTimestamp", "");
diff --git a/app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java b/app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java
new file mode 100644
index 000000000..2faf09b83
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/di/ApplicationlessInjection.java
@@ -0,0 +1,93 @@
+package fr.free.nrw.commons.di;
+
+import android.app.Activity;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.ContentProvider;
+import android.content.Context;
+import android.support.v4.app.Fragment;
+
+import javax.inject.Inject;
+
+import dagger.android.AndroidInjector;
+import dagger.android.DispatchingAndroidInjector;
+import dagger.android.HasActivityInjector;
+import dagger.android.HasBroadcastReceiverInjector;
+import dagger.android.HasContentProviderInjector;
+import dagger.android.HasFragmentInjector;
+import dagger.android.HasServiceInjector;
+import dagger.android.support.HasSupportFragmentInjector;
+
+public class ApplicationlessInjection
+        implements
+        HasActivityInjector,
+        HasFragmentInjector,
+        HasSupportFragmentInjector,
+        HasServiceInjector,
+        HasBroadcastReceiverInjector,
+        HasContentProviderInjector {
+
+    private static ApplicationlessInjection instance = null;
+
+    @Inject DispatchingAndroidInjector<Activity> activityInjector;
+    @Inject DispatchingAndroidInjector<BroadcastReceiver> broadcastReceiverInjector;
+    @Inject DispatchingAndroidInjector<android.app.Fragment> fragmentInjector;
+    @Inject DispatchingAndroidInjector<Fragment> supportFragmentInjector;
+    @Inject DispatchingAndroidInjector<Service> serviceInjector;
+    @Inject DispatchingAndroidInjector<ContentProvider> contentProviderInjector;
+
+    private CommonsApplicationComponent commonsApplicationComponent;
+
+    public ApplicationlessInjection(Context applicationContext) {
+        commonsApplicationComponent = DaggerCommonsApplicationComponent.builder()
+                .appModule(new CommonsApplicationModule(applicationContext)).build();
+        commonsApplicationComponent.inject(this);
+    }
+
+    @Override
+    public DispatchingAndroidInjector<Activity> activityInjector() {
+        return activityInjector;
+    }
+
+    @Override
+    public DispatchingAndroidInjector<android.app.Fragment> fragmentInjector() {
+        return fragmentInjector;
+    }
+
+    @Override
+    public DispatchingAndroidInjector<Fragment> supportFragmentInjector() {
+        return supportFragmentInjector;
+    }
+
+    @Override
+    public DispatchingAndroidInjector<BroadcastReceiver> broadcastReceiverInjector() {
+        return broadcastReceiverInjector;
+    }
+
+    @Override
+    public DispatchingAndroidInjector<Service> serviceInjector() {
+        return serviceInjector;
+    }
+
+    @Override
+    public AndroidInjector<ContentProvider> contentProviderInjector() {
+        return contentProviderInjector;
+    }
+
+    public CommonsApplicationComponent getCommonsApplicationComponent() {
+        return commonsApplicationComponent;
+    }
+
+    public static ApplicationlessInjection getInstance(Context applicationContext) {
+        if (instance == null) {
+            synchronized (ApplicationlessInjection.class) {
+                if (instance == null) {
+                    instance = new ApplicationlessInjection(applicationContext);
+                }
+            }
+        }
+
+        return instance;
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java
index 2881f33fd..14985c6b6 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java
@@ -1,5 +1,7 @@
 package fr.free.nrw.commons.di;
 
+import android.content.Context;
+
 import javax.inject.Singleton;
 
 import dagger.Component;
@@ -8,8 +10,13 @@ import dagger.android.AndroidInjector;
 import dagger.android.support.AndroidSupportInjectionModule;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.MediaWikiImageView;
+import fr.free.nrw.commons.auth.LoginActivity;
+import fr.free.nrw.commons.category.CategoryContentProvider;
+import fr.free.nrw.commons.contributions.ContributionsContentProvider;
 import fr.free.nrw.commons.contributions.ContributionsSyncAdapter;
+import fr.free.nrw.commons.modifications.ModificationsContentProvider;
 import fr.free.nrw.commons.modifications.ModificationsSyncAdapter;
+import fr.free.nrw.commons.settings.SettingsFragment;
 
 @Singleton
 @Component(modules = {
@@ -21,7 +28,7 @@ import fr.free.nrw.commons.modifications.ModificationsSyncAdapter;
         ServiceBuilderModule.class,
         ContentProviderBuilderModule.class
 })
-public interface CommonsApplicationComponent extends AndroidInjector<CommonsApplication> {
+public interface CommonsApplicationComponent extends AndroidInjector<ApplicationlessInjection> {
     void inject(CommonsApplication application);
 
     void inject(ContributionsSyncAdapter syncAdapter);
@@ -30,6 +37,13 @@ public interface CommonsApplicationComponent extends AndroidInjector<CommonsAppl
 
     void inject(MediaWikiImageView mediaWikiImageView);
 
+    void inject(LoginActivity activity);
+
+    void inject(SettingsFragment fragment);
+
+    @Override
+    void inject(ApplicationlessInjection instance);
+
     @Component.Builder
     @SuppressWarnings({"WeakerAccess", "unused"})
     interface Builder {
diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
index 913eef57e..12c3ee339 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.di;
 
 import android.content.ContentProviderClient;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.support.v4.util.LruCache;
@@ -8,10 +9,10 @@ import android.support.v4.util.LruCache;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
+import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import fr.free.nrw.commons.BuildConfig;
-import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.auth.AccountUtil;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.caching.CacheController;
@@ -31,62 +32,70 @@ import static fr.free.nrw.commons.modifications.ModificationsContentProvider.MOD
 public class CommonsApplicationModule {
     public static final String CATEGORY_AUTHORITY = "fr.free.nrw.commons.categories.contentprovider";
 
-    private CommonsApplication application;
+    private Context applicationContext;
 
-    public CommonsApplicationModule(CommonsApplication application) {
-        this.application = application;
+    public CommonsApplicationModule(Context applicationContext) {
+        this.applicationContext = applicationContext;
     }
 
     @Provides
-    public AccountUtil providesAccountUtil() {
-        return new AccountUtil(application);
+    public Context providesApplicationContext() {
+        return this.applicationContext;
+    }
+
+    @Provides
+    public AccountUtil providesAccountUtil(Context context) {
+        return new AccountUtil(context);
     }
 
     @Provides
     @Named("category")
-    public ContentProviderClient provideCategoryContentProviderClient() {
-        return application.getContentResolver().acquireContentProviderClient(CATEGORY_AUTHORITY);
+    public ContentProviderClient provideCategoryContentProviderClient(Context context) {
+        return context.getContentResolver().acquireContentProviderClient(CATEGORY_AUTHORITY);
     }
 
     @Provides
     @Named("contribution")
-    public ContentProviderClient provideContributionContentProviderClient() {
-        return application.getContentResolver().acquireContentProviderClient(CONTRIBUTION_AUTHORITY);
+    public ContentProviderClient provideContributionContentProviderClient(Context context) {
+        return context.getContentResolver().acquireContentProviderClient(CONTRIBUTION_AUTHORITY);
     }
 
     @Provides
     @Named("modification")
-    public ContentProviderClient provideModificationContentProviderClient() {
-        return application.getContentResolver().acquireContentProviderClient(MODIFICATIONS_AUTHORITY);
+    public ContentProviderClient provideModificationContentProviderClient(Context context) {
+        return context.getContentResolver().acquireContentProviderClient(MODIFICATIONS_AUTHORITY);
     }
 
     @Provides
     @Named("application_preferences")
-    public SharedPreferences providesApplicationSharedPreferences() {
-        return application.getSharedPreferences("fr.free.nrw.commons", MODE_PRIVATE);
+    public SharedPreferences providesApplicationSharedPreferences(Context context) {
+        return context.getSharedPreferences("fr.free.nrw.commons", MODE_PRIVATE);
     }
 
     @Provides
     @Named("default_preferences")
-    public SharedPreferences providesDefaultSharedPreferences() {
-        return PreferenceManager.getDefaultSharedPreferences(application);
+    public SharedPreferences providesDefaultSharedPreferences(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context);
     }
 
     @Provides
     @Named("prefs")
-    public SharedPreferences providesOtherSharedPreferences() {
-        return application.getSharedPreferences("prefs", MODE_PRIVATE);
+    public SharedPreferences providesOtherSharedPreferences(Context context) {
+        return context.getSharedPreferences("prefs", MODE_PRIVATE);
     }
 
     @Provides
-    public UploadController providesUploadController(SessionManager sessionManager, @Named("default_preferences") SharedPreferences sharedPreferences) {
-        return new UploadController(sessionManager, application, sharedPreferences);
+    public UploadController providesUploadController(Context context,
+                                                     SessionManager sessionManager,
+                                                     @Named("default_preferences") SharedPreferences sharedPreferences) {
+        return new UploadController(sessionManager, context, sharedPreferences);
     }
 
     @Provides
     @Singleton
-    public SessionManager providesSessionManager(MediaWikiApi mediaWikiApi) {
-        return new SessionManager(application, mediaWikiApi);
+    public SessionManager providesSessionManager(Context context,
+                                                 MediaWikiApi mediaWikiApi) {
+        return new SessionManager(context, mediaWikiApi);
     }
 
     @Provides
@@ -97,8 +106,8 @@ public class CommonsApplicationModule {
 
     @Provides
     @Singleton
-    public LocationServiceManager provideLocationServiceManager() {
-        return new LocationServiceManager(application);
+    public LocationServiceManager provideLocationServiceManager(Context context) {
+        return new LocationServiceManager(context);
     }
 
     @Provides
@@ -109,8 +118,8 @@ public class CommonsApplicationModule {
 
     @Provides
     @Singleton
-    public DBOpenHelper provideDBOpenHelper() {
-        return new DBOpenHelper(application);
+    public DBOpenHelper provideDBOpenHelper(Context context) {
+        return new DBOpenHelper(context);
     }
 
     @Provides
diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java
new file mode 100644
index 000000000..9f06725de
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java
@@ -0,0 +1,43 @@
+package fr.free.nrw.commons.di;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
+
+import javax.inject.Inject;
+
+import dagger.android.AndroidInjector;
+import dagger.android.DispatchingAndroidInjector;
+import dagger.android.support.HasSupportFragmentInjector;
+
+public abstract class CommonsDaggerAppCompatActivity extends AppCompatActivity implements HasSupportFragmentInjector {
+
+    @Inject
+    DispatchingAndroidInjector<Fragment> supportFragmentInjector;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        inject();
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public AndroidInjector<Fragment> supportFragmentInjector() {
+        return supportFragmentInjector;
+    }
+
+    private void inject() {
+        ApplicationlessInjection injection = ApplicationlessInjection.getInstance(getApplicationContext());
+
+        AndroidInjector<Activity> activityInjector = injection.activityInjector();
+
+        if (activityInjector == null) {
+            throw new NullPointerException("ApplicationlessInjection.activityInjector() returned null");
+        }
+
+        activityInjector.inject(this);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerBroadcastReceiver.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerBroadcastReceiver.java
new file mode 100644
index 000000000..3c4cb9914
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerBroadcastReceiver.java
@@ -0,0 +1,31 @@
+package fr.free.nrw.commons.di;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import dagger.android.AndroidInjector;
+
+public abstract class CommonsDaggerBroadcastReceiver extends BroadcastReceiver {
+
+    public CommonsDaggerBroadcastReceiver() {
+        super();
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        inject(context);
+    }
+
+    private void inject(Context context) {
+        ApplicationlessInjection injection = ApplicationlessInjection.getInstance(context.getApplicationContext());
+
+        AndroidInjector<BroadcastReceiver> serviceInjector = injection.broadcastReceiverInjector();
+
+        if (serviceInjector == null) {
+            throw new NullPointerException("ApplicationlessInjection.broadcastReceiverInjector() returned null");
+        }
+        serviceInjector.inject(this);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerContentProvider.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerContentProvider.java
new file mode 100644
index 000000000..38506c4ca
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerContentProvider.java
@@ -0,0 +1,32 @@
+package fr.free.nrw.commons.di;
+
+import android.content.ContentProvider;
+
+import dagger.android.AndroidInjector;
+
+
+public abstract class CommonsDaggerContentProvider extends ContentProvider {
+
+    public CommonsDaggerContentProvider() {
+        super();
+    }
+
+    @Override
+    public boolean onCreate() {
+        inject();
+        return true;
+    }
+
+    private void inject() {
+        ApplicationlessInjection injection = ApplicationlessInjection.getInstance(getContext());
+
+        AndroidInjector<ContentProvider> serviceInjector = injection.contentProviderInjector();
+
+        if (serviceInjector == null) {
+            throw new NullPointerException("ApplicationlessInjection.contentProviderInjector() returned null");
+        }
+
+        serviceInjector.inject(this);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerIntentService.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerIntentService.java
new file mode 100644
index 000000000..995c517a1
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerIntentService.java
@@ -0,0 +1,32 @@
+package fr.free.nrw.commons.di;
+
+import android.app.IntentService;
+import android.app.Service;
+
+import dagger.android.AndroidInjector;
+
+public abstract class CommonsDaggerIntentService extends IntentService {
+
+    public CommonsDaggerIntentService(String name) {
+        super(name);
+    }
+
+    @Override
+    public void onCreate() {
+        inject();
+        super.onCreate();
+    }
+
+    private void inject() {
+        ApplicationlessInjection injection = ApplicationlessInjection.getInstance(getApplicationContext());
+
+        AndroidInjector<Service> serviceInjector = injection.serviceInjector();
+
+        if (serviceInjector == null) {
+            throw new NullPointerException("ApplicationlessInjection.serviceInjector() returned null");
+        }
+
+        serviceInjector.inject(this);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerService.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerService.java
new file mode 100644
index 000000000..dc6c10b9f
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerService.java
@@ -0,0 +1,31 @@
+package fr.free.nrw.commons.di;
+
+import android.app.Service;
+
+import dagger.android.AndroidInjector;
+
+public abstract class CommonsDaggerService extends Service {
+
+    public CommonsDaggerService() {
+        super();
+    }
+
+    @Override
+    public void onCreate() {
+        inject();
+        super.onCreate();
+    }
+
+    private void inject() {
+        ApplicationlessInjection injection = ApplicationlessInjection.getInstance(getApplicationContext());
+
+        AndroidInjector<Service> serviceInjector = injection.serviceInjector();
+
+        if (serviceInjector == null) {
+            throw new NullPointerException("ApplicationlessInjection.serviceInjector() returned null");
+        }
+
+        serviceInjector.inject(this);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerSupportFragment.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerSupportFragment.java
new file mode 100644
index 000000000..8c33e7a98
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerSupportFragment.java
@@ -0,0 +1,65 @@
+package fr.free.nrw.commons.di;
+
+import android.app.Activity;
+import android.content.Context;
+import android.support.v4.app.Fragment;
+
+import javax.inject.Inject;
+
+import dagger.android.AndroidInjector;
+import dagger.android.DispatchingAndroidInjector;
+import dagger.android.support.HasSupportFragmentInjector;
+
+public abstract class CommonsDaggerSupportFragment extends Fragment implements HasSupportFragmentInjector {
+
+    @Inject
+    DispatchingAndroidInjector<Fragment> childFragmentInjector;
+
+    @Override
+    public void onAttach(Context context) {
+        inject();
+        super.onAttach(context);
+    }
+
+    @Override
+    public AndroidInjector<Fragment> supportFragmentInjector() {
+        return childFragmentInjector;
+    }
+
+
+    public void inject() {
+        HasSupportFragmentInjector hasSupportFragmentInjector = findHasFragmentInjector();
+
+        AndroidInjector<Fragment> fragmentInjector = hasSupportFragmentInjector.supportFragmentInjector();
+
+        if (fragmentInjector == null) {
+            throw new NullPointerException(String.format("%s.supportFragmentInjector() returned null", hasSupportFragmentInjector.getClass().getCanonicalName()));
+        }
+
+        fragmentInjector.inject(this);
+    }
+
+    private HasSupportFragmentInjector findHasFragmentInjector() {
+        Fragment parentFragment = this;
+
+        while ((parentFragment = parentFragment.getParentFragment()) != null) {
+            if (parentFragment instanceof HasSupportFragmentInjector) {
+                return (HasSupportFragmentInjector) parentFragment;
+            }
+        }
+
+        Activity activity = getActivity();
+
+        if (activity instanceof HasSupportFragmentInjector) {
+            return (HasSupportFragmentInjector) activity;
+        }
+
+        ApplicationlessInjection injection = ApplicationlessInjection.getInstance(activity.getApplicationContext());
+        if (injection != null) {
+            return injection;
+        }
+
+        throw new IllegalArgumentException(String.format("No injector was found for %s", getClass().getCanonicalName()));
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
index 75e366767..60577ead7 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
@@ -24,7 +24,6 @@ import java.util.Locale;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
-import dagger.android.support.DaggerFragment;
 import fr.free.nrw.commons.License;
 import fr.free.nrw.commons.LicenseList;
 import fr.free.nrw.commons.Media;
@@ -32,12 +31,12 @@ import fr.free.nrw.commons.MediaDataExtractor;
 import fr.free.nrw.commons.MediaWikiImageView;
 import fr.free.nrw.commons.PageTitle;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.location.LatLng;
-import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.ui.widget.CompatTextView;
 import timber.log.Timber;
 
-public class MediaDetailFragment extends DaggerFragment {
+public class MediaDetailFragment extends CommonsDaggerSupportFragment {
 
     private boolean editable;
     private MediaDetailPagerFragment.MediaDetailProvider detailProvider;
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
index 5d6e66faf..d70b515bb 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
@@ -28,12 +28,12 @@ import android.view.ViewGroup;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import dagger.android.support.DaggerFragment;
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.contributions.ContributionsActivity;
+import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
@@ -41,7 +41,7 @@ import static android.content.Context.DOWNLOAD_SERVICE;
 import static android.content.Intent.ACTION_VIEW;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 
-public class MediaDetailPagerFragment extends DaggerFragment implements ViewPager.OnPageChangeListener {
+public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment implements ViewPager.OnPageChangeListener {
 
     @Inject MediaWikiApi mwApi;
     @Inject SessionManager sessionManager;
diff --git a/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java
index 3f2c01930..c7b92a3ec 100644
--- a/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java
+++ b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java
@@ -1,6 +1,5 @@
 package fr.free.nrw.commons.modifications;
 
-import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.UriMatcher;
 import android.database.Cursor;
@@ -12,13 +11,13 @@ import android.text.TextUtils;
 
 import javax.inject.Inject;
 
-import dagger.android.AndroidInjection;
 import fr.free.nrw.commons.data.DBOpenHelper;
+import fr.free.nrw.commons.di.CommonsDaggerContentProvider;
 import timber.log.Timber;
 
 import static fr.free.nrw.commons.modifications.ModifierSequenceDao.Table.TABLE_NAME;
 
-public class ModificationsContentProvider extends ContentProvider {
+public class ModificationsContentProvider extends CommonsDaggerContentProvider {
 
     private static final int MODIFICATIONS = 1;
     private static final int MODIFICATIONS_ID = 2;
@@ -40,12 +39,6 @@ public class ModificationsContentProvider extends ContentProvider {
 
     @Inject DBOpenHelper dbOpenHelper;
 
-    @Override
-    public boolean onCreate() {
-        AndroidInjection.inject(this);
-        return true;
-    }
-
     @Override
     public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
         SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
diff --git a/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java
index f81c273d2..85bfedcfa 100644
--- a/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java
@@ -20,6 +20,7 @@ import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.contributions.ContributionDao;
 import fr.free.nrw.commons.contributions.ContributionsContentProvider;
+import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import timber.log.Timber;
 
@@ -36,7 +37,11 @@ public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {
     @Override
     public void onPerformSync(Account account, Bundle bundle, String s, ContentProviderClient contentProviderClient, SyncResult syncResult) {
         // This code is fraught with possibilities of race conditions, but lalalalala I can't hear you!
-        ((CommonsApplication)getContext().getApplicationContext()).injector().inject(this);
+        ApplicationlessInjection
+                .getInstance(getContext()
+                        .getApplicationContext())
+                .getCommonsApplicationComponent()
+                .inject(this);
 
         Cursor allModifications;
         try {
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
index 81bc496f2..3cfb4840f 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
@@ -1,7 +1,9 @@
 package fr.free.nrw.commons.nearby;
 
+import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -16,13 +18,14 @@ import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.List;
 
+import dagger.android.support.AndroidSupportInjection;
 import dagger.android.support.DaggerFragment;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.utils.UriDeserializer;
 import timber.log.Timber;
 
-public class NearbyListFragment extends DaggerFragment {
+public class NearbyListFragment extends Fragment {
     private static final Type LIST_TYPE = new TypeToken<List<Place>>() {
     }.getType();
     private static final Type CUR_LAT_LNG_TYPE = new TypeToken<LatLng>() {
@@ -40,6 +43,12 @@ public class NearbyListFragment extends DaggerFragment {
         setRetainInstance(true);
     }
 
+    @Override
+    public void onAttach(Context context) {
+        AndroidSupportInjection.inject(this);
+        super.onAttach(context);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater,
                              ViewGroup container,
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NoPermissionsFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NoPermissionsFragment.java
index ca0ae0a89..7a907a1e4 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NoPermissionsFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NoPermissionsFragment.java
@@ -1,11 +1,14 @@
 package fr.free.nrw.commons.nearby;
 
+import android.content.Context;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import butterknife.ButterKnife;
+import dagger.android.support.AndroidSupportInjection;
 import dagger.android.support.DaggerFragment;
 import fr.free.nrw.commons.R;
 import timber.log.Timber;
@@ -13,11 +16,17 @@ import timber.log.Timber;
 /**
  * Tells user that Nearby Places cannot be displayed if location permissions are denied
  */
-public class NoPermissionsFragment extends DaggerFragment {
+public class NoPermissionsFragment extends Fragment {
 
     public NoPermissionsFragment() {
     }
 
+    @Override
+    public void onAttach(Context context) {
+        AndroidSupportInjection.inject(this);
+        super.onAttach(context);
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java
index 33e42e4be..2a017c854 100644
--- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java
@@ -30,6 +30,7 @@ import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.utils.FileUtils;
 
 public class SettingsFragment extends PreferenceFragment {
@@ -40,8 +41,11 @@ public class SettingsFragment extends PreferenceFragment {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        AndroidInjection.inject(this);
         super.onCreate(savedInstanceState);
+        ApplicationlessInjection
+                .getInstance(getActivity().getApplicationContext())
+                .getCommonsApplicationComponent()
+                .inject(this);
 
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.preferences);
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
index f08496914..8ef8e84a4 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
@@ -4,10 +4,10 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 
-import dagger.android.support.DaggerAppCompatActivity;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.di.CommonsDaggerAppCompatActivity;
 
-public abstract class BaseActivity extends DaggerAppCompatActivity {
+public abstract class BaseActivity extends CommonsDaggerAppCompatActivity {
     boolean currentTheme;
 
     @Override
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java
index d20d8c1eb..0b6e527e5 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java
@@ -5,6 +5,7 @@ import android.graphics.Point;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.graphics.drawable.VectorDrawableCompat;
+import android.support.v4.app.Fragment;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -27,12 +28,12 @@ import android.widget.TextView;
 import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
 import com.facebook.drawee.view.SimpleDraweeView;
 
-import dagger.android.support.DaggerFragment;
+import dagger.android.support.AndroidSupportInjection;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.media.MediaDetailPagerFragment;
 
-public class MultipleUploadListFragment extends DaggerFragment {
+public class MultipleUploadListFragment extends Fragment {
 
     public interface OnMultipleUploadInitiatedHandler {
         void OnMultipleUploadInitiated();
@@ -56,6 +57,12 @@ public class MultipleUploadListFragment extends DaggerFragment {
         private RelativeLayout overlay;
     }
 
+    @Override
+    public void onAttach(Context context) {
+        AndroidSupportInjection.inject(this);
+        super.onAttach(context);
+    }
+
     private class PhotoDisplayAdapter extends BaseAdapter {
 
         @Override
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
index 259f38c36..be2401b5c 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
@@ -36,16 +36,16 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.OnItemSelected;
 import butterknife.OnTouch;
-import dagger.android.support.DaggerFragment;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
+import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.settings.Prefs;
 import timber.log.Timber;
 
 import static android.view.MotionEvent.ACTION_DOWN;
 import static android.view.MotionEvent.ACTION_UP;
 
-public class SingleUploadFragment extends DaggerFragment {
+public class SingleUploadFragment extends CommonsDaggerSupportFragment {
 
     @BindView(R.id.titleEdit) EditText titleEdit;
     @BindView(R.id.descEdit) EditText descEdit;
diff --git a/app/src/main/res/values-sr-el/error.xml b/app/src/main/res/values-sr-el/error.xml
deleted file mode 100644
index 80d668c8b..000000000
--- a/app/src/main/res/values-sr-el/error.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="crash_dialog_title">Ostava se srušila</string>
-  <string name="crash_dialog_text">Ups! Nešto je pošlo naopako.</string>
-  <string name="crash_dialog_comment_prompt">Recite nam šta ste radili pa to saznanje podelite s nama, putem e-pošte. Time ćete nam pomoći da rešimo problem!</string>
-  <string name="crash_dialog_ok_toast">Hvala vam!</string>
-</resources>
diff --git a/app/src/main/res/values-sr-el/strings.xml b/app/src/main/res/values-sr-el/strings.xml
deleted file mode 100644
index 3cf62f69c..000000000
--- a/app/src/main/res/values-sr-el/strings.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="app_name">Ostava</string>
-  <string name="menu_settings">Podešavanja</string>
-  <string name="username">Korisničko ime</string>
-  <string name="password">Lozinka</string>
-  <string name="login">Prijavi me</string>
-  <string name="signup">Otvori nalog</string>
-  <string name="logging_in_title">Prijavljivanje</string>
-  <string name="logging_in_message">Sačekajte…</string>
-  <string name="login_success">Uspešno ste prijavljeni.</string>
-  <string name="login_failed">Prijavljivanje nije uspelo.</string>
-  <string name="upload_failed">Datoteka nije pronađena. Pokušajte sa drugom datotekom.</string>
-  <string name="authentication_failed">Provera identiteta nije uspela.</string>
-  <string name="uploading_started">Otpremanje je započeto.</string>
-  <string name="upload_completed_notification_title">Datoteka „%1$s“ je otpremljena.</string>
-  <string name="upload_completed_notification_text">Tapnite da biste videli otpremanje</string>
-  <string name="upload_progress_notification_title_start">Počinjem sa otpremanjem datoteke „%1$s“</string>
-  <string name="upload_progress_notification_title_in_progress">Otpremanje datoteke „%1$s“</string>
-  <string name="upload_progress_notification_title_finishing">Završavam sa otpremanjem datoteke „%1$s“</string>
-  <string name="upload_failed_notification_title">Ne mogu da otpremim „%1$s“</string>
-  <string name="upload_failed_notification_subtitle">Tapnite da biste videli</string>
-  <plurals name="uploads_pending_notification_indicator">
-    <item quantity="one">%d datoteka se otprema</item>
-    <item quantity="other">%d datoteke se otpremaju</item>
-  </plurals>
-  <string name="title_activity_contributions">Moja skorašnja otpremanja</string>
-  <string name="contribution_state_queued">Na čekanju</string>
-  <string name="contribution_state_failed">Nije uspelo</string>
-  <string name="contribution_state_in_progress">%1$d%% otpremljeno</string>
-  <string name="contribution_state_starting">Otpremam</string>
-  <string name="menu_from_gallery">Iz galerije</string>
-  <string name="menu_from_camera">Fotografiši</string>
-  <string name="menu_nearby">U blizini</string>
-  <string name="provider_contributions">Moja otpremanja</string>
-  <string name="menu_share">Deli</string>
-  <string name="menu_open_in_browser">Otvori u pregledaču</string>
-  <string name="share_title_hint">Naslov</string>
-  <string name="share_description_hint">Opis</string>
-  <string name="login_failed_network">Ne mogu da vas prijavim – mreža ne radi</string>
-  <string name="login_failed_username">Ne mogu da vas prijavim – proverite svoje korisničko ime</string>
-  <string name="login_failed_password">Ne mogu da vas prijavim – proverite svoju lozinku</string>
-  <string name="login_failed_throttled">Previše neuspešnih pokušaja. Probajte ponovo za nekoliko minuta.</string>
-  <string name="login_failed_blocked">Nažalost, korisnik je blokiran na Ostavi</string>
-  <string name="login_failed_2fa_needed">Morate uneti svoj dvofaktorski kod za autentifikaciju.</string>
-  <string name="login_failed_generic">Prijava nije uspela</string>
-  <string name="share_upload_button">Otpremi</string>
-  <string name="multiple_share_base_title">Dajte ime ovom kompletu</string>
-  <string name="provider_modifications">Izmene</string>
-  <string name="menu_upload_single">Otpremi</string>
-  <string name="categories_search_text_hint">Pretraži kategorije</string>
-  <string name="menu_save_categories">Sačuvaj</string>
-  <string name="refresh_button">Osveži</string>
-  <string name="gps_disabled">GPS je onemogućen na Vašem uređaju. Želite li ga omogućiti?</string>
-  <string name="enable_gps">Omogući GPS</string>
-  <string name="contributions_subtitle_zero">Još uvek nema otpremanja</string>
-  <plurals name="contributions_subtitle">
-    <item quantity="zero">\@string/contributions_subtitle_zero</item>
-    <item quantity="one">%d otpremanje</item>
-    <item quantity="other">%d otpremanja</item>
-  </plurals>
-  <plurals name="starting_multiple_uploads">
-    <item quantity="one">Započni %d otpremanje</item>
-    <item quantity="other">Započni %d otpremanja</item>
-  </plurals>
-  <plurals name="multiple_uploads_title">
-    <item quantity="one">%d otpremanje</item>
-    <item quantity="other">%d otpremanja</item>
-  </plurals>
-  <string name="categories_not_found">Nema kategorija koje odgovaraju %1$s</string>
-  <string name="categories_skip_explanation">Dodajte kategorije na slike da biste olakšali korisnicima njihovo pronalaženje na Ostavi.\n\nDa biste dodali kategoriju, počnite sa pisanjem njenog imena.</string>
-  <string name="categories_activity_title">Kategorije</string>
-  <string name="title_activity_settings">Postavke</string>
-  <string name="title_activity_signup">Otvori nalog</string>
-  <string name="menu_about">O aplikaciji</string>
-  <string name="about_license">Softver otvorenog koda dostupan pod licencom &lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/COPYING\"&gt;Apache ver. 2&lt;/a&gt; Vikimedijina Ostava i njen logo su zaštitni znaci Vikimedijine Fondacije i koriste se sa dozvolom Vikimedijine Fondacine. Mi ne odobravamo ili podržavmo Vikimedijinu Fondaciju.\n\nAplikacija za Vikimedijinu ostavu je aplikacija otvorenog koda koja je napravljena i koja se održava pomoću grantova i volontera Vikimedijine zajednice. Zadužbina Vikimedija nije uključena u stvaranje, razvoj ili održavanje aplikacije.</string>
-  <string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Izvorni kôd&lt;/a&gt; i &lt;a href=\"https://commons-app.github.io/\"&gt;veb-sajt&lt;/a&gt; na GitHub-u. Napravite novi &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;zahtev na GitHub-u&lt;/a&gt; da biste prijavili greške ili dali predloge.</string>
-  <string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Politika privatnosti&lt;/a&gt;</string>
-  <string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Zasluge&lt;/a&gt;</string>
-  <string name="title_activity_about">O aplikaciji</string>
-  <string name="menu_feedback">Pošaljite povratne informacije (putem e-pošte)</string>
-  <string name="no_email_client">Nije instaliran imejl klijent</string>
-  <string name="provider_categories">Nedavno korišćene kategorije</string>
-  <string name="waiting_first_sync">Čekam na prvu sinhronizaciju…</string>
-  <string name="no_uploads_yet">Još niste otpremili nijednu fotografiju.</string>
-  <string name="menu_retry_upload">Pokušaj ponovo</string>
-  <string name="menu_cancel_upload">Otkaži</string>
-  <string name="share_license_summary">Slika će se voditi pod licencom %1$s</string>
-  <string name="media_upload_policy">Slanjem ove slike, ja tvrdim da je u pitanju moj rad, da ne sadrži materijal ili selfije zaštićene autorskim pravima, te da je na ostale načine u skladu sa &lt;a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\"&gt;smernicama Vikimedijine ostave&lt;/a&gt;.</string>
-  <string name="menu_download">Preuzmi</string>
-  <string name="preference_license">Licenca</string>
-  <string name="use_previous">Koristi prethodan naslov/opis</string>
-  <string name="allow_gps">Automatski detektuj trenutnu lokaciju</string>
-  <string name="allow_gps_summary">Primi trenutnu lokaciju da bi predložili kategoriju ako slika nije geografski označena</string>
-  <string name="preference_theme">Noćni režim</string>
-  <string name="preference_theme_summary">Koristiti tamnu temu</string>
-  <string name="license_name_cc_by_sa_four">Autorstvo-Deliti pod istim uslovima 4.0</string>
-  <string name="license_name_cc_by_four">Autorstvo 4.0</string>
-  <string name="license_name_cc_by_sa">Autorstvo-Deliti pod istim uslovimau 3.0</string>
-  <string name="license_name_cc_by">Autorstvo 3.0</string>
-  <string name="license_name_cc0">CC0</string>
-  <string name="license_name_cc_by_sa_3_0">CC BY-SA 3.0</string>
-  <string name="license_name_cc_by_sa_3_0_at">CC BY-SA 3.0 (Austrija)</string>
-  <string name="license_name_cc_by_sa_3_0_de">CC BY-SA 3.0 (Nemačka)</string>
-  <string name="license_name_cc_by_sa_3_0_ee">CC BY-SA 3.0 (Estonija)</string>
-  <string name="license_name_cc_by_sa_3_0_es">CC BY-SA 3.0 (Španija)</string>
-  <string name="license_name_cc_by_sa_3_0_hr">CC BY-SA 3.0 (Hrvatska)</string>
-  <string name="license_name_cc_by_sa_3_0_lu">CC BY-SA 3.0 (Luksemburg)</string>
-  <string name="license_name_cc_by_sa_3_0_nl">CC BY-SA 3.0 (Holandija)</string>
-  <string name="license_name_cc_by_sa_3_0_no">CC BY-SA 3.0 (Norveška)</string>
-  <string name="license_name_cc_by_sa_3_0_pl">CC BY-SA 3.0 (Poljska)</string>
-  <string name="license_name_cc_by_sa_3_0_ro">CC BY-SA 3.0 (Rumunija)</string>
-  <string name="license_name_cc_by_3_0">CC BY 3.0</string>
-  <string name="license_name_cc_by_sa_4_0">CC BY-SA 4.0</string>
-  <string name="license_name_cc_by_4_0">CC BY 4.0</string>
-  <string name="license_name_cc_zero">CC Nula</string>
-  <string name="tutorial_1_text">Vikimedijina Ostava sadrži većinu slika koja se koristi na Vikipediji.</string>
-  <string name="tutorial_1_subtext">Vaše slike pomažu u obrazovanju ljudi širom sveta.</string>
-  <string name="tutorial_2_text">Molimo Vas da postavite slike koje ste preuzeli ili kreirali u potpunosti sami:</string>
-  <string name="tutorial_2_subtext">- Prirodne objekte (cveće, životinje, planine)\n- Korisne objekte (bicikle, železničke stanice)\n- Poznate ljude (vaš gradonačelnik, Olimpijce koje ste sreli)</string>
-  <string name="tutorial_3_text">Molimo NE otpremajte:</string>
-  <string name="tutorial_3_subtext">- Selfije i slike tvojih prijatelja\n- Slike koje ste preuzeli sa interneta\n- Skrinšotove iz sopstvenih aplikacija</string>
-  <string name="tutorial_4_text">Primer otpremanja:</string>
-  <string name="tutorial_4_subtext">— Naslov: Sidnejska opera\n— Opis: Sidnejska opera, pogled preko zaliva\n— Kategorije: Sidnejska opera sa zapada, pogledi na Sidnejksu operu iz daljine</string>
-  <string name="welcome_wikipedia_text">Delite svoje slike. Oživite članke na Vikipediji!</string>
-  <string name="welcome_wikipedia_subtext">Slike na Vikipediji dolaze iz Ostave.</string>
-  <string name="welcome_copyright_text">Sa vašim slikama pomažete u obrazovanju ljudi širom sveta.</string>
-  <string name="welcome_copyright_subtext">Izbegavajte materijale koje ste našli na internetu, kao i slike plakata, korica knjiga itd.</string>
-  <string name="welcome_final_text">Jeste li razumeli?</string>
-  <string name="welcome_final_button_text">Jesam!</string>
-  <string name="detail_panel_cats_label">Kategorije</string>
-  <string name="detail_panel_cats_loading">Učitavam…</string>
-  <string name="detail_panel_cats_none">Ništa nije izabrano</string>
-  <string name="detail_description_empty">Nema opisa</string>
-  <string name="detail_license_empty">Nepoznata licenca</string>
-  <string name="menu_refresh">Osveži</string>
-  <string name="read_storage_permission_rationale">Potrebna dozvola: Provera spoljašnje memorije. Aplikacija bez ovoga ne može da funkcioniše.</string>
-  <string name="write_storage_permission_rationale">Neophodna dozvola: Pisanje spoljašnjeg skladišta. Aplikacija ne može da funkcioniše bez ovoga.</string>
-  <string name="location_permission_rationale">Opciona dozvola: Preuzmi trenutnu lokaciju za predloge kategorija</string>
-  <string name="ok">U redu</string>
-  <string name="title_activity_nearby">Mesta u blizini</string>
-  <string name="no_nearby">Nisu pronađena obližnja mesta</string>
-  <string name="warning">Upozorenje</string>
-  <string name="file_exists">Ova datoteka je već dostupna na Ostavi. Da li ste sigurni da želite da nastavite?</string>
-  <string name="yes">Da</string>
-  <string name="no">Ne</string>
-  <string name="media_detail_title">Naslov</string>
-  <string name="media_detail_media_title">Naslov medija</string>
-  <string name="media_detail_description">Opis</string>
-  <string name="media_detail_description_explanation">Opis datoteke ide ovde. Može da bude poprilično dug i prikazivaće se u više redova. Nadamo se da će izgledati lepo.</string>
-  <string name="media_detail_uploaded_date">Datum otpremanja</string>
-  <string name="media_detail_license">Licenca</string>
-  <string name="media_detail_coordinates">Koordinate</string>
-  <string name="media_detail_coordinates_empty">Ništa nije uneto</string>
-  <string name="become_a_tester_title">Postani Beta Tester</string>
-  <string name="become_a_tester_description">Priključite se na naš beta kanal na Gugl pleju i pristupajte novim informacijama i popravkama bagova</string>
-  <string name="use_wikidata">Koristi Vikipodatke</string>
-  <string name="use_wikidata_summary">(Upozorenje: onemogućavanjem ovoga može se izazvati velika potrošnja mobilnih podataka)</string>
-  <string name="_2fa_code">2FA kod</string>
-  <string name="number_of_uploads">Moj limit za skorašnja otpremanja</string>
-  <string name="maximum_limit">Maksimalni limit</string>
-  <string name="maximum_limit_alert">Nije moguće prikazati više od 500</string>
-  <string name="set_limit">Postavi limit za skorašnja otpremanja</string>
-  <string name="login_failed_2fa_not_supported">Dvofaktorska autentifikacija trenutno nije podržana.</string>
-  <string name="logout_verification">Zaista želite da se odjavite?</string>
-  <string name="commons_logo">Logo Ostave</string>
-  <string name="background_image">Pozadinska slika</string>
-  <string name="mediaimage_failed">Medijska slika neuspešna</string>
-  <string name="no_image_found">Slika nije pronađena</string>
-  <string name="upload_image">Otpremi sliku</string>
-  <string name="welcome_image_mount_zao">Planina Zao</string>
-  <string name="welcome_image_llamas">Lame</string>
-  <string name="welcome_image_rainbow_bridge">Dugin most</string>
-  <string name="welcome_image_tulip">Tulipan</string>
-  <string name="welcome_image_no_selfies">Bez selfija</string>
-  <string name="welcome_image_proprietary">Vlasnička slika</string>
-  <string name="welcome_image_welcome_wikipedia">Dobrodošlica Vikipediji</string>
-  <string name="welcome_image_welcome_copyright">Dobrodošlica za autorska prava</string>
-  <string name="welcome_image_sydney_opera_house">Sidnejska opera</string>
-  <string name="cancel">Otkaži</string>
-  <string name="navigation_drawer_open">Otvori</string>
-  <string name="navigation_drawer_close">Zatvori</string>
-  <string name="navigation_item_home">Početna</string>
-  <string name="navigation_item_upload">Otpremanje</string>
-  <string name="navigation_item_nearby">U blizini</string>
-  <string name="navigation_item_about">O nama</string>
-  <string name="navigation_item_settings">Podešavanja</string>
-  <string name="navigation_item_feedback">Povratne informacije</string>
-  <string name="navigation_item_logout">Odjavi me</string>
-  <string name="navigation_item_info">Tutorijal</string>
-  <string name="navigation_item_notification">Obaveštenja</string>
-  <string name="nearby_needs_permissions">Obližnja mesta ne mogu da se prikazuju bez dozvola za lokaciju</string>
-  <string name="no_description_found">opis nije pronađen</string>
-  <string name="nearby_info_menu_commons_article">Stranica datoteke na Ostavi</string>
-  <string name="nearby_info_menu_wikidata_article">Stavka na Vikipodacima</string>
-  <string name="error_while_cache">Greška pri keširanju slika</string>
-  <string name="title_info">Jedinstven opisni naslov za datoteku, koji će biti ime datoteke. Možete da koristite obični jezik sa razmacima. Ne treba unositi ekstenziju datoteke</string>
-  <string name="description_info">Molimo da opišete datoteku koliko je to moguće: Gde je napravljena? Šta prikazuje? Šta je kontekst? Opišite objekte i/ili osobe. Otkrijte informacije koje se ne mogu lako pogoditi, na primer doba dana ako je u pitanju pejzaž. Ako datoteka prikazuje nešto neobično, molimo da objasnite šta je to čini neobičnom.</string>
-  <string name="give_permission">Davanje dozvole</string>
-  <string name="use_external_storage">Upotreba spoljašnjeg skladišta</string>
-  <string name="use_external_storage_summary">Spremanje slika napravljenih kamerom aplikacije na Vašem uređaju</string>
-  <string name="send_log_file">Pošalji dnevničku datoteku</string>
-  <string name="send_log_file_description">Pošalji dnevničku datoteku developerima preko imejla</string>
-  <string name="login_to_your_account">Prijavite se na svoj nalog</string>
-  <string name="nearby_location_has_not_changed">Lokacija nije promenjena.</string>
-  <string name="nearby_location_not_available">Lokacija nije dostupna.</string>
-  <string name="location_permission_rationale_nearby">Potrebna je dozvola za prikazivanje liste lokacija u blizini</string>
-</resources>