diff --git a/Makefile b/Makefile
index a626ef4..af67eb8 100644
--- a/Makefile
+++ b/Makefile
@@ -109,12 +109,18 @@ install:
 	install -m644 src/unix/i2pbrowserrc /etc/i2pbrowser/i2pbrowserrc
 	install -m755 build/profile/i2pbrowser.sh /usr/local/bin/i2pbrowser
 	install -m755 build/app-profile/i2pconfig.sh /usr/local/bin/i2pconfig
+	install -m755 src/unix/i2p-config-service-setup.sh /usr/local/bin/i2p-config-service-setup
 	cp -vr build/profile /var/lib/i2pbrowser/profile
 	cp -vr build/app-profile /var/lib/i2pbrowser/app-profile
+	cp -vr src/icons /var/lib/i2pbrowser/icons
+	cp src/unix/desktop/i2pbrowser.desktop /usr/share/applications
+	cp src/unix/desktop/i2pconfig.desktop /usr/share/applications
 
 uninstall:
 	rm -rfv /etc/i2pbrowser \
 		/var/lib/i2pbrowser \
 		/etc/i2pbrowser/i2pbrowserrc \
 		/usr/local/bin/i2pbrowser \
-		/usr/local/bin/i2pconfig
+		/usr/local/bin/i2pconfig \
+		/usr/share/applications/i2pbrowser.desktop \
+		/usr/share/applications/i2pconfig.desktop
diff --git a/src/unix/desktop/i2pbrowser.desktop b/src/unix/desktop/i2pbrowser.desktop
new file mode 100644
index 0000000..24c7616
--- /dev/null
+++ b/src/unix/desktop/i2pbrowser.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=/usr/local/bin/i2pbrowser
+Name=I2P Browser
+Categories=Network;WebBrowser;
+Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico
\ No newline at end of file
diff --git a/src/unix/desktop/i2pconfig.desktop b/src/unix/desktop/i2pconfig.desktop
new file mode 100644
index 0000000..db8d3b8
--- /dev/null
+++ b/src/unix/desktop/i2pconfig.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=/usr/local/bin/i2pconfig
+Name=I2P Configuration
+Categories=Network;WebBrowser;
+Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico
\ No newline at end of file
diff --git a/src/unix/i2p-config-service-setup.sh b/src/unix/i2p-config-service-setup.sh
new file mode 100755
index 0000000..766d972
--- /dev/null
+++ b/src/unix/i2p-config-service-setup.sh
@@ -0,0 +1,18 @@
+#! /usr/bin/env sh
+
+# Works for Debian service installs. Sets up minified, custom profile for configuring I2P console.
+
+if grep '^i2psvc:' /etc/passwd; then
+	I2P_HOME=$(grep '^i2psvc:' /etc/passwd | sed 's|i2psvc:x:||g' | sed 's|:/usr/sbin/nologin||g' | tr -d ':1234567890' | sed 's|ip|i2p|g')
+	sudo -u i2psvc less $I2P_HOME/i2p-config/router.config
+fi
+
+installer(){
+	if [ -f "$I2P_HOME/i2p-config/router.config" ]; then
+	  if [ "$0" = "/usr/local/bin/i2pconfig" ]; then
+	    if ! grep -R 'routerconsole.browser' "$I2P_HOME/i2p-config/router.config" ; then
+	      echo "routerconsole.browser=$0" | tee -a "$I2P_HOME/i2p-config/router.config"
+	    fi
+	  fi
+	fi
+}
\ No newline at end of file