diff --git a/apps/AndroidBuddy/credits b/apps/AndroidBuddy/credits
index 3a5e8e66af..729fb331bf 100644
--- a/apps/AndroidBuddy/credits
+++ b/apps/AndroidBuddy/credits
@@ -1,3 +1 @@
-Made by gazlene#8088 on Discord
-
-Added to pi-apps by Raspberry Pi News and Botspot
+Botspot
diff --git a/apps/AndroidBuddy/description b/apps/AndroidBuddy/description
index b1736a0757..0e8fee2c35 100644
--- a/apps/AndroidBuddy/description
+++ b/apps/AndroidBuddy/description
@@ -1,10 +1,14 @@
-A GUI for Android device recovery and maintenance.
+Share your keyboard, mouse, screen, internet connection, files, and more with your Android phone.
 
-Features: 
-- APK Installation: Install an Android application package with ease.
-- Screen viewing and interaction: Control your device through an scrcpy window.
-- Recover files: Allows you to back up music, downloads, photos or all of your device's files.
-- AND MORE! Check out the website for more info.
+AndroidBuddy is useful for:
+- Reducing eye strain and improving posture by using the phone on a larger screen.
+- Moving big videos to your computer to delete them from the phone
+- Sharing your fast ethernet connection with the phone (save data costs, can be much faster than WiFi)
+- Responding to texts with a full size keyboard
+- Copying and pasting links and other text between computer and phone
+- Using the phone's internet connection. If your computer cannot find the WiFi network, or you want to use the phone's mobile data, this works even if Mobile Hotspot is not part of your cell plan.
 
 To run: Menu > Accessories > AndroidBuddy
-To run in a temrinal: python3 ~/droidbuddy/main.py
+To run in a temrinal: ~/.local/share/androidbuddy/main.sh
+
+NOTE: To use AndroidBuddy, your Android phone must be connected to your computer with a USB cable. If you know adb and scrcpy and want to help add Bluetooth support, contact Botspot.
diff --git a/apps/AndroidBuddy/icon-24.png b/apps/AndroidBuddy/icon-24.png
index dff39da672..04f4c6386d 100644
Binary files a/apps/AndroidBuddy/icon-24.png and b/apps/AndroidBuddy/icon-24.png differ
diff --git a/apps/AndroidBuddy/icon-64.png b/apps/AndroidBuddy/icon-64.png
index 585f0f2670..06906f7bec 100644
Binary files a/apps/AndroidBuddy/icon-64.png and b/apps/AndroidBuddy/icon-64.png differ
diff --git a/apps/AndroidBuddy/install b/apps/AndroidBuddy/install
index 2e91ef6de8..ef6a620a3e 100755
--- a/apps/AndroidBuddy/install
+++ b/apps/AndroidBuddy/install
@@ -1,24 +1,19 @@
 #!/bin/bash
 
+#remove old droidbuddy app from user gazlene that used to be installed by this app
+sudo rm -rf /opt/droidbuddy /usr/share/applications/androidbuddy.desktop
+
+install_packages adb gvfs-backends rustc cargo
+
 "${DIRECTORY}/manage" install-if-not-installed Scrcpy || exit 1
 #Remove scrcpy menu button
 sudo rm -f /usr/share/applications/scrcpy.desktop
 
-install_packages python3-pip python3-dev python3-tk python3-pil.imagetk || error "Failed to install dependencies"
-
-cd /tmp
-git_clone https://gitlab.com/gazlene/droidbuddy || error 'Could not clone AndroidBuddy repo!'
-sudo mv -f /tmp/droidbuddy /opt
-
-sudo pip3 install Pillow
+#download to home folder so androidbuddy can auto-update going forward
+cd ~/.local/share
+git_clone https://github.com/Botspot/androidbuddy || exit 1
+cd
 
-echo "[Desktop Entry]
-Name=AndroidBuddy
-Comment=GUI for Android device recovery and maintainence
-Icon=$(dirname "$0")/icon-64.png
-Exec=python3 main.py
-Path=/opt/droidbuddy
-Type=Application
-Encoding=UTF-8
-Terminal=false
-Categories=Utility;" | sudo tee /usr/share/applications/androidbuddy.desktop
+status -n "Running androidbuddy install script... "
+~/.local/share/androidbuddy/main.sh install || error "AndroidBuddy install script failed, please refer to errors above."
+status_green Done
diff --git a/apps/AndroidBuddy/uninstall b/apps/AndroidBuddy/uninstall
index 76050f3191..c67ceafb53 100755
--- a/apps/AndroidBuddy/uninstall
+++ b/apps/AndroidBuddy/uninstall
@@ -2,6 +2,9 @@
 purge_packages || error "Dependencies failed to uninstall"
 
 "${DIRECTORY}/manage" uninstall Scrcpy
-sudo rm -rf /opt/droidbuddy /usr/share/applications/androidbuddy.desktop
+status -n "Removing other files... "
+sudo rm -rf /opt/droidbuddy /usr/share/applications/androidbuddy.desktop #gazlene app install locations
 
-exit 0
+sudo rm -rf /usr/bin/gnirehtet /opt/gnirehtet
+rm -rf ~/.local/share/androidbuddy ~/.local/share/applications/androidbuddy.desktop ~/.local/share/icons/androidbuddy.png
+status_green Done
diff --git a/apps/AndroidBuddy/website b/apps/AndroidBuddy/website
index f28ab6c5c5..5a46e47633 100644
--- a/apps/AndroidBuddy/website
+++ b/apps/AndroidBuddy/website
@@ -1 +1 @@
-https://gitlab.com/gazlene/droidbuddy
+https://github.com/Botspot/androidbuddy