Yet another icons for 'High Contrast' theme.

buggins · Mar 6, 2018 · c7609a4 · c7609a4
1 parent 226574d
commit c7609a4
Show file tree

Hide file tree

Showing 46 changed files with 2,991 additions and 325 deletions.
diff --git a/android/res/drawable-hdpi/cr3_browser_folder_hc.png b/android/res/drawable-hdpi/cr3_browser_folder_hc.png
diff --git a/android/res/drawable-hdpi/cr3_browser_folder_recent_hc.png b/android/res/drawable-hdpi/cr3_browser_folder_recent_hc.png
diff --git a/android/res/drawable-hdpi/cr3_button_go_page_hc.png b/android/res/drawable-hdpi/cr3_button_go_page_hc.png
diff --git a/android/res/drawable-hdpi/cr3_button_go_percent_hc.png b/android/res/drawable-hdpi/cr3_button_go_percent_hc.png
diff --git a/android/res/drawable-hdpi/cr3_button_tts_hc.png b/android/res/drawable-hdpi/cr3_button_tts_hc.png
diff --git a/android/res/drawable-hdpi/cr3_logo_button_hc.png b/android/res/drawable-hdpi/cr3_logo_button_hc.png
diff --git a/android/res/drawable-ldpi/cr3_browser_folder_hc.png b/android/res/drawable-ldpi/cr3_browser_folder_hc.png
diff --git a/android/res/drawable-ldpi/cr3_browser_folder_recent_hc.png b/android/res/drawable-ldpi/cr3_browser_folder_recent_hc.png
diff --git a/android/res/drawable-ldpi/cr3_button_go_page_hc.png b/android/res/drawable-ldpi/cr3_button_go_page_hc.png
diff --git a/android/res/drawable-ldpi/cr3_button_go_percent_hc.png b/android/res/drawable-ldpi/cr3_button_go_percent_hc.png
diff --git a/android/res/drawable-ldpi/cr3_button_tts_hc.png b/android/res/drawable-ldpi/cr3_button_tts_hc.png
diff --git a/android/res/drawable-ldpi/cr3_logo_button_hc.png b/android/res/drawable-ldpi/cr3_logo_button_hc.png
diff --git a/android/res/drawable-mdpi/cr3_browser_folder_hc.png b/android/res/drawable-mdpi/cr3_browser_folder_hc.png
diff --git a/android/res/drawable-mdpi/cr3_browser_folder_recent_hc.png b/android/res/drawable-mdpi/cr3_browser_folder_recent_hc.png
diff --git a/android/res/drawable-mdpi/cr3_button_go_page_hc.png b/android/res/drawable-mdpi/cr3_button_go_page_hc.png
diff --git a/android/res/drawable-mdpi/cr3_button_go_percent_hc.png b/android/res/drawable-mdpi/cr3_button_go_percent_hc.png
diff --git a/android/res/drawable-mdpi/cr3_button_tts_hc.png b/android/res/drawable-mdpi/cr3_button_tts_hc.png
diff --git a/android/res/drawable-mdpi/cr3_logo_button_hc.png b/android/res/drawable-mdpi/cr3_logo_button_hc.png
diff --git a/android/res/drawable-xhdpi/cr3_browser_folder_hc.png b/android/res/drawable-xhdpi/cr3_browser_folder_hc.png
diff --git a/android/res/drawable-xhdpi/cr3_browser_folder_recent_hc.png b/android/res/drawable-xhdpi/cr3_browser_folder_recent_hc.png
diff --git a/android/res/drawable-xhdpi/cr3_button_go_page_hc.png b/android/res/drawable-xhdpi/cr3_button_go_page_hc.png
diff --git a/android/res/drawable-xhdpi/cr3_button_go_percent_hc.png b/android/res/drawable-xhdpi/cr3_button_go_percent_hc.png
diff --git a/android/res/drawable-xhdpi/cr3_button_tts_hc.png b/android/res/drawable-xhdpi/cr3_button_tts_hc.png
diff --git a/android/res/drawable-xhdpi/cr3_logo_button_hc.png b/android/res/drawable-xhdpi/cr3_logo_button_hc.png
diff --git a/android/res/layout/options.xml b/android/res/layout/options.xml
@@ -17,7 +17,7 @@
             android:layout_marginBottom="2dip"
             android:layout_marginLeft="0dip"
             android:layout_marginRight="0dip"
-            android:background="#40404040"
+            android:background="?attr/tabbarBackground"
             >
 	        <ImageButton android:id="@+id/options_btn_back"
 	            android:layout_width="wrap_content"

diff --git a/android/res/values-v4/styles.xml b/android/res/values-v4/styles.xml
@@ -64,6 +64,8 @@
 
         <!-- toolbar button background -->
         <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
         <item name="cr3_button_next_drawable">@drawable/cr3_button_next</item>
