diff --git a/themes/default/app_config.php b/themes/default/app_config.php
index 9839fff219..e3ca281429 100644
--- a/themes/default/app_config.php
+++ b/themes/default/app_config.php
@@ -1810,7 +1810,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "button_icon_download";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "fas fa-cloud-download-alt";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "fas fa-download";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 		$y++;
diff --git a/themes/default/css.php b/themes/default/css.php
index eebe6b9fa2..b58956c0de 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -714,13 +714,6 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 
 /* BREAKPOINTS ****************************************************************/
 
-	/* hide button labels on medium and smaller screens (only if icons present) */
-	@media (max-width: 991.98px) {
-		button:not(.btn-link) > span.button-label.hide-md-dn {
-			display: none;
-			}
-	}
-
 	/* screens = extra small */
 	@media (max-width: 575.98px) {
 		.hide-xs,
@@ -765,6 +758,13 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 			}
 	}
 
+	/* hide button labels on medium and smaller screens (only if icons present) */
+	@media (max-width: 991.98px) {
+		button:not(.btn-link) > span.button-label.hide-md-dn {
+			display: none;
+			}
+	}
+
 /* ICONS *********************************************************************/
 
 	span.icon_body {
@@ -1328,7 +1328,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		box-shadow: 0 0 3px 0px rgba(255,0,0,0.9);
 		}
 
-	td.playback_progress_bar_background {
+	tr.playback_progress_bar_background {
 		padding: 0;
 		border-bottom: none;
 		background-image: -ms-linear-gradient(top, rgba(0,0,0,0.15) 0%, transparent 100%);
@@ -2132,7 +2132,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 		position: relative;
 		}
 
-	div.form_set > .field.nowrap {
+	div.form_set > .field.no-wrap {
 		white-space: nowrap;
 		}
 
@@ -2141,6 +2141,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 	div.action_bar {
 		position: -webkit-sticky;
 		position: sticky;
+		z-index: 5;
 		<?php
 		switch ($_SESSION['theme']['menu_style']['text']) {
 			case 'side':
@@ -2245,8 +2246,8 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 
 	.list-row > .button {
 		margin: 0;
-		padding-top: 0;
-		padding-bottom: 0;
+		padding-top: 1px;
+		padding-bottom: 1px;
 		white-space: nowrap;
 		}
 
@@ -2273,4 +2274,9 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false;
 	.list-header > .right,
 	.list-row > .right {
 		text-align: right !important;
+		}
+
+	.list-header > .no-wrap,
+	.list-row > .no-wrap {
+		white-space: nowrap;
 		}
\ No newline at end of file
diff --git a/themes/default/images/logo_najo.png b/themes/default/images/logo_najo.png
new file mode 100755
index 0000000000..63982c8093
Binary files /dev/null and b/themes/default/images/logo_najo.png differ
diff --git a/themes/default/template.php b/themes/default/template.php
index de76d2385c..1c9d596c8f 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -329,10 +329,10 @@ echo "<script language='JavaScript' type='text/javascript' src='<!--{project_pat
 			if (recording_audio.paused) {
 				recording_audio.volume = 1;
 				recording_audio.play();
-				document.getElementById('recording_button_'+recording_id).innerHTML = "<?php echo str_replace("class='list_control_icon'", "class='list_control_icon' style='opacity: 1;'", $v_link_label_pause); ?>";
+				document.getElementById('recording_button_'+recording_id).innerHTML = "<span class='<?php echo $_SESSION['theme']['button_icon_pause']['text']; ?>'></span>";
 				audio_clock = setInterval(function () { update_progress(recording_id); }, 20);
 
-				$("[id*=recording_button]").not("[id*=recording_button_"+recording_id+"]").html("<?php echo $v_link_label_play; ?>");
+				$("[id*=recording_button]").not("[id*=recording_button_"+recording_id+"]").html("<span class='<?php echo $_SESSION['theme']['button_icon_play']['text']; ?>'></span>");
 				$("[id*=recording_progress_bar]").not("[id*=recording_progress_bar_"+recording_id+"]").css('display', 'none');
 
 				$('audio').each(function(){$('#menu_side_container').width()
@@ -344,7 +344,7 @@ echo "<script language='JavaScript' type='text/javascript' src='<!--{project_pat
 			}
 			else {
 				recording_audio.pause();
-				document.getElementById('recording_button_'+recording_id).innerHTML = "<?php echo $v_link_label_play; ?>";
+				document.getElementById('recording_button_'+recording_id).innerHTML = "<span class='<?php echo $_SESSION['theme']['button_icon_play']['text']; ?>'></span>";
 				clearInterval(audio_clock);
 			}
 		}
@@ -361,7 +361,7 @@ echo "<script language='JavaScript' type='text/javascript' src='<!--{project_pat
 			if (document.getElementById('recording_progress_bar_'+recording_id)) {
 				document.getElementById('recording_progress_bar_'+recording_id).style.display='none';
 			}
-			document.getElementById('recording_button_'+recording_id).innerHTML = "<?php echo $v_link_label_play; ?>";
+			document.getElementById('recording_button_'+recording_id).innerHTML = "<span class='<?php echo $_SESSION['theme']['button_icon_play']['text']; ?>'></span>";
 			clearInterval(audio_clock);
 		}