diff --git a/rEFIt_UEFI/cpp_foundation/XStringAbstract.h b/rEFIt_UEFI/cpp_foundation/XStringAbstract.h
index a250bf4ea..e83573e16 100755
--- a/rEFIt_UEFI/cpp_foundation/XStringAbstract.h
+++ b/rEFIt_UEFI/cpp_foundation/XStringAbstract.h
@@ -124,6 +124,7 @@ template <size_t _Np> struct XStringAbstract__is_char_st<wchar_t[_Np]>
 
 
 #define asciiToLower(ch) (((ch >= L'A') && (ch <= L'Z')) ? ((ch - L'A') + L'a') : ch)
+#define asciiToUpper(ch) (((ch >= L'a') && (ch <= L'z')) ? ((ch - L'a') + L'A') : ch)
 
 template<typename S, typename O>
 int XStringAbstract__compare(const S* src, const O* other, bool ignoreCase)
@@ -546,6 +547,15 @@ public:
 			s++;
 		}
 	}
+
+	void upperAscii()
+	{
+		T* s = m_data;
+		while ( *s ) {
+			*s = asciiToUpper(*s);
+			s++;
+		}
+	}
 	
 	void trim()
 	{
diff --git a/rEFIt_UEFI/entry_scan/loader.cpp b/rEFIt_UEFI/entry_scan/loader.cpp
index 182831f7a..af1ddb474 100644
--- a/rEFIt_UEFI/entry_scan/loader.cpp
+++ b/rEFIt_UEFI/entry_scan/loader.cpp
@@ -85,6 +85,24 @@ typedef struct LINUX_PATH_DATA
    CONST CHAR8  *Issue;
 } LINUX_PATH_DATA;
 
+typedef struct LINUX_ICON_DATA
+{
+   CONST CHAR16 *DirectoryName;
+   CONST CHAR16 *IconName;
+} LINUX_ICON_MAPPING;
+
+STATIC LINUX_ICON_DATA LinuxIconMapping[] = {
+    { L"LinuxMint", L"mint" },
+    { L"arch_grub", L"arch" },
+    { L"opensuse", L"suse" },
+    { L"ORACLE", L"solaris" },
+    { L"elementary", L"eos" },
+    { L"pclinuxos", L"pclinux" },
+    { L"mx18", L"mx" },
+    { L"mx19", L"mx" }
+};
+STATIC CONST UINTN LinuxIconMappingCount = (sizeof(LinuxIconMapping) / sizeof(LINUX_ICON_DATA));
+
 STATIC LINUX_PATH_DATA LinuxEntryData[] = {
 #if defined(MDE_CPU_X64)
   //comment out all common names
@@ -147,8 +165,6 @@ STATIC LINUX_PATH_DATA LinuxEntryData[] = {
 #endif
   { L"\\EFI\\SuSe\\elilo.efi", L"OpenSuse EFI boot menu", L"suse,linux" },
 };
-
-
 STATIC CONST UINTN LinuxEntryDataCount = (sizeof(LinuxEntryData) / sizeof(LINUX_PATH_DATA));
 
 #if defined(ANDX86)
@@ -1254,15 +1270,24 @@ VOID ScanLoader(VOID)
           //DBG("Skip dot entries: %ls\n", DirEntry->FileName);
           continue;
         }
-        XString OSName = SPrintf("%ls", DirEntry->FileName); //this is folder name "ubuntu"
         XStringW File = SWPrintf("EFI\\%ls\\grubx64.efi", DirEntry->FileName);
+        XStringW OSName = SPrintf("%ls", DirEntry->FileName); // this is folder name, for example "ubuntu"
+        OSName.lowerAscii(); // lowercase for icon name
         if (FileExists(Volume->RootDir, File.wc_str())) {
-          XStringW LoaderTitle = SWPrintf("%s OS EFI boot menu", OSName.c_str());
-          XString IconXS = OSName + ",linux"_XS;
-          IconXS.lowerAscii(); //to avoid misconception
-          DBG("  found entry %s\n", IconXS.c_str());
+          // check if nonstandard icon mapping is needed
+          for (Index = 0; Index < LinuxIconMappingCount; ++Index) {
+            if (StrCmp(OSName.wc_str(),LinuxIconMapping[Index].DirectoryName) == 0) {
+              OSName = XStringW().takeValueFrom(LinuxIconMapping[Index].IconName);
+              break;
+            }
+          }
+          DBG("  found entry %ls,linux\n", OSName.wc_str());
+          XStringW LoaderTitle = OSName.subString(0,1); // capitalize first letter for title
+          LoaderTitle.upperAscii();
+          LoaderTitle += OSName.subString(1, OSName.length()) + L" Linux"_XSW;
           XImage ImageX; //will the image be destroyed or rewritten by next image after the cycle end?
-          ImageX = ThemeX.LoadOSIcon(IconXS);
+          // load from directory, as we don't have linux icons preloaded
+          ImageX.LoadXImage(ThemeX.ThemeDir, (L"os_"_XSW + OSName).wc_str());
           AddLoaderEntry(File.wc_str(), ""_XS, LoaderTitle, Volume,
                          (ImageX.isEmpty() ? NULL : &ImageX), OSTYPE_LINEFI, OSFLAG_NODEFAULTARGS);
         } //anyway continue search other entries
@@ -1275,7 +1300,7 @@ VOID ScanLoader(VOID)
           XStringW IconXSW = XStringW().takeValueFrom(LinuxEntryData[Index].Icon);
           ImageX.LoadXImage(ThemeX.ThemeDir, (L"os_"_XSW + IconXSW.subString(0, IconXSW.indexOf(','))).wc_str());
           AddLoaderEntry(LinuxEntryData[Index].Path, ""_XS, XStringW().takeValueFrom(LinuxEntryData[Index].Title), Volume,
-                         (ImageX.isEmpty() ? NULL : &ImageX), OSTYPE_LIN, OSFLAG_NODEFAULTARGS);
+                         (ImageX.isEmpty() ? NULL : &ImageX), OSTYPE_LINEFI, OSFLAG_NODEFAULTARGS);
         }
       }
       // check for linux kernels
diff --git a/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp b/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp
index f4cde5e2a..b28281053 100644
--- a/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp
+++ b/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp
@@ -1380,24 +1380,22 @@ VOID REFIT_MENU_SCREEN::DrawBCSText(IN CONST CHAR16 *Text, IN INTN XPos, IN INTN
     return;
   }
 
-//  INTN TextLen = StrLen(Text);
-
   // number of chars to be drawn on the screen
-  INTN MaxTextLen = 13;
-//  INTN EllipsisLen = 2;
-
+  UINTN MaxTextLen = 15;
 
   // some optimization
   if (ThemeX.TileXSpace >= 25) {
     MaxTextLen = ThemeX.TileXSpace / 5 + 9;
   }
 
-//  MaxTextLen += EllipsisLen;
   XStringW BCSTextX;
-  BCSTextX.StrnCpy(Text, MaxTextLen);
-  BCSTextX += L"..";
+  if (StrLen(Text) <= MaxTextLen) { // if the text exceeds the given limit
+    BCSTextX.StrnCpy(Text, MaxTextLen);
+  } else {
+    BCSTextX.StrnCpy(Text, MaxTextLen - 2); // EllipsisLen=2
+    BCSTextX += L"..";
+  }
   DrawTextXY(BCSTextX, XPos, YPos, XAlign);
-
 }
 
 VOID REFIT_MENU_SCREEN::DrawMenuText(IN XStringW& Text, IN INTN SelectedWidth, IN INTN XPos, IN INTN YPos, IN UINTN Cursor)