diff --git a/icons/manifest.json b/icons/manifest.json
index a1c4c8b08..b1099de2e 100644
--- a/icons/manifest.json
+++ b/icons/manifest.json
@@ -1,5 +1,6 @@
 {
-	"name": "",
+	"name": "Part-DB",
+	"description": "A managment tool for electronical parts.",
 	"icons": [
 		{
 			"src": "\/icons\/android-chrome-192x192.png",
diff --git a/templates/nextgen/show_category_parts.php/smarty_show_category_parts.tpl b/templates/nextgen/show_category_parts.php/smarty_show_category_parts.tpl
index 18c31c5f2..c403159ca 100644
--- a/templates/nextgen/show_category_parts.php/smarty_show_category_parts.tpl
+++ b/templates/nextgen/show_category_parts.php/smarty_show_category_parts.tpl
@@ -24,6 +24,7 @@
 
 <div class="panel panel-info">
     <div class="panel-heading">
+        <i class="fa fa-tag" aria-hidden="true"></i>&nbsp;
         {t}Teile in der Kategorie{/t} <b>"{$category_name}"</b>
     </div>
     <form method="post" action="">
diff --git a/templates/nextgen/show_part_info.php/smarty_show_part_info.tpl b/templates/nextgen/show_part_info.php/smarty_show_part_info.tpl
index 031614443..a5bb90ab5 100644
--- a/templates/nextgen/show_part_info.php/smarty_show_part_info.tpl
+++ b/templates/nextgen/show_part_info.php/smarty_show_part_info.tpl
@@ -270,11 +270,12 @@
                 </tbody>
             </table>
             </div>
-            <div class="panel-body">
-            {if isset($average_price)}
-                <b>{t}Durchschnittspreis für 1 Stk.:{/t} {$average_price}</b>
-            {/if}
-            </div>
+                {if isset($average_price)}
+                <div class="panel-body">
+                    <b>{t}Durchschnittspreis für 1 Stk.:{/t} {$average_price}</b>
+                </div>
+                {/if}
+
         {else}
             <div class="panel-body">
                 {t}Dieses Bauteil hat keine Einkaufsinformationen.{/t}
diff --git a/templates/nextgen/show_search_parts.php/smarty_searched_parts_table.tpl b/templates/nextgen/show_search_parts.php/smarty_searched_parts_table.tpl
index fa291bb80..335f54d5b 100644
--- a/templates/nextgen/show_search_parts.php/smarty_searched_parts_table.tpl
+++ b/templates/nextgen/show_search_parts.php/smarty_searched_parts_table.tpl
@@ -1,6 +1,6 @@
 {locale path="nextgen/locale" domain="partdb"}
 <div class="panel panel-info">
-   <div class="panel-heading">
+   <div class="panel-heading"><i class="fa fa-tag" aria-hidden="true"></i>&nbsp;
       {t}Treffer in der Kategorie{/t} <b>"{$category_full_path}"</b>
    </div>
         <form method="post" action="">
diff --git a/templates/nextgen/startup.php/smarty_startup.tpl b/templates/nextgen/startup.php/smarty_startup.tpl
index 2960ccfb0..84383470e 100644
--- a/templates/nextgen/startup.php/smarty_startup.tpl
+++ b/templates/nextgen/startup.php/smarty_startup.tpl
@@ -67,7 +67,8 @@
 
 <div class="panel panel-primary">
     <div class="panel-heading">
-        <h3>{t}Lizenz{/t}</h3>
+        <h3><i class="fa fa-book" aria-hidden="true"></i>&nbsp;
+            {t}Lizenz{/t}</h3>
     </div>
     <div class="panel-body">
        <!-- Doesnt work! Paypal has changed API?
@@ -100,7 +101,8 @@
 {if !empty($rss_feed_loop)}
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h4><i class="fa fa-rss" aria-hidden="true"></i> {t}Updates{/t}</h4>
+        <h4><i class="fa fa-rss" aria-hidden="true"></i>&nbsp;
+            {t}Updates{/t}</h4>
     </div>
     <div class="panel-body">
         {foreach $rss_feed_loop as $rss}
diff --git a/templates/nextgen/tools_import.php/smarty_check_data.tpl b/templates/nextgen/tools_import.php/smarty_check_data.tpl
index 6c92cefee..2085f5d23 100644
--- a/templates/nextgen/tools_import.php/smarty_check_data.tpl
+++ b/templates/nextgen/tools_import.php/smarty_check_data.tpl
@@ -1,5 +1,6 @@
 <div class="panel panel-default">
-    <div class="panel-heading">{t}Daten prüfen{/t}</div>
+    <div class="panel-heading"><i class="fa fa-magic" aria-hidden="true"></i>&nbsp;
+        {t}Daten prüfen{/t}</div>
     <form action="" method="post">
         <input type="hidden" name="table_rowcount" value="{$table_rowcount}">
         <input type="hidden" name="file_content" value="{$file_content}">
diff --git a/templates/nextgen/tools_import.php/smarty_upload.tpl b/templates/nextgen/tools_import.php/smarty_upload.tpl
index 07fd766dc..7cb9b413d 100644
--- a/templates/nextgen/tools_import.php/smarty_upload.tpl
+++ b/templates/nextgen/tools_import.php/smarty_upload.tpl
@@ -6,7 +6,8 @@
 {/if}
 
 <div class="panel panel-primary">
-    <div class="panel-heading">{t}Datei auswählen{/t}</div>
+    <div class="panel-heading"><i class="fa fa-upload" aria-hidden="true"></i>&nbsp;
+        {t}Datei auswählen{/t}</div>
     <div class="panel-body">
         <form enctype="multipart/form-data" action="" method="post" class="form-horizontal">
             <div class="form-group">