diff --git a/src/@ionic-native/plugins/app-minimize/index.ts b/src/@ionic-native/plugins/app-minimize/index.ts
index 0f7c8bf45..5179a9b06 100644
--- a/src/@ionic-native/plugins/app-minimize/index.ts
+++ b/src/@ionic-native/plugins/app-minimize/index.ts
@@ -8,17 +8,17 @@ import { Injectable } from '@angular/core';
  *
  * @usage
  * ```typescript
+ * import { Platfrom } from 'ionic-angular';
  * import { AppMinimize } from '@ionic-native/app-minimize';
  *
  *
- * constructor(private appMinimize: AppMinimize) { }
+ * constructor(private platform: Platform, private appMinimize: AppMinimize) { }
  *
  * ...
  *
- * this.plugin.minimize().then(
- *   success => console.log('Closed'),
- *   err => console.log('Something went wrong')
- * );
+ * this.platform.registerBackButtonAction(() => {
+ *    this.appMinimize.minimize();
+ * });
  *
  * ```
  */
diff --git a/src/@ionic-native/plugins/couchbase-lite/index.ts b/src/@ionic-native/plugins/couchbase-lite/index.ts
index ff1847c1d..72c8bd751 100644
--- a/src/@ionic-native/plugins/couchbase-lite/index.ts
+++ b/src/@ionic-native/plugins/couchbase-lite/index.ts
@@ -23,7 +23,7 @@ import { Injectable } from '@angular/core';
  */
 @Plugin({
   pluginName: 'CouchbaseLite',
-  plugin: 'https://github.com/couchbaselabs/Couchbase-Lite-PhoneGap-Plugin.git',
+  plugin: 'couchbase-lite-phonegap-plugin',
   pluginRef: 'cblite',
   repo: 'https://github.com/couchbaselabs/Couchbase-Lite-PhoneGap-Plugin',
   platforms: ['Android', 'iOS']
diff --git a/src/@ionic-native/plugins/device-accounts/index.ts b/src/@ionic-native/plugins/device-accounts/index.ts
index 578bd2408..ec345c165 100644
--- a/src/@ionic-native/plugins/device-accounts/index.ts
+++ b/src/@ionic-native/plugins/device-accounts/index.ts
@@ -22,9 +22,9 @@ import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
  */
 @Plugin({
   pluginName: 'DeviceAccounts',
-  plugin: 'https://github.com/loicknuchel/cordova-device-accounts.git',
+  plugin: 'cordova-device-accounts',
   pluginRef: 'plugins.DeviceAccounts',
-  repo: 'https://github.com/loicknuchel/cordova-device-accounts',
+  repo: 'https://github.com/danielsogl/cordova-device-accounts',
   platforms: ['Android']
 })
 @Injectable()
diff --git a/src/@ionic-native/plugins/file-chooser/index.ts b/src/@ionic-native/plugins/file-chooser/index.ts
index 15b2a347a..310441886 100644
--- a/src/@ionic-native/plugins/file-chooser/index.ts
+++ b/src/@ionic-native/plugins/file-chooser/index.ts
@@ -23,9 +23,9 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
  */
 @Plugin({
   pluginName: 'FileChooser',
-  plugin: 'https://github.com/don/cordova-filechooser.git',
+  plugin: 'cordova-plugin-filechooser',
   pluginRef: 'fileChooser',
-  repo: 'https://github.com/don/cordova-filechooser',
+  repo: 'https://github.com/ihadeed/cordova-filechooser',
   platforms: ['Android']
 })
 @Injectable()
diff --git a/src/@ionic-native/plugins/geofence/index.ts b/src/@ionic-native/plugins/geofence/index.ts
index 0189680ba..44b77241d 100644
--- a/src/@ionic-native/plugins/geofence/index.ts
+++ b/src/@ionic-native/plugins/geofence/index.ts
@@ -72,7 +72,7 @@ declare const window: any;
  * ### Troubleshooting ###
  * #### I get compile errors when I run `ionic build ios` or `ionic run ios`. ####
  * This could be caused by the Cordova project directory in `/platforms/ios` not being named correctly.
- * Try running `ionic platform rm <platform>` then run `ionic platform add <platform>` to recreate the
+ * Try running `ionic cordova platform rm <platform>` then run `ionic cordova platform add <platform>` to recreate the
  * platform directories.
  */
 @Plugin({
diff --git a/src/@ionic-native/plugins/globalization/index.ts b/src/@ionic-native/plugins/globalization/index.ts
index 60c06f6a3..29763d129 100644
--- a/src/@ionic-native/plugins/globalization/index.ts
+++ b/src/@ionic-native/plugins/globalization/index.ts
@@ -26,7 +26,7 @@ import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
   plugin: 'cordova-plugin-globalization',
   pluginRef: 'navigator.globalization',
   repo: 'https://github.com/apache/cordova-plugin-globalization',
-  platforms: ['Amazon Fire OS', 'Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Widnows Phone']
+  platforms: ['Amazon Fire OS', 'Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
 })
 @Injectable()
 export class Globalization extends IonicNativePlugin {
diff --git a/src/@ionic-native/plugins/httpd/index.ts b/src/@ionic-native/plugins/httpd/index.ts
index b08157195..d529b0dbc 100644
--- a/src/@ionic-native/plugins/httpd/index.ts
+++ b/src/@ionic-native/plugins/httpd/index.ts
@@ -49,7 +49,7 @@ export interface HttpdOptions {
  */
 @Plugin({
   pluginName: 'Httpd',
-  plugin: 'https://github.com/floatinghotpot/cordova-httpd.git',
+  plugin: 'cordova-plugin-httpd',
   pluginRef: 'cordova.plugins.CorHttpd',
   repo: 'https://github.com/floatinghotpot/cordova-httpd',
   platforms: ['Android', 'iOS', 'macOS']
diff --git a/src/@ionic-native/plugins/insomnia/index.ts b/src/@ionic-native/plugins/insomnia/index.ts
index 7fa3bae96..1a541d321 100644
--- a/src/@ionic-native/plugins/insomnia/index.ts
+++ b/src/@ionic-native/plugins/insomnia/index.ts
@@ -31,7 +31,7 @@ import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
  */
 @Plugin({
   pluginName: 'Insomnia',
-  plugin: 'https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin.git',
+  plugin: 'cordova-plugin-insomnia',
   pluginRef: 'plugins.insomnia',
   repo: 'https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin',
   platforms: ['Android', 'Browser', 'Firefox OS', 'iOS', 'Windows', 'Windows Phone 8']
diff --git a/src/@ionic-native/plugins/mobile-accessibility/index.ts b/src/@ionic-native/plugins/mobile-accessibility/index.ts
index 3b97751f6..0e533293f 100644
--- a/src/@ionic-native/plugins/mobile-accessibility/index.ts
+++ b/src/@ionic-native/plugins/mobile-accessibility/index.ts
@@ -22,8 +22,8 @@ import { Injectable } from '@angular/core';
  */
 @Plugin({
   pluginName: 'MobileAccessibility',
-  plugin: 'https://github.com/phonegap/phonegap-mobile-accessibility.git',
-  pluginRef: 'MobileAccessibilityNotifications',
+  plugin: 'phonegap-plugin-mobile-accessibility',
+  pluginRef: 'MobileAccessibility',
   repo: 'https://github.com/phonegap/phonegap-mobile-accessibility',
   platforms: ['Android Fire OS', 'Android', 'iOS', 'Windows']
 })
diff --git a/src/@ionic-native/plugins/onesignal/index.ts b/src/@ionic-native/plugins/onesignal/index.ts
index 248a32792..75214b3c0 100644
--- a/src/@ionic-native/plugins/onesignal/index.ts
+++ b/src/@ionic-native/plugins/onesignal/index.ts
@@ -268,6 +268,58 @@ export enum OSActionType {
  *
  * Requires Cordova plugin: `onesignal-cordova-plugin`. For more info, please see the [OneSignal Cordova Docs](https://documentation.onesignal.com/docs/phonegap-sdk-installation).
  *
+ * #### Icons
+ * If you want to use generated icons with command `ionic cordova resources`:
+ * 
+ * 1. Add a file to your `hooks` directory inside the `after_prepare` folder called `030_copy_android_notification_icons.js`
+ *
+ * 2. Put the following code in it:
+ *
+ * ```
+ * #!/usr/bin/env node
+ * 
+ * var filestocopy = [{
+ *     "resources/android/icon/drawable-hdpi-icon.png":
+ *         "platforms/android/res/drawable-hdpi/ic_stat_onesignal_default.png"
+ * }, {
+ *     "resources/android/icon/drawable-mdpi-icon.png":
+ *         "platforms/android/res/drawable-mdpi/ic_stat_onesignal_default.png"
+ * }, {
+ *     "resources/android/icon/drawable-xhdpi-icon.png":
+ *         "platforms/android/res/drawable-xhdpi/ic_stat_onesignal_default.png"
+ * }, {
+ *     "resources/android/icon/drawable-xxhdpi-icon.png":
+ *         "platforms/android/res/drawable-xxhdpi/ic_stat_onesignal_default.png"
+ * }, {
+ *     "resources/android/icon/drawable-xxxhdpi-icon.png":
+ *         "platforms/android/res/drawable-xxxhdpi/ic_stat_onesignal_default.png"
+ * } ];
+ * 
+ * var fs = require('fs');
+ * var path = require('path');
+ * 
+ * // no need to configure below
+ * var rootdir = process.argv[2];
+ * 
+ * filestocopy.forEach(function(obj) {
+ *     Object.keys(obj).forEach(function(key) {
+ *         var val = obj[key];
+ *         var srcfile = path.join(rootdir, key);
+ *         var destfile = path.join(rootdir, val);
+ *         //console.log("copying "+srcfile+" to "+destfile);
+ *         var destdir = path.dirname(destfile);
+ *         if (fs.existsSync(srcfile) && fs.existsSync(destdir)) {
+ *             fs.createReadStream(srcfile).pipe(
+ *                 fs.createWriteStream(destfile));
+ *         }
+ *     });
+ * });
+ * ```
+ *
+ * 3. From the root of your project make the file executable:
+ * `$ chmod +x hooks/after_prepare/030_copy_android_notification_icons.js`
+ *
+ *
  * @usage
  * ```typescript
  * import { OneSignal } from '@ionic-native/onesignal';
diff --git a/src/@ionic-native/plugins/phonegap-local-notification/index.ts b/src/@ionic-native/plugins/phonegap-local-notification/index.ts
index 7bb0985fa..18c30e897 100644
--- a/src/@ionic-native/plugins/phonegap-local-notification/index.ts
+++ b/src/@ionic-native/plugins/phonegap-local-notification/index.ts
@@ -3,6 +3,9 @@ import { Cordova, CordovaInstance, Plugin, IonicNativePlugin, checkAvailability
 
 declare const Notification: any;
 
+/**
+* @hidden
+*/
 export class PLNObject {
 
   private _objectInstance: any;
diff --git a/src/@ionic-native/plugins/screenshot/index.ts b/src/@ionic-native/plugins/screenshot/index.ts
index 363dd9a5c..c8674c5e0 100644
--- a/src/@ionic-native/plugins/screenshot/index.ts
+++ b/src/@ionic-native/plugins/screenshot/index.ts
@@ -23,7 +23,7 @@ declare const navigator: any;
  */
 @Plugin({
   pluginName: 'Screenshot',
-  plugin: 'https://github.com/gitawego/cordova-screenshot.git',
+  plugin: 'com.darktalker.cordova.screenshot',
   pluginRef: 'navigator.screenshot',
   repo: 'https://github.com/gitawego/cordova-screenshot',
   platforms: ['Android', 'iOS', 'macOS']
diff --git a/src/@ionic-native/plugins/stepcounter/index.ts b/src/@ionic-native/plugins/stepcounter/index.ts
index 10e1699d7..a24ce3889 100644
--- a/src/@ionic-native/plugins/stepcounter/index.ts
+++ b/src/@ionic-native/plugins/stepcounter/index.ts
@@ -26,9 +26,9 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
  */
 @Plugin({
   pluginName: 'Stepcounter',
-  plugin: 'https://github.com/Slidee/cordova-plugin-stepcounter.git',
+  plugin: 'cordova-plugin-stepcounter',
   pluginRef: 'stepcounter',
-  repo: 'https://github.com/Slidee/cordova-plugin-stepcounter',
+  repo: 'https://github.com/ihadeed/cordova-plugin-stepcounter',
   platforms: ['Android']
 })
 @Injectable()
diff --git a/src/@ionic-native/plugins/user-agent/index.ts b/src/@ionic-native/plugins/user-agent/index.ts
index ca315a787..1a87f1f72 100644
--- a/src/@ionic-native/plugins/user-agent/index.ts
+++ b/src/@ionic-native/plugins/user-agent/index.ts
@@ -34,9 +34,9 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
  */
 @Plugin({
   pluginName: 'UserAgent',
-  plugin: 'https://github.com/LouisT/cordova-useragent.git',
+  plugin: 'cordova-plugin-useragent',
   pluginRef: 'plugins.useragent',
-  repo: 'https://github.com/LouisT/cordova-useragent',
+  repo: 'https://github.com/danielsogl/cordova-plugin-useragent',
   platforms: ['Android', 'iOS']
 })
 @Injectable()
diff --git a/src/@ionic-native/plugins/video-capture-plus/index.ts b/src/@ionic-native/plugins/video-capture-plus/index.ts
index 1daaf6132..7969aa9c1 100644
--- a/src/@ionic-native/plugins/video-capture-plus/index.ts
+++ b/src/@ionic-native/plugins/video-capture-plus/index.ts
@@ -131,9 +131,9 @@ export interface VideoCapturePlusOptions {
  */
 @Plugin({
   pluginName: 'VideoCapturePlus',
-  plugin: 'https://github.com/EddyVerbruggen/VideoCapturePlus-PhoneGap-Plugin.git',
+  plugin: 'cordova-plugin-video-capture-plus',
   pluginRef: 'window.plugins.videocaptureplus',
-  repo: 'https://github.com/EddyVerbruggen/VideoCapturePlus-PhoneGap-Plugin',
+  repo: 'https://github.com/danielsogl/cordova-plugin-video-capture-plus',
   platforms: ['Android', 'iOS']
 })
 @Injectable()
diff --git a/src/@ionic-native/plugins/web-intent/index.ts b/src/@ionic-native/plugins/web-intent/index.ts
index cf98d0dca..8903bbead 100644
--- a/src/@ionic-native/plugins/web-intent/index.ts
+++ b/src/@ionic-native/plugins/web-intent/index.ts
@@ -28,7 +28,7 @@ import { Observable } from 'rxjs/Observable';
  */
 @Plugin({
   pluginName: 'WebIntent',
-  plugin: 'https://github.com/darryncampbell/darryncampbell-cordova-plugin-intent.git',
+  plugin: 'com-darryncampbell-cordova-plugin-intent',
   pluginRef: 'intentShim',
   repo: 'https://github.com/darryncampbell/darryncampbell-cordova-plugin-intent',
   platforms: ['Android']
diff --git a/src/@ionic-native/plugins/youtube-video-player/index.ts b/src/@ionic-native/plugins/youtube-video-player/index.ts
index edd01e86c..6b458594c 100644
--- a/src/@ionic-native/plugins/youtube-video-player/index.ts
+++ b/src/@ionic-native/plugins/youtube-video-player/index.ts
@@ -27,9 +27,9 @@ import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
  */
 @Plugin({
   pluginName: 'YoutubeVideoPlayer',
-  plugin: 'https://github.com/JonSmart/CordovaYoutubeVideoPlayer.git',
+  plugin: 'cordova-plugin-youtube-video-player',
   pluginRef: 'YoutubeVideoPlayer',
-  repo: 'https://github.com/JonSmart/CordovaYoutubeVideoPlayer',
+  repo: 'https://github.com/ihadeed/CordovaYoutubeVideoPlayer',
   platforms: ['Android', 'iOS']
 })
 @Injectable()