diff --git a/docs/gateway_config.md b/docs/gateway_config.md
index c2390786..b8ae7806 100644
--- a/docs/gateway_config.md
+++ b/docs/gateway_config.md
@@ -109,7 +109,7 @@ The description of the portlet itself lives in the portlet definition file:
             custom operations, in this case to also set the window name to the calculated field.
         -->
         <bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="MyZimbra"
-              p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-mail.png"
+              p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-mail.png"
               p:javascriptFile="/WebProxyPortlet/scripts/custom-javascript.js">
 
             <!-- Custom java form fields.  Beans in list must implement org.jasig.portlet.proxy.mvc.service.web.IAuthenticationFormModifier
@@ -273,7 +273,7 @@ This is how you might add IAuthenticationFormModifier to your portlet definition
 
   ```
           <bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="MyZimbra"
-              p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-mail.png">
+              p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-mail.png">
 
             <property name="authenticationFormModifier">
                 <util:list>
@@ -302,7 +302,7 @@ GatewayEntry bean; e.g.
 
   ```
 <bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="WebAdvisor"
-      p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-web-browser.png"
+      p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-web-browser.png"
       p:javascriptFile="/WebProxyPortlet/scripts/custom-javascript.js">
 ...
 </bean>
diff --git a/pom.xml b/pom.xml
index 9b2de1d5..e3668cc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,12 +153,6 @@
             <artifactId>bcutil-jdk18on</artifactId>
             <version>${bouncycastle.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.jasig.resourceserver</groupId>
-            <artifactId>resource-server-content</artifactId>
-            <version>${resource-server.version}</version>
-            <type>war</type>
-        </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
@@ -316,20 +310,6 @@
                     <attachClasses>true</attachClasses>
                     <warName>${project.artifactId}</warName>
                     <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
-                    <overlays>
-                        <overlay>
-                            <groupId>org.jasig.resourceserver</groupId>
-                            <artifactId>resource-server-content</artifactId>
-                            <includes>
-				<include>rs/jquery/1.12.2/</include>
-                                <include>rs/jquery/1.11.0/</include>
-                                <include>/rs/jqueryui/1.8.24/</include>
-                                <include>/rs/famfamfam/silk/1.3/error.png</include>
-                                <include>/rs/famfamfam/silk/1.3/application_delete.png</include>
-                                <include>/rs/famfamfam/silk/1.3/application_edit.png</include>
-                            </includes>
-                        </overlay>
-                    </overlays>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/webapp/WEB-INF/context/portlet/gateway-sso-portlet.xml b/src/main/webapp/WEB-INF/context/portlet/gateway-sso-portlet.xml
index 7b9aafb1..79834257 100644
--- a/src/main/webapp/WEB-INF/context/portlet/gateway-sso-portlet.xml
+++ b/src/main/webapp/WEB-INF/context/portlet/gateway-sso-portlet.xml
@@ -58,7 +58,7 @@
          -->
         <!--
         <bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="MyZimbra"
-              p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-mail.png">
+              p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-mail.png">
 
             <property name="contentRequests">
                 <util:map>
@@ -115,7 +115,7 @@
         -->
         <!--
         <bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="WebAdvisor"
-              p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-web-browser.png"
+              p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-web-browser.png"
               p:javascriptFile="/WebProxyPortlet/scripts/custom-javascript.js">
 
             <!- beans in list must implement org.jasig.portlet.proxy.mvc.service.web.IAuthenticationFormModifier