diff --git a/doc/test_xr.txt b/doc/test_xr.txt
index 5f411769..3c0ee77c 100644
--- a/doc/test_xr.txt
+++ b/doc/test_xr.txt
@@ -39,7 +39,7 @@ rofi.window-command:                 xkill -id {window}
 ! "Window fields to match in window mode" Set from: Default
 ! rofi.window-match-fields:            all
 ! "Theme to use to look for icons" Set from: Default
-! rofi.icon-theme:                
+! rofi.icon-theme:                     
 ! "Desktop entry fields to match in drun" Set from: Default
 ! rofi.drun-match-fields:              name,generic,exec,categories
 ! "Disable history in run/ssh" Set from: File
diff --git a/include/view-internal.h b/include/view-internal.h
index cb160293..9bf84b5e 100644
--- a/include/view-internal.h
+++ b/include/view-internal.h
@@ -69,9 +69,6 @@ struct RofiViewState
     /** #textbox containing the message entry */
     textbox          *mesg_tb;
 
-
-    icon             *cur_icon;
-
     /** Array with the levenshtein distance for each eleemnt. */
     int              *distance;
     /** Array with the translation between the filtered and unfiltered list. */
diff --git a/source/view.c b/source/view.c
index 721d065b..7a17404e 100644
--- a/source/view.c
+++ b/source/view.c
@@ -935,11 +935,6 @@ static void update_callback ( textbox *t, unsigned int index, void *udata, TextB
 
         cairo_surface_t *icon = mode_get_icon ( state->sw, state->line_map[index], icon_height );
         textbox_icon ( t, icon );
-        if ( state->cur_icon ) {
-            if ( index == listview_get_selected ( state->list_view  ) ){
-                icon_set_surface ( state->cur_icon, icon );
-            }
-        }
 
         if ( state->tokens && config.show_match ) {
             RofiHighlightColorStyle th = { ROFI_HL_BOLD | ROFI_HL_UNDERLINE, { 0.0, 0.0, 0.0, 0.0 } };
@@ -998,11 +993,6 @@ void rofi_view_update ( RofiViewState *state, gboolean qr )
         widget_draw ( WIDGET ( state->overlay ), d );
     }
 
-    int selected = listview_get_selected ( state->list_view );
-    cairo_surface_t *icon = mode_get_icon ( state->sw, state->line_map[selected], 32);
-    if ( state->cur_icon ) {
-        icon_set_surface ( state->cur_icon, icon );
-    }
     TICK_N ( "widgets" );
     cairo_surface_flush ( CacheState.edit_surf );
     if ( qr ) {
@@ -1655,9 +1645,6 @@ static void rofi_view_add_widget ( RofiViewState *state, widget *parent_widget,
     else if (  g_ascii_strncasecmp ( name, "icon", 4 ) == 0 ) {
         icon *t = icon_create ( parent_widget,  name );
         box_add ( (box *) parent_widget, WIDGET ( t ), TRUE );
-        if ( rofi_theme_get_boolean ( WIDGET ( t ), "show-current", FALSE ) ) {
-            state->cur_icon = t;
-        }
     }
     else {
         wid = (widget *) box_create ( parent_widget, name, ROFI_ORIENTATION_VERTICAL );