diff --git a/group.php b/group.php
index 4fda5a812..284ebb25d 100644
--- a/group.php
+++ b/group.php
@@ -26,7 +26,7 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$
     $joined = bb_date($row['user_regdate']);
     $user_time = (!empty($row['user_time'])) ? bb_date($row['user_time']) : $lang['NONE'];
     $posts = $row['user_posts'] ?: 0;
-    $pm = $bb_cfg['text_buttons'] ? '<a class="txtb" href="' . (PM_URL . "?mode=post&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '">' . $lang['SEND_PM_TXTB'] . '</a>' : '<a href="' . (PM_URL . "?mode=post&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['SEND_PRIVATE_MESSAGE'] . '" title="' . $lang['SEND_PRIVATE_MESSAGE'] . '" border="0" /></a>';
+    $pm = '<a class="txtb" href="' . (PM_URL . "?mode=post&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '">' . $lang['SEND_PM_TXTB'] . '</a>';
     $avatar = get_avatar($row['user_id'], $row['avatar_ext_id'], !bf($row['user_opt'], 'user_opt', 'dis_avatar'), '', 50, 50);
 
     if (bf($row['user_opt'], 'user_opt', 'user_viewemail') || $group_mod) {
@@ -37,7 +37,7 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$
     }
 
     if ($row['user_website']) {
-        $www = $bb_cfg['text_buttons'] ? '<a class="txtb" href="' . $row['user_website'] . '"  target="_userwww">' . $lang['VISIT_WEBSITE_TXTB'] . '</a>' : '<a class="txtb" href="' . $row['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['VISIT_WEBSITE'] . '" title="' . $lang['VISIT_WEBSITE'] . '" border="0" /></a>';
+        $www = '<a class="txtb" href="' . $row['user_website'] . '"  target="_userwww">' . $lang['VISIT_WEBSITE_TXTB'] . '</a>';
     } else {
         $www = '';
     }
diff --git a/library/config.php b/library/config.php
index ceb25bf45..2ea01c4e1 100644
--- a/library/config.php
+++ b/library/config.php
@@ -440,7 +440,6 @@ $bb_cfg['show_poster_joined'] = true;
 $bb_cfg['show_poster_posts'] = true;
 $bb_cfg['show_poster_from'] = true;
 $bb_cfg['show_bot_nick'] = false;
-$bb_cfg['text_buttons'] = false; // replace EDIT, QUOTE... images with text links
 $bb_cfg['parse_ed2k_links'] = true; // make ed2k links clickable
 $bb_cfg['post_date_format'] = 'd-M-Y H:i';
 $bb_cfg['ext_link_new_win'] = true; // open external links in new window
diff --git a/memberlist.php b/memberlist.php
index f35a31beb..414499bc2 100644
--- a/memberlist.php
+++ b/memberlist.php
@@ -159,7 +159,7 @@ if ($result = OLD_DB()->fetch_rowset($sql)) {
         $from = $row['user_from'];
         $joined = bb_date($row['user_regdate'], $bb_cfg['date_format']);
         $posts = $row['user_posts'];
-        $pm = $bb_cfg['text_buttons'] ? '<a class="txtb" href="' . (PM_URL . "?mode=post&amp;" . POST_USERS_URL . "=$user_id") . '">' . $lang['SEND_PM_TXTB'] . '</a>' : '<a href="' . (PM_URL . "?mode=post&amp;" . POST_USERS_URL . "=$user_id") . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['SEND_PRIVATE_MESSAGE'] . '" title="' . $lang['SEND_PRIVATE_MESSAGE'] . '" border="0" /></a>';
+        $pm = '<a class="txtb" href="' . (PM_URL . "?mode=post&amp;" . POST_USERS_URL . "=$user_id") . '">' . $lang['SEND_PM_TXTB'] . '</a>';
 
         if (bf($row['user_opt'], 'user_opt', 'user_viewemail') || IS_ADMIN) {
             $email_uri = $bb_cfg['board_email_form'] ? ("profile.php?mode=email&amp;" . POST_USERS_URL . "=$user_id") : 'mailto:' . $row['user_email'];
@@ -169,7 +169,7 @@ if ($result = OLD_DB()->fetch_rowset($sql)) {
         }
 
         if ($row['user_website']) {
-            $www = $bb_cfg['text_buttons'] ? '<a class="txtb" href="' . $row['user_website'] . '"  target="_userwww">' . $lang['VISIT_WEBSITE_TXTB'] . '</a>' : '<a class="txtb" href="' . $row['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['VISIT_WEBSITE'] . '" title="' . $lang['VISIT_WEBSITE'] . '" border="0" /></a>';
+            $www = '<a class="txtb" href="' . $row['user_website'] . '"  target="_userwww">' . $lang['VISIT_WEBSITE_TXTB'] . '</a>';
         } else {
             $www = '';
         }
diff --git a/styles/templates/default/search_results.tpl b/styles/templates/default/search_results.tpl
index 95a9dbca0..473440325 100644
--- a/styles/templates/default/search_results.tpl
+++ b/styles/templates/default/search_results.tpl
@@ -39,7 +39,7 @@
 	<td class="message td2">
 
 		<div class="post_head">
-			<p style="float: left;<!-- IF TEXT_BUTTONS --> padding: 4px 0 3px;<!-- ELSE --> padding-top: 5px;<!-- ENDIF -->">
+			<p style="float: left; padding: 4px 0 3px;">
 				<!-- IF t.p.IS_UNREAD -->{MINIPOST_IMG_NEW}<!-- ELSE -->{MINIPOST_IMG}<!-- ENDIF -->
 				<a class="small" href="{POST_URL}{t.p.POST_ID}#{t.p.POST_ID}" title="{L_POST_LINK}">{t.p.POST_DATE}</a>
 				<!-- IF t.p.POSTED_AFTER -->
@@ -47,7 +47,7 @@
 				<!-- ENDIF -->
 			</p>
 
-			<p style="float: right;<!-- IF TEXT_BUTTONS --> padding: 3px 2px 4px;<!-- ELSE --> padding: 1px 6px 2px;<!-- ENDIF -->" class="post_btn_1">
+			<p style="float: right; padding: 3px 2px 4px;" class="post_btn_1">
 				<!-- IF t.p.QUOTE --><a class="txtb" href="{QUOTE_URL}{t.p.POST_ID}">{QUOTE_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
 				<!-- IF t.p.EDIT --><a class="txtb" href="{EDIT_POST_URL}{t.p.POST_ID}">{EDIT_POST_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
 				<!-- IF t.p.DELETE --><a class="txtb" href="{DELETE_POST_URL}{t.p.POST_ID}">{DELETE_POST_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
diff --git a/styles/templates/default/tpl_config.php b/styles/templates/default/tpl_config.php
index b02fe276b..368620abe 100644
--- a/styles/templates/default/tpl_config.php
+++ b/styles/templates/default/tpl_config.php
@@ -130,8 +130,7 @@ $images['progress_bar_full'] = $_main . 'progress_bar_full.gif';
 
 $template->assign_vars(array(
     'IMG' => $_main,
-    'TEXT_BUTTONS' => $bb_cfg['text_buttons'],
-    'POST_BTN_SPACER' => $bb_cfg['text_buttons'] ? '&nbsp;' : '',
+    'POST_BTN_SPACER' => '&nbsp;',
     'TOPIC_ATTACH_ICON' => '<img src="styles/images/icon_clip.gif" alt="" />',
     'OPEN_MENU_IMG_ALT' => '<img src="' . $_main . 'menu_open_1.gif" class="menu-alt1" alt="" />',
     'TOPIC_LEFT_COL_SPACER_WITDH' => $bb_cfg['topic_left_column_witdh'] - 8, // 8px padding
@@ -145,24 +144,24 @@ $template->assign_vars(array(
 if (!empty($page_cfg['load_tpl_vars']) and $vars = array_flip($page_cfg['load_tpl_vars'])) {
     if (isset($vars['post_buttons'])) {
         $template->assign_vars(array(
-            'QUOTE_IMG' => $bb_cfg['text_buttons'] ? $lang['REPLY_WITH_QUOTE_TXTB'] : '<img src="' . $images['icon_quote'] . '" alt="' . $lang['REPLY_WITH_QUOTE_TXTB'] . '" title="' . $lang['REPLY_WITH_QUOTE'] . '" />',
-            'EDIT_POST_IMG' => $bb_cfg['text_buttons'] ? $lang['EDIT_DELETE_POST_TXTB'] : '<img src="' . $images['icon_edit'] . '" alt="' . $lang['EDIT_DELETE_POST_TXTB'] . '" title="' . $lang['EDIT_POST'] . '" />',
-            'DELETE_POST_IMG' => $bb_cfg['text_buttons'] ? $lang['DELETE_POST_TXTB'] : '<img src="' . $images['icon_delpost'] . '" alt="' . $lang['DELETE_POST_TXTB'] . '" title="' . $lang['DELETE_POST'] . '" />',
-            'IP_POST_IMG' => $bb_cfg['text_buttons'] ? $lang['VIEW_IP_TXTB'] : '<img src="' . $images['icon_ip'] . '" alt="' . $lang['VIEW_IP_TXTB'] . '" title="' . $lang['VIEW_IP'] . '" />',
-            'MOD_POST_IMG' => $bb_cfg['text_buttons'] ? $lang['MODERATE_POST_TXTB'] : '<img src="' . $images['icon_mod'] . '" alt="' . $lang['MODERATE_POST_TXTB'] . '" title="' . $lang['MODERATE_POST'] . '" />',
-            'MC_IMG' => $bb_cfg['text_buttons'] ? '[' . $lang['COMMENT'] . ']' : '<img src="' . $images['icon_mc'] . '" alt="[' . $lang['COMMENT'] . ']" title="' . $lang['COMMENT'] . '" />',
-            'POLL_IMG' => $bb_cfg['text_buttons'] ? $lang['TOPIC_POLL'] : '<img src="' . $images['icon_poll'] . '" alt="' . $lang['TOPIC_POLL'] . '" title="' . $lang['ADD_POLL'] . '" />',
+            'QUOTE_IMG' => $lang['REPLY_WITH_QUOTE_TXTB'],
+            'EDIT_POST_IMG' => $lang['EDIT_DELETE_POST_TXTB'],
+            'DELETE_POST_IMG' => $lang['DELETE_POST_TXTB'],
+            'IP_POST_IMG' => $lang['VIEW_IP_TXTB'],
+            'MOD_POST_IMG' => $lang['MODERATE_POST_TXTB'],
+            'MC_IMG' => '[' . $lang['COMMENT'] . ']',
+            'POLL_IMG' => $lang['TOPIC_POLL'],
 
             'QUOTE_URL' => BB_ROOT . POSTING_URL . '?mode=quote&amp;p=',
             'EDIT_POST_URL' => BB_ROOT . POSTING_URL . '?mode=editpost&amp;p=',
             'DELETE_POST_URL' => BB_ROOT . POSTING_URL . '?mode=delete&amp;p=',
             'IP_POST_URL' => BB_ROOT . 'modcp.php?mode=ip&amp;p=',
 
-            'PROFILE_IMG' => $bb_cfg['text_buttons'] ? $lang['READ_PROFILE_TXTB'] : '<img src="' . $images['icon_profile'] . '" alt="' . $lang['READ_PROFILE_TXTB'] . '" title="' . $lang['READ_PROFILE'] . '" />',
-            'PM_IMG' => $bb_cfg['text_buttons'] ? $lang['SEND_PM_TXTB'] : '<img src="' . $images['icon_pm'] . '" alt="' . $lang['SEND_PM_TXTB'] . '" title="' . $lang['SEND_PRIVATE_MESSAGE'] . '" />',
-            'EMAIL_IMG' => $bb_cfg['text_buttons'] ? $lang['SEND_EMAIL_TXTB'] : '<img src="' . $images['icon_email'] . '" alt="' . $lang['SEND_EMAIL_TXTB'] . '" title="' . $lang['SEND_EMAIL'] . '" />',
-            'WWW_IMG' => $bb_cfg['text_buttons'] ? $lang['VISIT_WEBSITE_TXTB'] : '<img src="' . $images['icon_www'] . '" alt="' . $lang['VISIT_WEBSITE_TXTB'] . '" title="' . $lang['VISIT_WEBSITE'] . '" />',
-            'ICQ_IMG' => $bb_cfg['text_buttons'] ? $lang['ICQ_TXTB'] : '<img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ_TXTB'] . '" title="' . $lang['ICQ'] . '" />',
+            'PROFILE_IMG' => $lang['READ_PROFILE_TXTB'],
+            'PM_IMG' => $lang['SEND_PM_TXTB'],
+            'EMAIL_IMG' => $lang['SEND_EMAIL_TXTB'],
+            'WWW_IMG' => $lang['VISIT_WEBSITE_TXTB'],
+            'ICQ_IMG' => $lang['ICQ_TXTB'],
 
             'EMAIL_URL' => BB_ROOT . "profile.php?mode=email&amp;u=",
             'FORUM_URL' => BB_ROOT . FORUM_URL,
diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl
index c60c2882a..5ff57dc91 100644
--- a/styles/templates/default/viewtopic.tpl
+++ b/styles/templates/default/viewtopic.tpl
@@ -376,7 +376,7 @@ function build_poll_add_form (src_el)
 	<td class="message td2" rowspan="2">
 
 		<div class="post_head">
-			<p style="float: left;<!-- IF TEXT_BUTTONS --> padding: 4px 0 3px;<!-- ELSE --> padding-top: 5px;<!-- ENDIF -->">
+			<p style="float: left; padding: 4px 0 3px;">
 				<!-- IF postrow.IS_UNREAD -->{MINIPOST_IMG_NEW}<!-- ELSE -->{MINIPOST_IMG}<!-- ENDIF -->
 				<a class="small" href="{POST_URL}{postrow.POST_ID}#{postrow.POST_ID}" title="{L_POST_LINK}">{postrow.POST_DATE}</a>
 				<!-- IF postrow.POSTED_AFTER -->
@@ -386,7 +386,7 @@ function build_poll_add_form (src_el)
 
 			<!-- IF postrow.MOD_CHECKBOX --><input type="checkbox" class="select_post" onclick="set_hid_chbox('{postrow.POST_ID}');"><!-- ENDIF -->
 
-			<p style="float: right;<!-- IF TEXT_BUTTONS --> padding: 3px 2px 4px;<!-- ELSE --> padding: 1px 6px 2px;<!-- ENDIF -->" class="post_btn_1">
+			<p style="float: right; padding: 3px 2px 4px;" class="post_btn_1">
 				<!-- IF postrow.IS_FIRST_POST and CAN_ADD_POLL --><a href="#" onclick="return build_poll_add_form(this);" class="txtb">{POLL_IMG}</a><!-- ENDIF -->
 				<!-- IF postrow.QUOTE --><a class="txtb" href="<!-- IF $bb_cfg['use_ajax_posts'] -->" onclick="ajax.exec({ action: 'posts', post_id: {postrow.POST_ID}, type: 'reply'}); return false;<!-- ELSE -->{QUOTE_URL}{postrow.POST_ID}<!-- ENDIF -->">{QUOTE_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
 				<!-- IF postrow.EDIT --><a class="txtb" href="<!-- IF $bb_cfg['use_ajax_posts'] -->" onclick="edit_post({postrow.POST_ID}, 'edit'); return false;<!-- ELSE -->{EDIT_POST_URL}{postrow.POST_ID}<!-- ENDIF -->">{EDIT_POST_IMG}</a>{POST_BTN_SPACER}<!-- ENDIF -->
@@ -464,7 +464,7 @@ function build_poll_add_form (src_el)
 	<!-- IF postrow.POSTER_BOT || not postrow.PROFILE -->
 		&nbsp;
 	<!-- ELSE -->
-		<div style="<!-- IF TEXT_BUTTONS --> padding: 2px 6px 4px;<!-- ELSE --> padding: 2px 3px;<!-- ENDIF -->" class="post_btn_2">
+		<div style="padding: 2px 6px 4px;" class="post_btn_2">
 			<a class="txtb" href="{PROFILE_URL}{postrow.POSTER_ID}">{PROFILE_IMG}</a>{POST_BTN_SPACER}
 			<a class="txtb" href="{PM_URL}?mode=post&amp;u={postrow.POSTER_ID}">{PM_IMG}</a>{POST_BTN_SPACER}
 		</div>