diff --git a/fish/theme-t31m/fish_prompt.fish b/fish/theme-t31m/fish_prompt.fish
index 2c6113d..e48f907 100644
--- a/fish/theme-t31m/fish_prompt.fish
+++ b/fish/theme-t31m/fish_prompt.fish
@@ -1,6 +1,9 @@
 function fish_prompt
 	set -l symbol "λ "
 	set -l code $status
+    set t31m_custom_right (t31m_prompt_right)
+
+    echo -ns "$t31m_custom_right"
 
 	if test -n "$ssh_client"
 		set -l host (hostname -s)
@@ -16,6 +19,7 @@ function fish_prompt
 			echo -n -s (white)"^"(off)
 		end
 
+        printf '%s ' \U1F6E0
 		echo -n -s (red)"("(off)
 
 		if git::is_dirty
@@ -53,12 +57,11 @@ function fish_prompt
 	end
 
     set t31m_custom (t31m_prompt)
-    set t31m_custom_right (t31m_prompt_right)
 
     # check if latest cmd resulted in exit code 0 (ok)
 	if test "$code" = 0
-		echo -e -n -s "$t31m_custom""$t31m_custom_right"(red)"\n$symbol"(off)
+		echo -e -n -s "$t31m_custom"(red)"\n$symbol"(off)
 	else
-		echo -e -n -s "$t31m_custom""$t31m_custom_right"(dim)"\n$symbol"(off)
+		echo -e -n -s "$t31m_custom"(dim)"\n$symbol"(off)
 	end
 end
diff --git a/fish/theme-t31m/t31m_prompt.fish b/fish/theme-t31m/t31m_prompt.fish
index db5d0ca..9036474 100644
--- a/fish/theme-t31m/t31m_prompt.fish
+++ b/fish/theme-t31m/t31m_prompt.fish
@@ -18,7 +18,9 @@ function t31m_prompt
     set awsenv (prompt::awsenv)
     set pyenv (prompt::pyenv) 
     #echo -n -s (red)"$awsenv"(cyan)"$pyenv"
-    echo -n -s "$pyenv$awsenv"
+    echo -n -s "$pyenv"
+    printf '%s ' \U2601
+    echo -n -s "$awsenv"
 end
 
 
diff --git a/fish/theme-t31m/t31m_prompt_right.fish b/fish/theme-t31m/t31m_prompt_right.fish
index 74decbe..144d77c 100644
--- a/fish/theme-t31m/t31m_prompt_right.fish
+++ b/fish/theme-t31m/t31m_prompt_right.fish
@@ -1,3 +1,4 @@
+# moved original theme right prompt to left as we are working with a new line promt now.
 function t31m_prompt_right
 
 	if test "$theme_complete_path" = "yes"
@@ -12,7 +13,9 @@ function t31m_prompt_right
 		end
 	end
 
-	printf (yellow)"("(off)$cwd(yellow)") "(off)
-	printf (off)(date +%H(yellow):(off)%M(yellow):(off)%S)(off)"\n"
+    printf '%s' \U231A
+	printf (yellow)"("(off)(date +%H(yellow):(off)%M(yellow):(off)%S)(yellow)")"(off)
+	printf '%s' \U1F4C1
+    printf (yellow)"("(off)$cwd(yellow)")"(off)
 
 end