diff --git a/docs/upgrades/upgrade_7.5.10-7.5.11.pl b/docs/upgrades/upgrade_7.5.10-7.5.11.pl
index a42872301..7b3b6abb8 100644
--- a/docs/upgrades/upgrade_7.5.10-7.5.11.pl
+++ b/docs/upgrades/upgrade_7.5.10-7.5.11.pl
@@ -1039,6 +1039,12 @@ sub removeOldCommerceCode {
     unlink '../../lib/WebGUI/Help/Subscription.pm';
     unlink '../../lib/WebGUI/i18n/English/Subscription.pm';
 
+    unlink '../../www/extras/adminConsole/subscriptions.gif';
+    unlink '../../www/extras/adminConsole/small/subscriptions.gif';
+    unlink '../../www/extras/adminConsole/productManager.gif';
+    unlink '../../www/extras/adminConsole/small/productManager.gif';
+
+
     #Disable the Product macro in the config file.  You can't use the convenience method
     #deleteFromHash since the macro name is in the value, not the key.
     my %macros = %{ $config->get('macros') };
diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm
index 8e2906f97..33558f1df 100644
--- a/lib/WebGUI/AdminConsole.pm
+++ b/lib/WebGUI/AdminConsole.pm
@@ -392,32 +392,14 @@ sub getAdminFunction {
 			op      => "viewActiveSessions",
             class   => 'WebGUI::Operation::ActiveSessions',
 		},
-		"commerce" => {
+		"shop" => {
 			title => {
 				id          => "shop",
 				namespace   => "Shop",
 			},
-			icon    => "commerce.gif",
+			icon    => "shop.gif",
 			url      => $self->session->url->page("shop=admin"),
-            group   => "3",
-		},
-		"subscriptions" => {
-			title => {
-				id          => "manage subscriptions",
-				namespace   => "Subscription",
-			},
-			icon    => "subscriptions.gif",
-			op      => "listSubscriptions",
-            class   => 'WebGUI::Operation::Subscription',
-		},
-		"productManager" => {
-			title => {
-				id          => "manage products",
-				namespace   => "ProductManager",
-			},
-			icon    => "productManager.gif",
-			op      => "listProducts",
-            class   => 'WebGUI::Operation::ProductManager',
+            group   => $session->setting->get('groupIdAdminCommerce'),
 		},
 		"cache" => {
             title => {
diff --git a/www/extras/adminConsole/productManager.gif b/www/extras/adminConsole/productManager.gif
deleted file mode 100644
index bf8aef02c..000000000
Binary files a/www/extras/adminConsole/productManager.gif and /dev/null differ
diff --git a/www/extras/adminConsole/commerce.gif b/www/extras/adminConsole/shop.gif
similarity index 100%
rename from www/extras/adminConsole/commerce.gif
rename to www/extras/adminConsole/shop.gif
diff --git a/www/extras/adminConsole/small/productManager.gif b/www/extras/adminConsole/small/productManager.gif
deleted file mode 100644
index 683643106..000000000
Binary files a/www/extras/adminConsole/small/productManager.gif and /dev/null differ
diff --git a/www/extras/adminConsole/small/commerce.gif b/www/extras/adminConsole/small/shop.gif
similarity index 100%
rename from www/extras/adminConsole/small/commerce.gif
rename to www/extras/adminConsole/small/shop.gif
diff --git a/www/extras/adminConsole/small/subscriptions.gif b/www/extras/adminConsole/small/subscriptions.gif
deleted file mode 100644
index 136d63895..000000000
Binary files a/www/extras/adminConsole/small/subscriptions.gif and /dev/null differ
diff --git a/www/extras/adminConsole/subscriptions.gif b/www/extras/adminConsole/subscriptions.gif
deleted file mode 100644
index f0c2a4ba8..000000000
Binary files a/www/extras/adminConsole/subscriptions.gif and /dev/null differ