diff --git a/branding_autopsy/hash-autopsy-logo-circle.png b/branding_autopsy/hash-autopsy-logo-circle.png
deleted file mode 100644
index 5bac99e039..0000000000
Binary files a/branding_autopsy/hash-autopsy-logo-circle.png and /dev/null differ
diff --git a/branding_autopsy/hash-autopsy-logo-full-body.png b/branding_autopsy/hash-autopsy-logo-full-body.png
deleted file mode 100644
index 724efe901b..0000000000
Binary files a/branding_autopsy/hash-autopsy-logo-full-body.png and /dev/null differ
diff --git a/branding_autopsy/welcome_logo.png b/branding_autopsy/welcome_logo.png
deleted file mode 100644
index 5bac99e039..0000000000
Binary files a/branding_autopsy/welcome_logo.png and /dev/null differ
diff --git a/branding_autopsy/welcome_logo_old.png b/branding_autopsy/welcome_logo_old.png
deleted file mode 100644
index e7a17e0815..0000000000
Binary files a/branding_autopsy/welcome_logo_old.png and /dev/null differ
diff --git a/build.xml b/build.xml
index fc47c751e9..06cef5daf7 100644
--- a/build.xml
+++ b/build.xml
@@ -71,7 +71,7 @@
         <copy file="${basedir}/KNOWN_ISSUES.txt" tofile="${zip-tmp}/${app.name}/KNOWN_ISSUES.txt"/>
          
         <unzip src="${thirdparty.dir}/gstreamer/${os.family}/i386/0.10.7/gstreamer.zip" dest="${zip-tmp}/${app.name}/gstreamer"/>
-        <copy file="${basedir}/branding_${app.name}/icon.ico" tofile="${zip-tmp}/${app.name}/icon.ico" overwrite="true"/>
+        <copy file="${basedir}/icons/icon.ico" tofile="${zip-tmp}/${app.name}/icon.ico" overwrite="true"/>
         <if>
             <equals arg1="${os.family}" arg2="windows"/>
             <then>
@@ -151,15 +151,10 @@
         <property name="disabled.modules" value=""/>
         <property name="enabled.clusters" value=""/>
         <property name="disabled.clusters" value=""/>
-        <condition property="branding.dir" value="branding_${app.name}">
-            <not>
-                <equals arg1="${app.name}" arg2="autopsy"/> 
-            </not>
-        </condition>
+
         <property name="branding.dir" location="branding"/>
         <property name="dist.dir" location="dist"/>
-        <!-- MOVE THE .DLL FILES TO THE NETBEANS DIRECTORY -->
-
+        
         <condition property="run.branding"> <!-- #84689 -->
             <and>
                 <available file="${branding.dir}" type="dir"/>
@@ -174,9 +169,7 @@
     <target name="build-brand" depends="-init">
         
         <echo>${app.name} branding</echo>
-        
-        <copy file="${basedir}/branding_${app.name}/welcome_logo.png" tofile="${basedir}/Core/src/org/sleuthkit/autopsy/casemodule/welcome_logo.png" overwrite="true"/>
-        
+          
         <propertyfile
         file="${branding.dir}/core/core.jar/org/netbeans/core/startup/Bundle.properties" 
         comment="Updated by build script">
@@ -198,10 +191,6 @@
             <entry key="build.type" value="${build.type}" />
         </propertyfile>
         
-        <copy todir="${basedir}" failonerror="false">
-            <fileset dir="${branding.dir}/bundles"
-                    includes="**/*"/>
-        </copy>
     </target>
     
     <target name="jni" depends="build,findTSK">
diff --git a/branding_autopsy/icon.icns b/icons/icon.icns
similarity index 100%
rename from branding_autopsy/icon.icns
rename to icons/icon.icns
diff --git a/branding_autopsy/icon.ico b/icons/icon.ico
similarity index 100%
rename from branding_autopsy/icon.ico
rename to icons/icon.ico
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 20e2a4c162..496971147b 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -2,7 +2,7 @@ app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
 ### Title of the application
 app.title=Autopsy
 ### lowercase version of above
-app.name=autopsy
+app.name=${branding.token}
 ### if left unset, version will default to today's date
 app.version=3.0.8
 ### Build type isn't used at this point, but it may be useful
@@ -22,7 +22,6 @@ auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false
 auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false
 auxiliary.org-netbeans-modules-apisupport-installer.os-windows=true
 auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=false
-branding.token=${app.name}
 modules=\
     ${project.org.sleuthkit.autopsy.keywordsearch}:\
     ${project.org.sleuthkit.autopsy.hashdatabase}:\