diff --git a/DuetPkg/DuetPkg.fdf b/DuetPkg/DuetPkg.fdf
index 4c9b94bf3f..928b0f991f 100644
--- a/DuetPkg/DuetPkg.fdf
+++ b/DuetPkg/DuetPkg.fdf
@@ -117,7 +117,7 @@ INF  DuetPkg/BiosVideoThunkDxe/BiosVideo.inf
   # Binary INF file to support toggle among different CPU architectures.
 INF  FatBinPkg/EnhancedFatDxe/Fat.inf
 
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp
   }
 
diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
index 9f9283c99f..d063faa61c 100644
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
@@ -1139,7 +1139,7 @@ Returns:
   // from the graphic lib
   //
   if (QuietBoot) {
-    Status = EnableQuietBoot (&gEfiDefaultBmpLogoGuid);
+    Status = EnableQuietBoot (PcdGetPtr(PcdLogoFile));
     if (EFI_ERROR (Status)) {
       DisableQuietBoot ();
       return;
diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
index 173f77bc1b..82e78a95ee 100644
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
@@ -45,7 +45,6 @@ Abstract:
 
 #include <Protocol/PciIo.h>
 
-#include <Guid/Logo.h>
 #include <Guid/Acpi.h>
 #include <Guid/SmBios.h>
 #include <Guid/Mps.h>
diff --git a/DuetPkg/Library/DuetBdsLib/PlatformBds.inf b/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
index c8bffc0b8a..a2f762c00b 100644
--- a/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
+++ b/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
@@ -63,4 +63,6 @@
   gEfiAcpiTableGuid
   
 [Pcd]
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut  
\ No newline at end of file
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut  
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile  
+  
\ No newline at end of file
diff --git a/IntelFrameworkModulePkg/Include/Guid/Logo.h b/IntelFrameworkModulePkg/Include/Guid/Logo.h
deleted file mode 100644
index 40c4353919..0000000000
--- a/IntelFrameworkModulePkg/Include/Guid/Logo.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/** @file
-  This file defines the File GUID for default BMP logo file.
-
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#ifndef _LOGO_GUID_H__
-#define _LOGO_GUID_H__
-
-#define EFI_DEFAULT_BMP_LOGO_GUID \
-  {0x7BB28B99,0x61BB,0x11d5,{0x9A,0x5D,0x00,0x90,0x27,0x3F,0xC1,0x4D}}
-
-extern EFI_GUID gEfiDefaultBmpLogoGuid;
-
-#endif
diff --git a/IntelFrameworkModulePkg/Include/Guid/ShellFile.h b/IntelFrameworkModulePkg/Include/Guid/ShellFile.h
deleted file mode 100644
index 91fb9d852d..0000000000
--- a/IntelFrameworkModulePkg/Include/Guid/ShellFile.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/** @file
-  This file defines File GUID for EFI Shell.
-
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#ifndef _SHELLFILE_H_
-#define _SHELLFILE_H_
-
-#define EFI_SHELL_FILE_GUID  \
-  { 0xc57ad6b7, 0x0515, 0x40a8, {0x9d, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4e, 0x37 } }
-
-
-extern EFI_GUID gEfiShellFileGuid;
-
-#endif
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index 4e8e2c423f..7e3349a513 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -54,14 +54,6 @@
   ## Include/Guid/LzmaDecompress.h
   gLzmaCustomDecompressGuid      = { 0xEE4E5898, 0x3914, 0x4259, { 0x9D, 0x6E, 0xDC, 0x7B, 0xD7, 0x94, 0x03, 0xCF }}
 
-  ## Guid specify the default BMP logo file.
-  ## Include/Guid/Logo.h
-  gEfiDefaultBmpLogoGuid         = { 0x7BB28B99, 0x61BB, 0x11D5, { 0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
-  
-  ## Guid specify the Shell application.
-  ## Include/Guid/ShellFile.h
-  gEfiShellFileGuid              = { 0xC57AD6B7, 0x0515, 0x40A8, { 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }}
-
   ## GUID used to pass DEBUG() macro information through the Status Code Protocol and Status Code PPI
   ## Include/Guid/StatusCodeDataTypeDebug.h
   gEfiStatusCodeDataTypeDebugGuid  = { 0x9A4E9246, 0xD553, 0x11D5, { 0x87, 0xE2, 0x00, 0x06, 0x29, 0x45, 0xC3, 0xB9 }}
@@ -136,6 +128,13 @@
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusOnlySupportSlaveDma|FALSE|BOOLEAN|0x00010041
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportIsaMemory|TRUE|BOOLEAN|0x00010042
 
+[PcdsFixedAtBuild]
+  ## FFS filename to find the default BMP Logo file.
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile |{ 0x99, 0x8b, 0xB2, 0x7B, 0xBB, 0x61, 0xD5, 0x11, 0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }|VOID*|16
+
+  ## FFS filename to find the shell application.
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6, 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }|VOID*|16
+
 [PcdsFixedAtBuild,PcdsPatchableInModule,PcdsDynamic]
   ## PcdStatusCodeMemorySize is used when PcdStatusCodeUseMemory is set to true
   #  (PcdStatusCodeMemorySize * KBytes) is the total taken memory size.
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 7fb6082fc8..a903ad08d6 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -220,7 +220,7 @@ BdsLibBootViaBootOption (
   //
   // If the boot option point to Internal FV shell, make sure it is valid
   //
-  Status = BdsLibUpdateFvFileDevicePath (&DevicePath, &gEfiShellFileGuid);
+  Status = BdsLibUpdateFvFileDevicePath (&DevicePath, PcdGetPtr(PcdShellFile));
   if (!EFI_ERROR(Status)) {
     if (Option->DevicePath != NULL) {
       FreePool(Option->DevicePath);
@@ -1147,7 +1147,7 @@ BdsLibEnumerateAllBootOption (
 
     Status = Fv->ReadFile (
                   Fv,
-                  &gEfiShellFileGuid,
+                  PcdGetPtr(PcdShellFile),
                   NULL,
                   &Size,
                   &Type,
@@ -1232,7 +1232,7 @@ BdsLibBuildOptionFromShell (
   //
   // Build the shell device path
   //
-  EfiInitializeFwVolDevicepathNode (&ShellNode, &gEfiShellFileGuid);
+  EfiInitializeFwVolDevicepathNode (&ShellNode, PcdGetPtr(PcdShellFile));
 
   DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &ShellNode);
 
@@ -1767,7 +1767,7 @@ BdsLibIsValidEFIBootOptDevicePathExt (
     // If the boot option point to Internal FV shell, make sure it is valid
     //
     TempDevicePath = DevPath; 
-    Status = BdsLibUpdateFvFileDevicePath (&TempDevicePath, &gEfiShellFileGuid);
+    Status = BdsLibUpdateFvFileDevicePath (&TempDevicePath, PcdGetPtr(PcdShellFile));
     if (Status == EFI_ALREADY_STARTED) {
       return TRUE;
     } else {
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index d017c922fc..acab4bda2f 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -74,7 +74,6 @@
   gEfiMemoryTypeInformationGuid                 ## CONSUMES ## GUID (The identifier of memory type information type in system table)
                                                 ## CONSUMES ## GUID HOB (The hob holding memory type information)
   gEfiVTUTF8Guid                                ## CONSUMES ## GUID (The type of terminal)
-  gEfiShellFileGuid                             ## CONSUMES ## GUID (Identify the shell file)
   gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## Variable:L"BootCurrent" (The boot option of current boot)
                                                 ## SOMETIMES_CONSUMES ## Variable:L"BootXX" (Boot option variable)
                                                 ## CONSUMES           ## Variable:L"Timeout" (The time out value in second of showing progress bar)
@@ -110,6 +109,8 @@
   gEfiHiiFontProtocolGuid                       # PROTOCOL CONSUMES
   gEfiSecurityArchProtocolGuid                  # PROTOCOL CONSUMES
 
-[FeaturePcd.common]
+[FeaturePcd]
   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
 
+[Pcd]
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
index a850743643..14a68d8f24 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
@@ -45,7 +45,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/FileInfo.h>
 #include <Guid/GlobalVariable.h>
 #include <Guid/PcAnsi.h>
-#include <Guid/ShellFile.h>
 #include <Guid/Performance.h>
 
 #include <Library/PrintLib.h>
diff --git a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c
index 891492ff82..34fd46ee59 100644
--- a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c
+++ b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c
@@ -282,7 +282,7 @@ Returns:
   // from the graphic lib
   //
   if (QuietBoot) {
-    EnableQuietBoot (&gEfiDefaultBmpLogoGuid);
+    EnableQuietBoot (PcdGetPtr(PcdLogoFile));
     //
     // Perform system diagnostic
     //
diff --git a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h
index aa777deac2..d9aafc8fcd 100644
--- a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h
+++ b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h
@@ -37,7 +37,6 @@ Abstract:
 
 #include <Protocol/WinNtThunk.h>
 #include <Protocol/WinNtIo.h>
-#include <Guid/Logo.h>
 #include <Guid/WinNtSystemConfig.h>
 
 extern BDS_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];
diff --git a/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf b/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf
index 1284f4d06a..3708d679cb 100644
--- a/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf
+++ b/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf
@@ -54,13 +54,13 @@
   GenericBdsLib
 
 [Guids]
-  gEfiDefaultBmpLogoGuid
   gEfiWinNtSystemConfigGuid
 
 [Pcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
-  
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile
+
 [Depex]
   gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid
diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index d7427994c5..d5945cf2bf 100644
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -210,8 +210,8 @@ INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
 INF  MdeModulePkg/Universal/PrintDxe/PrintDxe.inf
 INF  RuleOverride = TIANOCOMPRESSED MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 INF  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
-INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf     ##This driver follows UEFI specification definition
-INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf    ##This driver follows UEFI specification definition
+INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
+INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
 INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
 INF  Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
 INF  Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf
@@ -240,19 +240,15 @@ INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
 # for binary shell, binary fat and logo module.
 #
 ################################################################################
-FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {
-    SECTION COMPRESS PI_STD {
-      SECTION GUIDED {
-        SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi
-      }
-    }
+FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
+    SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi
   }
 
 FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
     SECTION PE32 = FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi
   }
 
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp
   }
 
diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
index 1fa2aeb686..339d1e2f78 100644
--- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -770,7 +770,7 @@ Returns:
   // from the graphic lib
   //
   if (QuietBoot) {
-    EnableQuietBoot (&gEfiDefaultBmpLogoGuid);
+    EnableQuietBoot (PcdGetPtr(PcdLogoFile));
     //
     // Perform system diagnostic
     //
diff --git a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
index bc71cc3484..dc28515878 100644
--- a/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
+++ b/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.h
@@ -50,14 +50,11 @@ Abstract:
 #include <Protocol/PciIo.h>
 #include <Protocol/FirmwareVolume2.h>
 
-#include <Guid/Logo.h>
 #include <Guid/Acpi.h>
 #include <Guid/SmBios.h>
 #include <Guid/Mps.h>
 #include <Guid/HobList.h>
-//#include <Guid/PciExpressBaseAddress.h>
 #include <Guid/GlobalVariable.h>
-#include <Guid/ShellFile.h>
 
 extern BDS_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];
 extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformConnectSequence[];
diff --git a/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf b/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
index caadd5be56..1534ac8fc6 100644
--- a/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
+++ b/OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
@@ -48,11 +48,9 @@
   GenericBdsLib
   PciLib
 
-[Guids]
-  gEfiDefaultBmpLogoGuid
-
 [Pcd.common]
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile
 
 [Pcd.IA32, Pcd.X64]
   gEfiMdePkgTokenSpaceGuid.PcdFSBClock
diff --git a/OvmfPkg/OvmfPkg.fdf b/OvmfPkg/OvmfPkg.fdf
index 84afe52811..188c7b79f8 100644
--- a/OvmfPkg/OvmfPkg.fdf
+++ b/OvmfPkg/OvmfPkg.fdf
@@ -154,7 +154,7 @@ INF  FatBinPkg/EnhancedFatDxe/Fat.inf
 
 INF  EdkShellBinPkg/FullShell/FullShell.inf
 
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { # LzmaCompress
       SECTION RAW = MdeModulePkg/Logo/Logo.bmp
     }
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 051a80f17d..66576bff00 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -154,11 +154,11 @@ FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
     SECTION PE32 = FatBinPkg/EnhancedFatDxe/X64/Fat.efi
   }
 
-FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {
+FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
     SECTION PE32 = EdkShellBinPkg/FullShell/X64/Shell_full.efi
   }
 
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
     SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { # LzmaCompress
       SECTION RAW = MdeModulePkg/Logo/Logo.bmp
     }
diff --git a/UnixPkg/Library/UnixBdsLib/BdsPlatform.c b/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
index cbbfc4e227..bac2cfd6cc 100644
--- a/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
+++ b/UnixPkg/Library/UnixBdsLib/BdsPlatform.c
@@ -281,7 +281,7 @@ Returns:
   // from the graphic lib
   //
   if (QuietBoot) {
-    EnableQuietBoot (&gEfiDefaultBmpLogoGuid);
+    EnableQuietBoot (PcdGetPtr(PcdLogoFile));
     //
     // Perform system diagnostic
     //
diff --git a/UnixPkg/Library/UnixBdsLib/BdsPlatform.h b/UnixPkg/Library/UnixBdsLib/BdsPlatform.h
index 4fd8bf181b..3f853152d0 100644
--- a/UnixPkg/Library/UnixBdsLib/BdsPlatform.h
+++ b/UnixPkg/Library/UnixBdsLib/BdsPlatform.h
@@ -37,7 +37,6 @@ Abstract:
 
 #include <Protocol/UnixThunk.h>
 #include <Protocol/UnixIo.h>
-#include <Guid/Logo.h>
 #include <Guid/UnixSystemConfig.h>
 
 extern BDS_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];
diff --git a/UnixPkg/Library/UnixBdsLib/PlatformBds.inf b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
index 10a2631a5e..1a5604d8f2 100644
--- a/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
+++ b/UnixPkg/Library/UnixBdsLib/PlatformBds.inf
@@ -55,13 +55,13 @@
 
 
 [Guids]
-  gEfiDefaultBmpLogoGuid                        # ALWAYS_CONSUMED
   gEfiUnixSystemConfigGuid
 
 [Pcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile
   
 [Depex]
   gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid
diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index cff698479f..bae66cdd4a 100644
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -247,13 +247,14 @@ INF  MdeModulePkg/Application/HelloWorld/HelloWorld.inf
 # for binary shell, binary fat and logo module.
 #  
 ################################################################################
-FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 {
+FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
     SECTION COMPRESS PI_STD {
       SECTION GUIDED {
         SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi
       }
     }
   }
+
 FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
     SECTION COMPRESS PI_STD {
       SECTION GUIDED {
@@ -261,7 +262,8 @@ FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {
       }
     }
   }
-FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
+
+FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
     SECTION COMPRESS PI_STD {
       SECTION GUIDED {
         SECTION RAW = MdeModulePkg/Logo/Logo.bmp