@@ -74,7 +76,12 @@
         <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root</item>
         <item name="cr3_option_night_drawable">@drawable/cr3_option_night</item>
         <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts</item>
         <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
     </style>
     <style name="Theme.Dark" parent="@android:style/Theme">
         <item name="android:windowBackground">@drawable/background_tiled_dark</item>
@@ -85,6 +92,8 @@
 
         <!-- toolbar button background -->
         <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
         <item name="cr3_button_next_drawable">@drawable/cr3_button_next</item>
@@ -95,7 +104,12 @@
         <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root</item>
         <item name="cr3_option_night_drawable">@drawable/cr3_option_night</item>
         <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts</item>
         <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
     </style>
     <style name="Theme.White" parent="@android:style/Theme.Light">
         <item name="android:windowBackground">@android:color/white</item>
@@ -106,6 +120,8 @@
 
         <!-- toolbar button background -->
         <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
         <item name="cr3_button_next_drawable">@drawable/cr3_button_next</item>
@@ -116,7 +132,12 @@
         <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root</item>
         <item name="cr3_option_night_drawable">@drawable/cr3_option_night</item>
         <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts</item>
         <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
     </style>
     <style name="Theme.Black" parent="@android:style/Theme">
         <item name="android:windowBackground">@android:color/black</item>
@@ -127,6 +148,8 @@
 
         <!-- toolbar button background -->
         <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
         <item name="cr3_button_next_drawable">@drawable/cr3_button_next</item>
@@ -137,7 +160,12 @@
         <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root</item>
         <item name="cr3_option_night_drawable">@drawable/cr3_option_night</item>
         <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts</item>
         <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
     </style>
 
     <style name="Theme.HiContrast" parent="@android:style/Theme.Light">
@@ -151,6 +179,8 @@
 
         <!-- toolbar button background -->
         <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background_hc</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#FFFFFFFF</item>
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev_hc</item>
         <item name="cr3_button_next_drawable">@drawable/cr3_button_next_hc</item>
@@ -161,7 +191,12 @@
         <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root_hc</item>
         <item name="cr3_option_night_drawable">@drawable/cr3_option_night_hc</item>
         <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch_hc</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page_hc</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent_hc</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder_hc</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts_hc</item>
         <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent_hc</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button_hc</item>
     </style>
 
     <style name="Theme.Light.Dialog.Normal" parent="@style/Theme.Light">

diff --git a/android/res/values/attrs.xml b/android/res/values/attrs.xml
@@ -11,6 +11,7 @@
         <attr name="horizontalDelimiterRoot"/>
         <attr name="horizontalDelimiterSizeRoot"></attr>
     </declare-styleable>
+    <attr name="tabbarBackground" format="reference|color" />
     <attr name="cr3_toolbar_button_background_drawable" format="reference" />
     <attr name="cr3_button_prev_drawable" format="reference" />
     <attr name="cr3_button_next_drawable" format="reference" />
@@ -21,6 +22,11 @@
     <attr name="cr3_browser_folder_root_drawable" format="reference" />
     <attr name="cr3_option_night_drawable" format="reference" />
     <attr name="cr3_option_touch_drawable" format="reference" />
+    <attr name="cr3_button_go_page_drawable" format="reference" />
+    <attr name="cr3_button_go_percent_drawable" format="reference" />
+    <attr name="cr3_browser_folder_drawable" format="reference" />
+    <attr name="cr3_button_tts_drawable" format="reference" />
 
     <attr name="cr3_browser_folder_recent_drawable" format="reference" />
+    <attr name="cr3_logo_button_drawable" format="reference" />
 </resources>
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
@@ -65,6 +65,8 @@
 
         <!-- toolbar button background -->
         <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
         <item name="cr3_button_next_drawable">@drawable/cr3_button_next</item>
@@ -75,7 +77,12 @@
         <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root</item>
         <item name="cr3_option_night_drawable">@drawable/cr3_option_night</item>
         <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts</item>
         <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
     </style>
     <style name="Theme.Dark" parent="@android:style/Theme">
         <item name="android:windowBackground">@drawable/background_tiled_dark_v3</item>
@@ -87,6 +94,8 @@
 
         <!-- toolbar button background -->
         <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
         <item name="cr3_button_next_drawable">@drawable/cr3_button_next</item>
@@ -97,7 +106,12 @@
         <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root</item>
         <item name="cr3_option_night_drawable">@drawable/cr3_option_night</item>
         <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts</item>
         <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
     </style>
     <style name="Theme.White" parent="@android:style/Theme.Light">
         <item name="android:windowBackground">@android:color/white</item>
@@ -110,6 +124,8 @@
 
         <!-- toolbar button background -->
         <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
         <item name="cr3_button_next_drawable">@drawable/cr3_button_next</item>
@@ -120,7 +136,12 @@
         <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root</item>
         <item name="cr3_option_night_drawable">@drawable/cr3_option_night</item>
         <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts</item>
         <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
     </style>
     <style name="Theme.Black" parent="@android:style/Theme">
         <item name="android:windowBackground">@android:color/black</item>
@@ -133,6 +154,8 @@
 
         <!-- toolbar button background -->
         <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#40404040</item>
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev</item>
         <item name="cr3_button_next_drawable">@drawable/cr3_button_next</item>
@@ -143,7 +166,12 @@
         <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root</item>
         <item name="cr3_option_night_drawable">@drawable/cr3_option_night</item>
         <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts</item>
         <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button</item>
     </style>
 
     <style name="Theme.HiContrast" parent="@android:style/Theme.Light">
@@ -157,6 +185,8 @@
 
         <!-- toolbar button background -->
         <item name="cr3_toolbar_button_background_drawable">@drawable/cr3_toolbar_button_background_hc</item>
+        <!-- tabbar background color -->
+        <item name="tabbarBackground">#FFFFFFFF</item>
         <!-- icons -->
         <item name="cr3_button_prev_drawable">@drawable/cr3_button_prev_hc</item>
         <item name="cr3_button_next_drawable">@drawable/cr3_button_next_hc</item>
@@ -167,7 +197,12 @@
         <item name="cr3_browser_folder_root_drawable">@drawable/cr3_browser_folder_root_hc</item>
         <item name="cr3_option_night_drawable">@drawable/cr3_option_night_hc</item>
         <item name="cr3_option_touch_drawable">@drawable/cr3_option_touch_hc</item>
+        <item name="cr3_button_go_page_drawable">@drawable/cr3_button_go_page_hc</item>
+        <item name="cr3_button_go_percent_drawable">@drawable/cr3_button_go_percent_hc</item>
+        <item name="cr3_browser_folder_drawable">@drawable/cr3_browser_folder_hc</item>
+        <item name="cr3_button_tts_drawable">@drawable/cr3_button_tts_hc</item>
         <item name="cr3_browser_folder_recent_drawable">@drawable/cr3_browser_folder_recent_hc</item>
+        <item name="cr3_logo_button_drawable">@drawable/cr3_logo_button_hc</item>
     </style>
 
     <style name="Theme.Light.Dialog.Normal" parent="@style/Theme.Light">

diff --git a/android/src/org/coolreader/crengine/BaseActivity.java b/android/src/org/coolreader/crengine/BaseActivity.java
@@ -379,7 +379,8 @@ public void updateActionsIcons() {
 		int [] attrs = { R.attr.cr3_button_prev_drawable, R.attr.cr3_button_next_drawable, R.attr.cr3_viewer_toc_drawable,
 						 R.attr.cr3_viewer_find_drawable, R.attr.cr3_viewer_settings_drawable, R.attr.cr3_button_bookmarks_drawable,
 						 R.attr.cr3_browser_folder_root_drawable, R.attr.cr3_option_night_drawable, R.attr.cr3_option_touch_drawable,
-						 R.attr.cr3_browser_folder_recent_drawable };
+						 R.attr.cr3_button_go_page_drawable, R.attr.cr3_button_go_percent_drawable, R.attr.cr3_browser_folder_drawable,
+						 R.attr.cr3_button_tts_drawable, R.attr.cr3_browser_folder_recent_drawable, R.attr.cr3_logo_button_drawable };
 		TypedArray a = getTheme().obtainStyledAttributes(attrs);
 		int btnPrevDrawableRes = a.getResourceId(0, 0);
 		int btnNextDrawableRes = a.getResourceId(1, 0);
@@ -390,7 +391,12 @@ public void updateActionsIcons() {
 		int brFolderRootDrawableRes = a.getResourceId(6, 0);
 		int optionNightDrawableRes = a.getResourceId(7, 0);
         int optionTouchDrawableRes = a.getResourceId(8, 0);
-		int brFolderRecentDrawableRes = a.getResourceId(9, 0);
+		int btnGoPageDrawableRes = a.getResourceId(9, 0);
+		int btnGoPercentDrawableRes = a.getResourceId(10, 0);
+		int brFolderDrawableRes = a.getResourceId(11, 0);
+		int btnTtsDrawableRes = a.getResourceId(12, 0);
+		int brFolderRecentDrawableRes = a.getResourceId(13, 0);
+		int logoBtnDrawableRes = a.getResourceId(14, 0);
 		a.recycle();
 		if (btnPrevDrawableRes != 0) {
 			ReaderAction.GO_BACK.setIconId(btnPrevDrawableRes);
@@ -410,8 +416,18 @@ public void updateActionsIcons() {
 			ReaderAction.FILE_BROWSER_ROOT.setIconId(brFolderRootDrawableRes);
 		if (optionNightDrawableRes != 0)
 			ReaderAction.TOGGLE_DAY_NIGHT.setIconId(optionNightDrawableRes);
-        if (optionTouchDrawableRes != 0)
-            ReaderAction.TOGGLE_SELECTION_MODE.setIconId(optionTouchDrawableRes);
+		if (optionTouchDrawableRes != 0)
+			ReaderAction.TOGGLE_SELECTION_MODE.setIconId(optionTouchDrawableRes);
+		if (btnGoPageDrawableRes != 0)
+			ReaderAction.GO_PAGE.setIconId(btnGoPageDrawableRes);
+		if (btnGoPercentDrawableRes != 0)
+			ReaderAction.GO_PERCENT.setIconId(btnGoPercentDrawableRes);
+		if (brFolderDrawableRes != 0)
+			ReaderAction.FILE_BROWSER.setIconId(brFolderDrawableRes);
+		if (btnTtsDrawableRes != 0)
+			ReaderAction.TTS_PLAY.setIconId(btnTtsDrawableRes);
+		if (logoBtnDrawableRes != 0)
+			ReaderAction.ABOUT.setIconId(logoBtnDrawableRes);
 		if (brFolderRecentDrawableRes != 0)
 			ReaderAction.RECENT_BOOKS.setIconId(brFolderRecentDrawableRes);
 	}

diff --git a/icons_src/convert_all.pl b/icons_src/convert_all.pl
@@ -2,6 +2,7 @@
 
 $TARGET_DIR = "../android/res/";
 
+#                      dpi: 120       160       240        320         480            640
 my %ic_actions_sizes  = (ldpi=>24, mdpi=>32, hdpi=>48, xhdpi=>64, xxhdpi=>96,  xxxhdpi=>128);
 my %ic_menu_sizes     = (ldpi=>36, mdpi=>48, hdpi=>72, xhdpi=>96, xxhdpi=>144, xxxhdpi=>192);
 my %ic_launcher_sizes = (ldpi=>36, mdpi=>48, hdpi=>72, xhdpi=>96, xxhdpi=>144, xxxhdpi=>192);
@@ -16,7 +17,12 @@
 	'cr3_browser_folder_root_hc-256x256-src.svg' => 'cr3_browser_folder_root_hc.png',
 	'cr3_option_night_hc-256x256-src.svg' => 'cr3_option_night_hc.png',
 	'cr3_option_touch_hc-256x256-src.svg' => 'cr3_option_touch_hc.png',
-	'cr3_browser_folder_recent_hc-256x256-src.svg' => 'cr3_browser_folder_recent_hc.png'
+	'cr3_button_go_page_hc-256x256-src.svg' => 'cr3_button_go_page_hc.png',
+	'cr3_button_go_percent_hc-256x256-src.svg' => 'cr3_button_go_percent_hc.png',
+	'cr3_browser_folder_hc-48x48-src.svg' => 'cr3_browser_folder_hc.png',
+	'cr3_button_tts_hc-48x48-src.svg' => 'cr3_button_tts_hc.png',
+	'cr3_browser_folder_recent_hc-48x48-src.svg' => 'cr3_browser_folder_recent_hc.png',
+	'cr3_logo_hc-48x48-src.svg' => 'cr3_logo_button_hc.png'
 );
 
 my %ic_menu_list=(
@@ -39,7 +45,7 @@
 		$folder = "${TARGET_DIR}/drawable-${dpi}/";
 		if (-d $folder)
 		{
-			$resfile = "${TARGET_DIR}/drawable-${dpi}/${dstfile}";
+			$resfile = "${folder}/${dstfile}";
 			$cmd = "inkscape -z -e ${resfile} -w ${size} -h ${size} ${srcfile}";
 			print "$cmd\n";
 			$ret = system($cmd);
@@ -55,7 +61,7 @@
 		$folder = "${TARGET_DIR}/drawable-${dpi}/";
 		if (-d $folder)
 		{
-			$resfile = "${TARGET_DIR}/drawable-${dpi}/${dstfile}";
+			$resfile = "${folder}/${dstfile}";
 			$cmd = "inkscape -z -e ${resfile} -w ${size} -h ${size} ${srcfile}";
 			print "$cmd\n";
 			$ret = system($cmd);
@@ -71,7 +77,7 @@
 		$folder = "${TARGET_DIR}/drawable-${dpi}/";
 		if (-d $folder)
 		{
-			$resfile = "${TARGET_DIR}/drawable-${dpi}/${dstfile}";
+			$resfile = "${folder}/${dstfile}";
 			$cmd = "inkscape -z -e ${resfile} -w ${size} -h ${size} ${srcfile}";
 			print "$cmd\n";
 			$ret = system($cmd);